From 85571fe0caa7a07d61676fc47a55c8a59dd7ceaf Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 11 Apr 2013 01:02:47 +0000 Subject: [PATCH] Update 2012 project to use .net 4.5 --- .../BizHawk.Emulation_v4.5.csproj | 544 +++++++++ .../BizHawk.MultiClient_v4.5.csproj | 1081 +++++++++++++++++ BizHawk.Util/BizHawk.Util_v4.5.csproj | 198 +++ BizHawk_2012.sln | 8 +- DiscoHawk/DiscoHawk_4.5.csproj | 169 +++ 5 files changed, 1996 insertions(+), 4 deletions(-) create mode 100644 BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj create mode 100644 BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj create mode 100644 BizHawk.Util/BizHawk.Util_v4.5.csproj create mode 100644 DiscoHawk/DiscoHawk_4.5.csproj diff --git a/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj b/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj new file mode 100644 index 0000000000..b738a00be0 --- /dev/null +++ b/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj @@ -0,0 +1,544 @@ + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} + Library + Properties + BizHawk.Emulation + BizHawk.Emulation + v4.5 + 512 + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + x86 + true + false + AllRules.ruleset + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + x86 + true + AllRules.ruleset + false + false + + + + False + ..\BizHawk.MultiClient\output\dll\EMU7800.dll + + + + 3.5 + + + + + 3.5 + + + 3.5 + + + + + + + VersionInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + Code + + + + Code + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + Code + + + + + + + + + + + + Code + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + Code + + + Code + + + + Code + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + 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 diff --git a/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj new file mode 100644 index 0000000000..c2d0abb995 --- /dev/null +++ b/BizHawk.MultiClient/BizHawk.MultiClient_v4.5.csproj @@ -0,0 +1,1081 @@ + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {DD448B37-BA3F-4544-9754-5406E8094723} + WinExe + Properties + BizHawk.MultiClient + BizHawk.MultiClient + v4.5 + 512 + + + false + images\logo.ico + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + WINDOWS + + + true + full + false + output\ + $(DefineConstants);DEBUG + prompt + 4 + x86 + false + true + AllRules.ruleset + false + + + pdbonly + true + output\ + prompt + 4 + x86 + true + false + AllRules.ruleset + false + + + true + + + + ..\ICSharpCode.SharpZipLib.dll + + + False + .\LuaInterface.dll + + + + False + ..\Newtonsoft.Json.dll + + + + 3.5 + + + + + + 3.5 + + + 3.5 + + + + + + + + False + ..\SlimDX.dll + + + + + VersionInfo.cs + + + Form + + + AboutBox.cs + + + Form + + + ArchiveChooser.cs + + + + + + Form + + + FFmpegWriterForm.cs + + + + Form + + + GifWriterForm.cs + + + + Form + + + JMDForm.cs + + + + Component + + + + + Form + + + VideoWriterChooserForm.cs + + + + Form + + + BizBox.cs + + + + + Form + + + AutofireConfig.cs + + + Form + + + ControllerConfig.cs + + + UserControl + + + ControllerConfigPanel.cs + + + Form + + + GifAnimator.cs + + + Component + + + Form + + + MessageConfig.cs + + + Form + + + PathConfig.cs + + + Form + + + PathInfo.cs + + + + Form + + + SoundConfig.cs + + + + + Form + + + GBAGPUView.cs + + + Form + + + MobileBmpView.cs + + + Form + + + MobileDetailView.cs + + + Component + + + Form + + + CGBColorChooserForm.cs + + + Form + + + ColorChooserForm.cs + + + Form + + + GBGPUView.cs + + + + + + + + + + + Form + + + LogWindow.cs + + + Form + + + Form + + + EditCommentsForm.cs + + + + + + Form + + + MainForm.cs + + + MainForm.cs + Form + + + Form + + + EditSubtitlesForm.cs + + + + + + + + + + + Form + + + SubtitleMaker.cs + + + + Form + + + NameStateForm.cs + + + Component + + + Form + + + NESDebugger.cs + + + Form + + + NESGameGenie.cs + + + Form + + + NESGraphicsConfig.cs + + + Form + + + NESNameTableViewer.cs + + + Form + + + NESPPU.cs + + + Form + + + NESSoundConfig.cs + + + Component + + + Component + + + Component + + + Component + + + Form + + + PCEBGViewer.cs + + + Form + + + PCEGraphicsConfig.cs + + + Form + + + PlayMovie.cs + + + + + Form + + + SNESGraphicsDebugger.cs + + + Component + + + Form + + + SNESOptions.cs + + + Form + + + HexColor.cs + + + Form + + + HexFind.cs + + + + Component + + + + Component + + + Form + + + LuaWinform.cs + + + Form + + + LuaWriter.cs + + + Component + + + Form + + + LuaWriterColorConfig.cs + + + + Form + + + TraceLogger.cs + + + UserControl + + + VirtualPadA78.cs + + + UserControl + + + VirtualPadA78Control.cs + + + UserControl + + + VirtualPadC64Keyboard.cs + + + UserControl + + + VirtualPadColeco.cs + + + Form + + + VirtualPadForm.cs + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + + FFmpegWriterForm.cs + + + GifWriterForm.cs + + + JMDForm.cs + + + VideoWriterChooserForm.cs + + + ControllerConfig.cs + + + ControllerConfigPanel.cs + + + GifAnimator.cs + + + PathInfo.cs + + + GBAGPUView.cs + + + MobileBmpView.cs + + + MobileDetailView.cs + + + CGBColorChooserForm.cs + + + ColorChooserForm.cs + + + GBGPUView.cs + + + MainForm.cs + Designer + + + NameStateForm.cs + Designer + + + NESSoundConfig.cs + + + PCEBGViewer.cs + + + PCEGraphicsConfig.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + SMSGraphicsConfig.cs + + + SNESGraphicsDebugger.cs + + + SNESOptions.cs + + + HexColor.cs + + + HexFind.cs + + + LuaFunctionList.cs + + + LuaWinform.cs + + + LuaWriter.cs + + + LuaWriterColorConfig.cs + + + RamWatch.cs + Designer + + + RamWatchNewWatch.cs + Designer + + + True + Resources.resx + True + + + VirtualPadA78.cs + + + VirtualPadA78Control.cs + + + VirtualPadC64Keyboard.cs + + + VirtualPadColeco.cs + + + VirtualPadForm.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + Form + + + RecordMovie.cs + + + + Form + + + SMSGraphicsConfig.cs + + + + Form + + + HotkeyWindow.cs + + + Form + + + TI83KeyPad.cs + + + + + Form + + + Cheats.cs + + + Form + + + LuaFunctionList.cs + + + + Component + + + Form + + + HexEditor.cs + + + Form + + + LuaConsole.cs + + + + + Component + + + Form + + + RamPoke.cs + + + Form + + + InputPrompt.cs + + + Form + + + RamSearch.cs + + + Form + + + RamWatch.cs + + + Form + + + RamWatchNewWatch.cs + + + + + Form + + + + + + Form + + + TAStudio.cs + + + Form + + + ToolBox.cs + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + + + + {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} + BizHawk.Emulation + + + {EE135301-08B3-4EFC-A61C-1C53E1C65CB9} + BizHawk.Util + + + + + AboutBox.cs + Designer + + + ArchiveChooser.cs + Designer + + + BizBox.cs + + + AutofireConfig.cs + + + MessageConfig.cs + Designer + + + PathConfig.cs + + + SoundConfig.cs + Designer + + + + + + + + LogWindow.cs + + + EditCommentsForm.cs + + + EditSubtitlesForm.cs + + + SubtitleMaker.cs + + + NESDebugger.cs + Designer + + + NESGameGenie.cs + Designer + + + NESGraphicsConfig.cs + + + NESNameTableViewer.cs + Designer + + + NESPPU.cs + Designer + + + PatternViewer.cs + Designer + + + PlayMovie.cs + Designer + + + RecordMovie.cs + Designer + + + HotkeyWindow.cs + Designer + + + TI83KeyPad.cs + Designer + + + Cheats.cs + Designer + + + TraceLogger.cs + + + VirtualPad.cs + Designer + + + HexEditor.cs + Designer + + + LuaConsole.cs + + + MemoryViewer.cs + Designer + + + RamPoke.cs + Designer + + + InputPrompt.cs + Designer + + + RamSearch.cs + Designer + + + TAStudio.cs + + + 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 diff --git a/BizHawk.Util/BizHawk.Util_v4.5.csproj b/BizHawk.Util/BizHawk.Util_v4.5.csproj new file mode 100644 index 0000000000..fdf29f8eeb --- /dev/null +++ b/BizHawk.Util/BizHawk.Util_v4.5.csproj @@ -0,0 +1,198 @@ + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {EE135301-08B3-4EFC-A61C-1C53E1C65CB9} + Library + Properties + BizHawk.Util + BizHawk.Util + v4.5 + 512 + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + true + full + false + bin\Debug\ + TRACE;DEBUG;DOTNET20;UNMANAGED;COMPRESS + prompt + 4 + x86 + AllRules.ruleset + false + + + pdbonly + true + bin\Release\ + TRACE;DOTNET20;UNMANAGED;COMPRESS + prompt + 4 + x86 + AllRules.ruleset + false + + + + + 3.5 + + + + + 3.5 + + + 3.5 + + + + + + + VersionInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Component + + + Component + + + Form + + + + + + Component + + + + + Component + + + Component + + + Component + + + + Component + + + Component + + + + + + + + + + + + + + + + + + + InputConfigBase.cs + Designer + + + + + False + .NET Framework 3.5 SP1 Client Profile + 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 diff --git a/BizHawk_2012.sln b/BizHawk_2012.sln index a3414e459a..23544e8286 100644 --- a/BizHawk_2012.sln +++ b/BizHawk_2012.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation", "BizHawk.Emulation\BizHawk.Emulation.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation_v4.5", "BizHawk.Emulation\BizHawk.Emulation_v4.5.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Util", "BizHawk.Util\BizHawk.Util.csproj", "{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Util_v4.5", "BizHawk.Util\BizHawk.Util_v4.5.csproj", "{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.MultiClient", "BizHawk.MultiClient\BizHawk.MultiClient.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.MultiClient_v4.5", "BizHawk.MultiClient\BizHawk.MultiClient_v4.5.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk_4.5", "DiscoHawk\DiscoHawk_4.5.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DiscoHawk/DiscoHawk_4.5.csproj b/DiscoHawk/DiscoHawk_4.5.csproj new file mode 100644 index 0000000000..7b8e9b5537 --- /dev/null +++ b/DiscoHawk/DiscoHawk_4.5.csproj @@ -0,0 +1,169 @@ + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {C4366030-6D03-424B-AE53-F4F43BB217C3} + WinExe + Properties + DiscoHawk + DiscoHawk + v4.5 + 512 + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + true + full + false + ..\BizHawk.MultiClient\output\ + TRACE;DEBUG;WINDOWS + prompt + 4 + false + AllRules.ruleset + x86 + false + + + pdbonly + true + ..\BizHawk.MultiClient\output\ + TRACE;WINDOWS + prompt + 4 + false + x86 + AllRules.ruleset + false + + + true + + + + + + discohawk.ico + + + + + + VersionInfo.cs + + + Form + + + About.cs + + + + + Form + + + DiscoHawkDialog.cs + + + Form + + + MainDiscoForm.cs + + + Form + + + ProgressDialog.cs + + + + + + + + 3.5 + + + + + + + + + + About.cs + + + DiscoHawkDialog.cs + + + MainDiscoForm.cs + + + ProgressDialog.cs + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} + BizHawk.Emulation + + + + + + + + + + "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" + "$(SolutionDir)subwcrev.sh" "$(ProjectDir)" + + \ No newline at end of file