diff --git a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj index f2526e02c0..85184e9b3c 100644 --- a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj +++ b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj @@ -1,112 +1,24 @@ - - - - - - true - ..\output\dll\ - DEBUG;TRACE - full - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - - - ..\output\dll\ - TRACE - ..\output\dll\BizHawk.Client.ApiHawk.XML - true - pdbonly - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - - - - Debug - AnyCPU - {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA} - Library - Properties - BizHawk.Client.ApiHawk - BizHawk.Client.ApiHawk - v4.6.1 - 512 - - 8.0 - 1591 - - - - - - - False - ..\..\Users\uptho\Documents\BizHawk-2.3\dll\System.Data.SQLite.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {24a0aa3c-b25f-4197-b23d-476d6462dba0} - BizHawk.Client.Common - - - {866f8d13-0678-4ff9-80a4-a3993fd4d8a3} - BizHawk.Common - - - {e1a23168-b571-411c-b360-2229e7225e0e} - BizHawk.Emulation.Common - - - {197d4314-8a9f-49ba-977d-54acefaeb6ba} - BizHawk.Emulation.Cores - - - - - - - - - \ No newline at end of file + + + + ../output/dll + net461 + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj index 9b159e4d15..faacc15254 100644 --- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj +++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj @@ -1,334 +1,49 @@ - - - - - Debug - x86 - 8.0.30703 - 2.0 - {24A0AA3C-B25F-4197-B23D-476D6462DBA0} - Library - Properties - BizHawk.Client.Common - BizHawk.Client.Common - v4.6.1 - 512 - - 8.0 - None - - - true - ..\output\dll\ - TRACE;DEBUG;DOTNET20;UNMANAGED;COMPRESS;WINDOWS - true - full - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - ..\output\dll\ - TRACE;DOTNET20;UNMANAGED;COMPRESS;WINDOWS - true - true - pdbonly - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - - - - - - - - - ..\output\dll\nlua\NLua.dll - False - - - - - False - ..\References\x64\SQLite\System.Data.SQLite.dll - - - - - - - - - - - - - svnrev.cs - - - VersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bk2Movie.cs - - - - - - - - - - - - - - - - - - - Bk2Movie.cs - - - Bk2Movie.cs - - - Bk2Movie.cs - - - - - - - - - - - - - - - - - - - - - - - - TasMovie.cs - - - TasMovie.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - - - {e1a23168-b571-411c-b360-2229e7225e0e} - BizHawk.Emulation.Common - - - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} - BizHawk.Emulation.Cores - - - {f51946ea-827f-4d82-b841-1f2f6d060312} - BizHawk.Emulation.DiscSystem - - - {337ca23e-65e7-44e1-9411-97ee08bb8116} - BizHawk.Bizware.BizwareGL.GdiPlus - - - {5160CFB1-5389-47C1-B7F6-8A0DC97641EE} - BizHawk.Bizware.BizwareGL.OpenTK - - - {E6B436B1-A3CD-4C9A-8F76-5D7154726884} - BizHawk.Bizware.BizwareGL.SlimDX - - - {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} - BizHawk.Bizware.BizwareGL - - - - - - - - - \ No newline at end of file + + + + true + ../output/dll + net461 + + + + + + + + + + False + ../References/x64/SQLite/System.Data.SQLite.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Client.Common/DotNetBuild.NuGet.targets b/BizHawk.Client.Common/DotNetBuild.NuGet.targets deleted file mode 100644 index a52f11769d..0000000000 --- a/BizHawk.Client.Common/DotNetBuild.NuGet.targets +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/BizHawk.Client.Common/packages.config b/BizHawk.Client.Common/packages.config deleted file mode 100644 index a65c590f5b..0000000000 --- a/BizHawk.Client.Common/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj b/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj index 0314d8265e..513290c085 100644 --- a/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj +++ b/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj @@ -1,135 +1,72 @@  - - - - - None - - - true - ..\output\ - TRACE;DEBUG;WINDOWS - full - AnyCPU - false - prompt - - MinimumRecommendedRules.ruleset - - - ..\output\ - TRACE;WINDOWS - true - pdbonly - AnyCPU - false - prompt - - MinimumRecommendedRules.ruleset - - - - Debug - x86 - {2D2890A8-C338-4439-AD8B-CB9EE85A94F9} - Exe - Properties - BizHawk.Client.DBMan - BizHawk.Client.DBMan - v4.6.1 - 512 - - true - 8.0 - - - - .\CSharp-SQLite.dll - - - - - - - - - - - - - Form - - - DATConverter.cs - - - - - - - Form - - - DBMan_MainForm.cs - - - - - - - - - DATConverter.cs - - - DBMan_MainForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {24a0aa3c-b25f-4197-b23d-476d6462dba0} - BizHawk.Client.Common - - - {866f8d13-0678-4ff9-80a4-a3993fd4d8a3} - BizHawk.Common - - - {e1a23168-b571-411c-b360-2229e7225e0e} - BizHawk.Emulation.Common - - - {f51946ea-827f-4d82-b841-1f2f6d060312} - BizHawk.Emulation.DiscSystem - - - - - \ No newline at end of file + + Properties + BizHawk.Client.DBMan + true + MinimumRecommendedRules.ruleset + Debug + prompt + 512 + 8.0 + ../output + Exe + x86 + AnyCPU + {2D2890A8-C338-4439-AD8B-CB9EE85A94F9} + None + BizHawk.Client.DBMan + + + v4.6.1 + false + + + true + full + DEBUG;TRACE;WINDOWS + false + + + false + pdbonly + TRACE;WINDOWS + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj index 66b5b259b9..2abef0c90c 100644 --- a/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj +++ b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj @@ -1,174 +1,108 @@  - - - - Debug - x86 - 9.0.30729 - 2.0 - {C4366030-6D03-424B-AE53-F4F43BB217C3} - Exe - Properties - BizHawk.Client.DiscoHawk - DiscoHawk - v4.6.1 - 512 - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - 8.0 - - - true - true - - - - - - discohawk.ico - - - true - ..\output\ - TRACE;DEBUG;WINDOWS - true - full - AnyCPU - false - prompt - - AllRules.ruleset - - - ..\output\ - TRACE;WINDOWS - true - pdbonly - AnyCPU - false - prompt - - AllRules.ruleset - false - false - - - - - - svnrev.cs - - - VersionInfo.cs - - - Form - - - About.cs - - - - Form - - - ComparisonResults.cs - - - - Form - - - MainDiscoForm.cs - - - - - - - 3.5 - - - - - - - - - - About.cs - - - ComparisonResults.cs - - - MainDiscoForm.cs - Designer - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - - - {f51946ea-827f-4d82-b841-1f2f6d060312} - BizHawk.Emulation.DiscSystem - - - - - - - "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" - "$(SolutionDir)subwcrev.sh" "$(ProjectDir)" - - - - + + Properties + discohawk.ico + 0 + 1.0.0.%2a + DiscoHawk + true + true + AllRules.ruleset + Debug + prompt + 512 + + true + Disk + false + 8.0 + true + true + 3.5 + ../output + Exe + x86 + AnyCPU + 9.0.30729 + {C4366030-6D03-424B-AE53-F4F43BB217C3} + publish/ + BizHawk.Client.DiscoHawk + 2.0 + + + v4.6.1 + false + 7 + Days + Foreground + false + false + + false + false + + + true + full + DEBUG;TRACE;WINDOWS + false + + + false + pdbonly + TRACE;WINDOWS + true + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 7dc1cd124d..e6b8714e5e 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1,2024 +1,233 @@  - - - - Debug - x86 - 9.0.30729 - 2.0 - {DD448B37-BA3F-4544-9754-5406E8094723} - WinExe - Properties - BizHawk.Client.EmuHawk - EmuHawk - v4.6.1 - 512 - BizHawk.Client.EmuHawk.Program - false - images\logo.ico - - - 3.5 - - - WINDOWS - publish\ - true - Disk - false - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - None - true - 8.0 - - - app.manifest - - - true - ..\output\ - DEBUG;WINDOWS;EXE_PROJECT - true - full - AnyCPU - false - prompt - - AllRules.ruleset - - - ..\output\ - WINDOWS;EXE_PROJECT - true - true - pdbonly - AnyCPU - false - prompt - - AllRules.ruleset - - - - - - - - - ..\References\GongShell.dll - - - - - - False - ..\output\dll\nlua\NLua.dll - False - - - False - ..\References\OpenTK.dll - - - ..\References\x64\SlimDX.dll - - - - 3.5 - - - - - - - 3.5 - - - 3.5 - - - - - - - - - - - OSTailoredCode.cs - - - svnrev.cs - - - VersionInfo.cs - - - Form - - - ArchiveChooser.cs - - - - - - - - Form - - - FFmpegWriterForm.cs - - - - Form - - - GifWriterForm.cs - - - - Form - - - JMDForm.cs - - - - Component - - - - - - Code - - - Code - - - Code - - - - Form - - - SynclessRecordingTools.cs - - - Form - - - VideoWriterChooserForm.cs - - - - Form - - - BizBox.cs - - - UserControl - - - BizBoxInfoControl.cs - - - - Form - - - AmstradCPCCoreEmulationSettings.cs - - - Form - - - AmstradCPCAudioSettings.cs - - - Form - - - AmstradCPCPokeMemory.cs - - - Form - - - AmstradCPCNonSyncSettings.cs - - - Component - - - AnalogRangeConfig.cs - - - UserControl - - - AnalogRangeConfigControl.cs - - - Form - - - AutofireConfig.cs - - - Form - - - ControllerConfig.cs - - - UserControl - - - AnalogBindControl.cs - - - UserControl - - - UserControl - - - ControllerConfigPanel.cs - - - Form - - - DisplayConfig.cs - - - Form - - - FileExtensionPreferences.cs - - - UserControl - - - FileExtensionPreferencesPicker.cs - - - Form - - - FirmwaresConfig.cs - - - Form - - - FirmwaresConfigInfo.cs - - - Component - - - Form - - - CGBColorChooserForm.cs - - - Form - - - ColorChooserForm.cs - - - Form - - - DGBPrefs.cs - - - UserControl - - - GBPrefControl.cs - - - Form - - - GBPrefs.cs - - - Form - - - GenericCoreConfig.cs - - - Form - - - EmuHawkOptions.cs - - - Form - - - HotkeyConfig.cs - - - UserControl - - - InputCompositeWidget.cs - - - Component - - - Form - - - ColecoControllerSettings.cs - - - Form - - - A7800ControllerSettings.cs - - - Form - - - A7800FilterSettings.cs - - - Form - - - IntvControllerSettings.cs - - - Form - - - MessageConfig.cs - - - UserControl - - - N64ControllerSettingControl.cs - - - Form - - - N64ControllersSetup.cs - - - Form - - - N64VideoPluginconfig.cs - - - - Form - - - NesControllerSettings.cs - - - Form - - - NESGraphicsConfig.cs - - - Form - - - NESSoundConfig.cs - - - Form - - - NESSyncSettingsForm.cs - - - Form - - - NESVSSettings.cs - - - Form - - - QuickNesConfig.cs - - - Form - - - PathConfig.cs - - - Form - - - PathInfo.cs - - - Form - - - PCEControllerConfig.cs - - - Form - - - PCEGraphicsConfig.cs - - - Form - - - ProfileConfig.cs - - - Form - - - PSXControllerConfig.cs - - - Form - - - PSXHashDiscs.cs - - - Form - - - PSXOptions.cs - - - Form - - - RewindConfig.cs - - - Form - - - SMSGraphicsConfig.cs - - - Form - - - SNESControllerConfig.cs - - - Form - - - SNESOptions.cs - - - Form - - - SoundConfig.cs - - - Form - - - TI83PaletteConfig.cs - - - Form - - - ZXSpectrumAudioSettings.cs - - - Form - - - ZXSpectrumPokeMemory.cs - - - Form - - - ZXSpectrumNonSyncSettings.cs - - - Form - - - ZXSpectrumCoreEmulationSettings.cs - - - Form - - - ZXSpectrumJoystickSettings.cs - - - Form - - - CoreFeatureAnalysis.cs - - - - - Form - - - ExceptionBox.cs - - - Component - - - Component - - - - - Component - - - InputRoll.cs - Component - - - - - Component - - - Component - - - Form - - - MsgBox.cs - - - Component - - - Component - - - Component - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - LogWindow.cs - - - MainForm.cs - Form - - - MainForm.cs - Form - - - MainForm.cs - Form - - - Form - - - EditCommentsForm.cs - - - - - Form - - - MainForm.cs - - - MainForm.cs - Form - - - Form - - - EditSubtitlesForm.cs - - - - Form - - - PlayMovie.cs - - - Form - - - RecordMovie.cs - - - Form - - - SubtitleMaker.cs - - - Form - - - OpenAdvancedChooser.cs - - - Form - - - PlatformChooser.cs - - - - - - Resources.resx - - - Form - - - RomStatusPicker.cs - - - - - - - - - - - - - - - Form - - - BasicBot.cs - - - UserControl - - - BotControlsRow.cs - - - Form - - - BatchRun.cs - - - - Form - - - CDL.cs - - - UserControl - - - CheatEdit.cs - - - Form - - - Cheats.cs - - - Form - - - AddBreakpointDialog.cs - - - - UserControl - - - BreakpointControl.cs - - - Form - - - GenericDebugger.cs - - - GenericDebugger.cs - Form - - - GenericDebugger.cs - Form - - - GenericDebugger.cs - Form - - - UserControl - - - RegisterBoxControl.cs - - - Form - - - GameShark.cs - - - Form - - - GBAGPUView.cs - - - Form - - - MobileBmpView.cs - - - Form - - - MobileDetailView.cs - - - Form - - - GBGameGenie.cs - - - Form - - - GBGPUView.cs - - - Form - - - GBPrinterView.cs - - - Form - - - GenDbgWind.cs - - - Form - - - GenGameGenie.cs - - - Form - - - VDPViewer.cs - - - Form - - - HexColor.cs - - - Form - - - HexEditor.cs - - - Form - - - HexFind.cs - - - - - - - - - - - - - - - - Form - - - LuaCanvas.cs - - - Component - - - Component - - - Form - - - LuaConsole.cs - - - Component - - - Form - - - LuaFunctionsForm.cs - - - Component - - - Form - - - LuaRegisteredFunctionsList.cs - - - Component - - - Form - - - LuaWinform.cs - - - Form - - - Form - - - MacroInput.cs - - - - UserControl - - - MultiDiskFileSelector.cs - - - Form - - - MultiDiskBundler.cs - - - Form - - - BarcodeEntry.cs - - - Component - - - Form - - - NESGameGenie.cs - - - Form - - - NESMusicRipper.cs - - - Form - - - NESNameTableViewer.cs - - - Form - - - NESPPU.cs - - - Component - - - Component - - - Component - - - Component - - - Form - - - PCEBGViewer.cs - - - Form - - - PCESoundDebugger.cs - - - Form - - - PCETileViewer.cs - - - Form - - - VDPViewer.cs - - - Form - - - SNESGameGenie.cs - - - Form - - - SNESGraphicsDebugger.cs - - - Component - - - UserControl - - - BookmarksBranchesBox.cs - - - Form - - - DefaultGreenzoneSettings.cs - - - Form - - - FramesPrompt.cs - - - Form - - - GreenzoneSettings.cs - - - Form - - - HeaderEditor.cs - - - Form - - - PatternsForm.cs - - - Form - - - ScreenshotForm.cs - - - TAStudio.cs - Form - - - TAStudio.cs - Form - - - TAStudio.cs - Form - - - UserControl - - - MarkerControl.cs - - - UserControl - - - PlaybackBox.cs - - - Form - - - TAStudio.cs - - - TAStudio.cs - Form - - - TAStudio.cs - Form - - - TAStudio.cs - Form - - - - Form - - - UndoHistoryForm.cs - - - Form - - - TI83KeyPad.cs - - - Form - - - - Form - - - TraceLogger.cs - - - Component - - - - UserControl - - - VirtualPadAnalogButton.cs - - - UserControl - - - VirtualPadAnalogStick.cs - - - Component - - - UserControl - - - VirtualPadDiscManager.cs - - - UserControl - - - VirtualPadTargetScreen.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UserControl - - - VirtualPad.cs - - - Form - - - VirtualpadsTool.cs - - - Form - - - RamPoke.cs - - - Form - - - RamSearch.cs - - - Form - - - RamWatch.cs - - - Form - - - WatchEditor.cs - - - Component - - - - Code - - - FFmpegWriterForm.cs - - - GifWriterForm.cs - - - JMDForm.cs - - - SynclessRecordingTools.cs - - - VideoWriterChooserForm.cs - - - BizBoxInfoControl.cs - - - AmstradCPCCoreEmulationSettings.cs - - - AmstradCPCAudioSettings.cs - - - AmstradCPCPokeMemory.cs - - - AmstradCPCNonSyncSettings.cs - - - AnalogRangeConfigControl.cs - - - ControllerConfig.cs - - - AnalogBindControl.cs - - - ControllerConfigPanel.cs - - - DisplayConfig.cs - Designer - - - FileExtensionPreferences.cs - - - FileExtensionPreferencesPicker.cs - - - FirmwaresConfig.cs - - - FirmwaresConfigInfo.cs - - - CGBColorChooserForm.cs - - - ColorChooserForm.cs - - - DGBPrefs.cs - - - GBPrefControl.cs - - - GBPrefs.cs - - - GenericCoreConfig.cs - - - EmuHawkOptions.cs - - - HotkeyConfig.cs - - - InputCompositeWidget.cs - - - ColecoControllerSettings.cs - - - A7800ControllerSettings.cs - - - A7800FilterSettings.cs - - - IntvControllerSettings.cs - - - N64ControllerSettingControl.cs - - - N64ControllersSetup.cs - - - N64VideoPluginconfig.cs - - - NesControllerSettings.cs - - - NESGraphicsConfig.cs - - - NESSoundConfig.cs - - - NESSyncSettingsForm.cs - - - NESVSSettings.cs - - - QuickNesConfig.cs - - - PathConfig.cs - - - PathInfo.cs - - - PCEControllerConfig.cs - - - PCEGraphicsConfig.cs - - - ProfileConfig.cs - - - PSXControllerConfig.cs - - - PSXHashDiscs.cs - - - PSXOptions.cs - - - RewindConfig.cs - - - SMSGraphicsConfig.cs - - - SNESControllerConfig.cs - - - SNESOptions.cs - - - TI83PaletteConfig.cs - - - ZXSpectrumAudioSettings.cs - - - ZXSpectrumPokeMemory.cs - - - ZXSpectrumNonSyncSettings.cs - - - ZXSpectrumCoreEmulationSettings.cs - - - ZXSpectrumJoystickSettings.cs - - - CoreFeatureAnalysis.cs - - - ExceptionBox.cs - - - MsgBox.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MainForm.cs - Designer - - - PlayMovie.cs - - - RecordMovie.cs - - - OpenAdvancedChooser.cs - - - PlatformChooser.cs - - - - - - - - - - RomStatusPicker.cs - - - BasicBot.cs - - - BotControlsRow.cs - - - BatchRun.cs - - - CDL.cs - - - CheatEdit.cs - - - Cheats.cs - - - AddBreakpointDialog.cs - - - BreakpointControl.cs - - - GenericDebugger.cs - - - RegisterBoxControl.cs - - - GameShark.cs - Designer - - - GBAGPUView.cs - - - MobileBmpView.cs - - - MobileDetailView.cs - - - GBGameGenie.cs - - - GBGPUView.cs - - - GBPrinterView.cs - - - GenDbgWind.cs - - - GenGameGenie.cs - - - VDPViewer.cs - - - HexColor.cs - - - HexEditor.cs - - - HexFind.cs - - - LuaCanvas.cs - - - LuaConsole.cs - - - LuaFunctionsForm.cs - - - LuaRegisteredFunctionsList.cs - - - LuaWinform.cs - - - MacroInput.cs - - - MultiDiskFileSelector.cs - - - MultiDiskBundler.cs - - - BarcodeEntry.cs - - - NESGameGenie.cs - - - NESMusicRipper.cs - - - NESNameTableViewer.cs - - - NESPPU.cs - Designer - - - PatternViewer.cs - - - PCEBGViewer.cs - - - PCESoundDebugger.cs - - - PCETileViewer.cs - - - VDPViewer.cs - - - SNESGameGenie.cs - - - SNESGraphicsDebugger.cs - - - BookmarksBranchesBox.cs - Designer - - - DefaultGreenzoneSettings.cs - - - FramesPrompt.cs - - - GreenzoneSettings.cs - - - HeaderEditor.cs - - - MarkerControl.cs - - - PatternsForm.cs - - - PlaybackBox.cs - - - ScreenshotForm.cs - - - TAStudio.cs - - - UndoHistoryForm.cs - - - TI83KeyPad.cs - - - VirtualPadAnalogButton.cs - - - VirtualPadAnalogStick.cs - - - VirtualPadDiscManager.cs - - - VirtualPadTargetScreen.cs - - - VirtualPad.cs - - - VirtualpadsTool.cs - - - RamPoke.cs - - - RamSearch.cs - - - RamWatch.cs - - - WatchEditor.cs - - - Form - - - InputPrompt.cs - - - - Form - - - ToolBox.cs - - - - - - {8e2f11f2-3955-4382-8c3a-ceba1276caea} - BizHawk.Client.ApiHawk - - - {24A0AA3C-B25F-4197-B23D-476D6462DBA0} - BizHawk.Client.Common - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - - - {e1a23168-b571-411c-b360-2229e7225e0e} - BizHawk.Emulation.Common - - - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} - BizHawk.Emulation.Cores - - - {f51946ea-827f-4d82-b841-1f2f6d060312} - BizHawk.Emulation.DiscSystem - - - {337CA23E-65E7-44E1-9411-97EE08BB8116} - BizHawk.Bizware.BizwareGL.GdiPlus - - - {5160CFB1-5389-47C1-B7F6-8A0DC97641EE} - BizHawk.Bizware.BizwareGL.OpenTK - - - {E6B436B1-A3CD-4C9A-8F76-5D7154726884} - BizHawk.Bizware.BizwareGL.SlimDX - - - {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} - BizHawk.Bizware.BizwareGL - - - - - ArchiveChooser.cs - Designer - - - BizBox.cs - - - AutofireConfig.cs - - - MessageConfig.cs - Designer - - - SoundConfig.cs - Designer - - - LogWindow.cs - - - EditCommentsForm.cs - - - EditSubtitlesForm.cs - - - SubtitleMaker.cs - - - TraceLogger.cs - - - InputPrompt.cs - Designer - - - ToolBox.cs - Designer - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - false - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" - "$(SolutionDir)subwcrev.sh" "$(ProjectDir)" - - - - - - \ No newline at end of file + + true + Properties + images/logo.ico + app.manifest + 0 + 1.0.0.%2a + EmuHawk + true + true + AllRules.ruleset + Debug + prompt + 512 + + true + Disk + false + 8.0 + true + 3.5 + ../output + WinExe + x86 + AnyCPU + false + {DD448B37-BA3F-4544-9754-5406E8094723} + 9.0.30729 + publish/ + None + BizHawk.Client.EmuHawk + 2.0 + BizHawk.Client.EmuHawk.Program + + v4.6.1 + false + 7 + Days + Foreground + false + false + + false + false + + + true + full + DEBUG;EXE_PROJECT + false + + + false + pdbonly + EXE_PROJECT + true + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 2.0 %28x86%29 + false + + + False + .NET Framework 3.0 %28x86%29 + false + + + False + .NET Framework 3.5 + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Client.EmuHawk/DotNetBuild.NuGet.targets b/BizHawk.Client.EmuHawk/DotNetBuild.NuGet.targets deleted file mode 100644 index 986eba31a6..0000000000 --- a/BizHawk.Client.EmuHawk/DotNetBuild.NuGet.targets +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - diff --git a/BizHawk.Client.EmuHawk/ProjectPkgRefs.abs.props b/BizHawk.Client.EmuHawk/ProjectPkgRefs.abs.props new file mode 100644 index 0000000000..e9c4773384 --- /dev/null +++ b/BizHawk.Client.EmuHawk/ProjectPkgRefs.abs.props @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj index f5dd02f8a7..434a12b917 100644 --- a/BizHawk.Common/BizHawk.Common.csproj +++ b/BizHawk.Common/BizHawk.Common.csproj @@ -1,117 +1,26 @@ - - - - - Debug - x86 - 8.0.30703 - 2.0 - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - Library - Properties - BizHawk.Common - BizHawk.Common - v4.6.1 - 512 - - 8.0 - - - true - ..\output\dll\ - TRACE;DEBUG;WINDOWS - true - full - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - - - ..\output\dll\ - TRACE;WINDOWS - true - true - pdbonly - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - - - - - - - - - - - - - - svnrev.cs - - - VersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + true + ../output/dll + net461 + + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj index 04e94d7f37..e5b14320a0 100644 --- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj +++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj @@ -1,156 +1,31 @@ - - - - - true - ..\output\dll\ - DEBUG;TRACE - true - full - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - ..\output\dll\ - TRACE - true - true - pdbonly - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - - Debug - x86 - {E1A23168-B571-411C-B360-2229E7225E0E} - Library - Properties - BizHawk.Emulation.Common - BizHawk.Emulation.Common - v4.6.1 - 512 - - 8.0 - - - - - - - - - - - - - - - - - svnrev.cs - - - VersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {866f8d13-0678-4ff9-80a4-a3993fd4d8a3} - BizHawk.Common - - - {F51946EA-827F-4D82-B841-1F2F6D060312} - BizHawk.Emulation.DiscSystem - - - - - - - - - \ No newline at end of file + + + + true + ../output/dll + net461 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Emulation.Common/DotNetBuild.NuGet.targets b/BizHawk.Emulation.Common/DotNetBuild.NuGet.targets deleted file mode 100644 index d669ed3d82..0000000000 --- a/BizHawk.Emulation.Common/DotNetBuild.NuGet.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/BizHawk.Emulation.Common/packages.config b/BizHawk.Emulation.Common/packages.config deleted file mode 100644 index 2b6424fa00..0000000000 --- a/BizHawk.Emulation.Common/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj index b799df0596..6ef1bdbfb9 100644 --- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj +++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj @@ -1,1864 +1,379 @@ - - - - - Debug - x86 - 9.0.30729 - 2.0 - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} - Library - Properties - BizHawk.Emulation.Cores - BizHawk.Emulation.Cores - v4.6.1 - 512 - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - 8.0 - - - true - ..\output\dll\ - DEBUG;TRACE - true - full - AnyCPU - false - prompt - - AllRules.ruleset - false - false - - - ..\output\dll\ - TRACE;VS2010 - true - true - pdbonly - AnyCPU - false - prompt - - AllRules.ruleset - false - false - - - - - - - - - - ..\References\PeNet.dll - - - - - 3.5 - - - - - - 3.5 - - - 3.5 - - - - - ..\References\Virtu.dll - - - - - svnrev.cs - - - VersionInfo.cs - - - - - TI83.cs - - - TI83.cs - - - TI83.cs - - - TI83.cs - - - - TI83.cs - - - TI83.cs - - - TI83.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AppleII.cs - - - AppleII.cs - - - AppleII.cs - - - AppleII.cs - - - AppleII.cs - - - AppleII.cs - - - AppleII.cs - - - AppleII.cs - - - AppleII.cs - - - - - C64.cs - - - C64.cs - - - C64.cs - - - C64.cs - - - C64.cs - - - C64.cs - - - C64.cs - - - C64.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NECUPD765.cs - - - NECUPD765.cs - - - NECUPD765.cs - - - NECUPD765.cs - - - NECUPD765.cs - - - NECUPD765.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SpectrumBase.cs - - - SpectrumBase.cs - - - SpectrumBase.cs - - - SpectrumBase.cs - - - - - - ZX48.cs - - - ZX48.cs - - - - - - ZX128.cs - - - ZX128.cs - - - - - - ZX128Plus2a.cs - - - ZX128Plus2a.cs - - - - - ZX128Plus3.cs - - - ZX128Plus3.cs - - - - Pentagon128.cs - - - Pentagon128.cs - - - - - - - ZXSpectrum.cs - - - ZXSpectrum.cs - - - ZXSpectrum.cs - - - ZXSpectrum.cs - - - ZXSpectrum.cs - - - ZXSpectrum.cs - - - ZXSpectrum.cs - - - ZXSpectrum.cs - - - ZXSpectrum.cs - - - ZXSpectrum.cs - - - - MSX.cs - - - MSX.cs - - - MSX.cs - - - MSX.cs - - - MSX.cs - - - MSX.cs - - - MSX.cs - - - - Atari2600.cs - - - Atari2600.cs - - - Atari2600.cs - - - Atari2600.cs - - - Atari2600.cs - - - Atari2600.cs - - - Atari2600.cs - - - Atari2600.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A7800Hawk.cs - - - A7800Hawk.cs - - - A7800Hawk.cs - - - A7800Hawk.cs - - - A7800Hawk.cs - - - A7800Hawk.cs - - - A7800Hawk.cs - - - - - - - - - - - - A7800Hawk.cs - - - - - - - - - - - Lynx.cs - - - Lynx.cs - - - Lynx.cs - - - Lynx.cs - - - Lynx.cs - - - Lynx.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - VectrexHawk.cs - - - VectrexHawk.cs - - - VectrexHawk.cs - - - VectrexHawk.cs - - - VectrexHawk.cs - - - VectrexHawk.cs - - - VectrexHawk.cs - - - - - - - - - - - - ColecoVision.cs - - - ColecoVision.cs - - - ColecoVision.cs - - - ColecoVision.cs - - - ColecoVision.cs - - - ColecoVision.cs - - - ColecoVision.cs - - - - - - - - - - - - Intellivision.cs - - - Intellivision.cs - - - Intellivision.cs - - - Intellivision.cs - - - - - Intellivision.cs - - - Intellivision.cs - - - Intellivision.cs - - - Intellivision.cs - - - - - - - O2Hawk.cs - - - O2Hawk.cs - - - O2Hawk.cs - - - O2Hawk.cs - - - O2Hawk.cs - - - O2Hawk.cs - - - O2Hawk.cs - - - - - - - - - - - - - - Gambatte.cs - - - Gambatte.cs - - - Gambatte.cs - - - Gambatte.cs - - - Gambatte.cs - - - Gambatte.cs - - - Gambatte.cs - - - Gambatte.cs - - - Gambatte.cs - - - Gambatte.cs - - - Gambatte.cs - - - - GambatteLink.cs - - - GambatteLink.cs - - - GambatteLink.cs - - - GambatteLink.cs - - - GambatteLink.cs - - - GambatteLink.cs - - - GambatteLink.cs - - - GambatteLink.cs - - - GambatteLink.cs - - - - GambatteLink.cs - - - - - - - - - - - - - - - MGBAHawk.cs - - - MGBAHawk.cs - - - MGBAHawk.cs - - - MGBAHawk.cs - - - MGBAHawk.cs - - - MGBAHawk.cs - - - MGBAHawk.cs - - - MGBAHawk.cs - - - - VBANext.cs - - - VBANext.cs - - - VBANext.cs - - - VBANext.cs - - - VBANext.cs - - - VBANext.cs - - - VBANext.cs - - - VBANext.cs - - - - - - GBHawkLink4x.cs - - - GBHawkLink4x.cs - - - GBHawkLink4x.cs - - - GBHawkLink4x.cs - - - GBHawkLink4x.cs - - - GBHawkLink4x.cs - - - GBHawkLink4x.cs - - - - - - - GBHawkLink3x.cs - - - GBHawkLink3x.cs - - - GBHawkLink3x.cs - - - GBHawkLink3x.cs - - - GBHawkLink3x.cs - - - GBHawkLink3x.cs - - - GBHawkLink3x.cs - - - - - - - GBHawkLink.cs - - - GBHawkLink.cs - - - GBHawkLink.cs - - - GBHawkLink.cs - - - GBHawkLink.cs - - - GBHawkLink.cs - - - GBHawkLink.cs - - - - - - - - - - - - - GBHawk.cs - - - GBHawk.cs - - - GBHawk.cs - - - GBHawk.cs - - - GBHawk.cs - - - GBHawk.cs - - - GBHawk.cs - - - - - - - - - - - - - - - - - - - - - - PPU.cs - - - PPU.cs - - - PPU.cs - - - - - N64.cs - - - N64.cs - - - N64.cs - - - N64.cs - - - N64.cs - - - N64.cs - - - N64.cs - - - N64.cs - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - Code - - - - Code - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - NES.cs - - - NES.cs - - - NES.cs - - - NES.cs - - - NES.cs - - - - NES.cs - - - NES.cs - - - NES.cs - - - NES.cs - - - - - - - - - - - SubNESHawk.cs - - - SubNESHawk.cs - - - SubNESHawk.cs - - - SubNESHawk.cs - - - SubNESHawk.cs - - - SubNESHawk.cs - - - - - - QuickNES.cs - - - QuickNES.cs - - - QuickNES.cs - - - QuickNES.cs - - - QuickNES.cs - - - QuickNES.cs - - - QuickNES.cs - - - QuickNES.cs - - - QuickNES.cs - - - QuickNES.cs - - - QuickNES.cs - - - - - - LibsnesCore.cs - - - LibsnesCore.cs - - - LibsnesCore.cs - - - LibsnesCore.cs - - - LibsnesCore.cs - - - LibsnesCore.cs - - - LibsnesCore.cs - - - LibsnesCore.cs - - - - - - - - - - LibsnesCore.cs - - - LibsnesCore.cs - - - - - - - - - - - - - PCEngine.cs - - - PCEngine.cs - - - PCEngine.cs - - - PCEngine.cs - - - PCEngine.cs - - - PCEngine.cs - - - - PCEngine.cs - - - PCEngine.cs - - - PCEngine.cs - - - - - - - GGHawkLink.cs - - - GGHawkLink.cs - - - GGHawkLink.cs - - - GGHawkLink.cs - - - GGHawkLink.cs - - - GGHawkLink.cs - - - GGHawkLink.cs - - - - - GPGX.cs - - - - - GPGX.cs - - - GPGX.cs - - - GPGX.cs - - - GPGX.cs - - - GPGX.cs - - - GPGX.cs - - - GPGX.cs - - - GPGX.cs - - - GPGX.cs - - - GPGX.cs - - - GPGX.cs - - - GPGX.cs - - - - - - - - - - - - - - SMS.cs - - - SMS.cs - - - SMS.cs - - - SMS.cs - - - SMS.cs - - - SMS.cs - - - SMS.cs - - - SMS.cs - - - SMS.cs - - - - - - - - - - - - - - - - - Code - - - Octoshock.cs - - - Octoshock.cs - - - Octoshock.cs - - - - - - - - WonderSwan.cs - - - WonderSwan.cs - - - WonderSwan.cs - - - WonderSwan.cs - - - WonderSwan.cs - - - WonderSwan.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - - - {e1a23168-b571-411c-b360-2229e7225e0e} - BizHawk.Emulation.Common - - - {f51946ea-827f-4d82-b841-1f2f6d060312} - BizHawk.Emulation.DiscSystem - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" - "$(SolutionDir)subwcrev.sh" "$(ProjectDir)" - - - - - - \ No newline at end of file + + + + true + ../output/dll + net461 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Emulation.Cores/DotNetBuild.NuGet.targets b/BizHawk.Emulation.Cores/DotNetBuild.NuGet.targets deleted file mode 100644 index cea817be8f..0000000000 --- a/BizHawk.Emulation.Cores/DotNetBuild.NuGet.targets +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/BizHawk.Emulation.Cores/packages.config b/BizHawk.Emulation.Cores/packages.config deleted file mode 100644 index a36ca0f168..0000000000 --- a/BizHawk.Emulation.Cores/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj index 9b41a4eb50..7460888fed 100644 --- a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj +++ b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj @@ -1,139 +1,26 @@ - - - - - true - ..\output\dll\ - DEBUG;TRACE - true - full - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - ..\output\dll\ - TRACE - true - true - pdbonly - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - - Debug - x86 - {F51946EA-827F-4D82-B841-1F2F6D060312} - Library - Properties - BizHawk.Emulation.DiscSystem - BizHawk.Emulation.DiscSystem - v4.6.1 - 512 - - 8.0 - - - - - - - - - - - - - svnrev.cs - - - VersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {866f8d13-0678-4ff9-80a4-a3993fd4d8a3} - BizHawk.Common - - - - - - - - - - - - - - \ No newline at end of file + + + + true + ../output/dll + net461 + + + + + + + + + + + + + + + + + + + + diff --git a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj index 0c4d8f2d64..fa01a10f64 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj @@ -1,84 +1,26 @@ - - - - - Debug - x86 - 8.0.30703 - 2.0 - {337CA23E-65E7-44E1-9411-97EE08BB8116} - Library - Properties - BizHawk.Bizware.BizwareGL.GdiPlus - BizHawk.Bizware.BizwareGL.GdiPlus - v4.6.1 - 512 - - 8.0 - - - true - ..\..\output\dll\ - DEBUG;TRACE - true - full - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - - - ..\..\output\dll\ - TRACE - true - true - pdbonly - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - - - - - - - - - - - - - - - - - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - - - {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} - BizHawk.Bizware.BizwareGL - - - - - - Component - - - - - + + + + true + ../../output/dll + net461 + + + + + + + + + + + + + + + + + + + diff --git a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/DotNetBuild.NuGet.targets b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/DotNetBuild.NuGet.targets deleted file mode 100644 index 030ce546dd..0000000000 --- a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/DotNetBuild.NuGet.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/packages.config b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/packages.config deleted file mode 100644 index a705dc46a0..0000000000 --- a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj index 0c656684c6..25decfe81c 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj @@ -1,91 +1,30 @@ - - - - - Debug - x86 - 8.0.30703 - 2.0 - {5160CFB1-5389-47C1-B7F6-8A0DC97641EE} - Library - Properties - BizHawk.Bizware.BizwareGL.OpenTK - BizHawk.Bizware.BizwareGL.OpenTK - v4.6.1 - 512 - - 8.0 - - - true - ..\..\output\dll\ - DEBUG;TRACE - true - full - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - ..\..\output\dll\ - TRACE - true - true - pdbonly - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - - - - - - - - - - - - - - - - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - - - {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} - BizHawk.Bizware.BizwareGL - - - - - UserControl - - - - - + + + + true + ../../output/dll + net461 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/DotNetBuild.NuGet.targets b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/DotNetBuild.NuGet.targets deleted file mode 100644 index bba4a12ac8..0000000000 --- a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/DotNetBuild.NuGet.targets +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - diff --git a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/packages.config b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/packages.config deleted file mode 100644 index b41861333f..0000000000 --- a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj index 3cada20183..7f24eb55db 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj @@ -1,87 +1,29 @@ - - - - - Debug - x86 - 8.0.30703 - 2.0 - {E6B436B1-A3CD-4C9A-8F76-5D7154726884} - Library - Properties - BizHawk.Bizware.BizwareGL.SlimDX - BizHawk.Bizware.BizwareGL.SlimDX - v4.6.1 - 512 - - 8.0 - - - true - ..\..\output\dll\ - DEBUG;TRACE - true - full - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - - - ..\..\output\dll\ - TRACE - true - true - pdbonly - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - - - - - - - - ..\..\References\x64\SlimDX.dll - - - - - - - - - - - - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - - - {9f84a0b2-861e-4ef4-b89b-5e2a3f38a465} - BizHawk.Bizware.BizwareGL - - - - - - Component - - - - - + + + + true + ../../output/dll + net461 + + + + + + + + + + + + + + + + + + + + diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/DotNetBuild.NuGet.targets b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/DotNetBuild.NuGet.targets deleted file mode 100644 index 030ce546dd..0000000000 --- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/DotNetBuild.NuGet.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/packages.config b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/packages.config deleted file mode 100644 index a705dc46a0..0000000000 --- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj index d4e4490c0d..a59b5716fb 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj @@ -1,117 +1,30 @@ - - - - - Debug - x86 - 8.0.30703 - 2.0 - {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} - Library - Properties - BizHawk.Bizware.BizwareGL - BizHawk.Bizware.BizwareGL - v4.6.1 - 512 - - 8.0 - - - true - ..\..\output\dll\ - DEBUG;TRACE - true - full - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - ..\..\output\dll\ - TRACE - true - true - pdbonly - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UserControl - - - - - - - Code - - - - - - - - UserControl - - - - - - - - - - - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - - - - - \ No newline at end of file + + + + true + ../../output/dll + net461 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Bizware/BizHawk.Bizware.BizwareGL/DotNetBuild.NuGet.targets b/Bizware/BizHawk.Bizware.BizwareGL/DotNetBuild.NuGet.targets deleted file mode 100644 index 030ce546dd..0000000000 --- a/Bizware/BizHawk.Bizware.BizwareGL/DotNetBuild.NuGet.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/Bizware/BizHawk.Bizware.BizwareGL/packages.config b/Bizware/BizHawk.Bizware.BizwareGL/packages.config deleted file mode 100644 index a705dc46a0..0000000000 --- a/Bizware/BizHawk.Bizware.BizwareGL/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Build/Common.targets b/Build/Common.targets deleted file mode 100644 index 32842c5242..0000000000 --- a/Build/Common.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Common.abs.props b/Common.abs.props new file mode 100644 index 0000000000..afb2f94974 --- /dev/null +++ b/Common.abs.props @@ -0,0 +1,20 @@ + + + prompt + false + 8.0 + x64 + + + true + full + DEBUG;TRACE + false + + + false + pdbonly + TRACE + true + + diff --git a/CommonRefAssemblies.abs.props b/CommonRefAssemblies.abs.props new file mode 100644 index 0000000000..e46100c17e --- /dev/null +++ b/CommonRefAssemblies.abs.props @@ -0,0 +1,5 @@ + + + + + diff --git a/CommonResourceGen.rel.props b/CommonResourceGen.rel.props new file mode 100644 index 0000000000..f0b491b82e --- /dev/null +++ b/CommonResourceGen.rel.props @@ -0,0 +1,19 @@ + + + true + CurrentArchitecture + CurrentRuntime + + + + + + + + + diff --git a/DotNetBuild.Common.targets b/DotNetBuild.Common.targets deleted file mode 100644 index 92a8fbefd5..0000000000 --- a/DotNetBuild.Common.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/DotNetBuild.Resources.targets b/DotNetBuild.Resources.targets deleted file mode 100644 index c77d058751..0000000000 --- a/DotNetBuild.Resources.targets +++ /dev/null @@ -1,24 +0,0 @@ - - - true - CurrentArchitecture - CurrentRuntime - - - - ..\References\System.Buffers.dll - - - ..\References\System.Memory.dll - - - ..\References\System.Numerics.Vectors.dll - - - ..\References\System.Resources.Extensions.dll - - - ..\References\System.Runtime.CompilerServices.Unsafe.dll - - - diff --git a/NamespaceAliasHack.abs.targets b/NamespaceAliasHack.abs.targets new file mode 100644 index 0000000000..953a19ab4c --- /dev/null +++ b/NamespaceAliasHack.abs.targets @@ -0,0 +1,11 @@ + + + + + + linqbridge + + + + diff --git a/Version/Version.csproj b/Version/Version.csproj index f161e5f79a..31ca91b88d 100644 --- a/Version/Version.csproj +++ b/Version/Version.csproj @@ -1,59 +1,19 @@ - - - - - - - - Debug - x86 - 8.0.30703 - 2.0 - {0CE8B337-08E3-4602-BF10-C4D4C75D2F13} - Library - Version - Version - v4.6.1 - 512 - - 8.0 - - - true - bin\Debug\ - DEBUG;TRACE - full - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - - - bin\Release\ - TRACE - true - pdbonly - AnyCPU - prompt - - MinimumRecommendedRules.ruleset - false - false - - - - "$(ProjectDir)..\Build\BizHawk.Build.Tool.exe" GIT_REV --wc "$(ProjectDir).." --template "$(ProjectDir)svnrev_template" --out "$(ProjectDir)svnrev.cs" - "$(ProjectDir)../Build/standin.sh" - - - - - + + + pdbonly + TRACE + prompt + true + ./bin + AnyCPU + netstandard2.0 + + + + + + + + +