ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate DiscoHawk to new .csproj format

This commit is contained in:
YoshiRulz 2020-05-03 11:29:50 +10:00
parent cc22bed841
commit 178c491a9f
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 18 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
View File

@ -1,29 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../MainSlnCommon.props" />
<PropertyGroup>
<ApplicationIcon>discohawk.ico</ApplicationIcon>
<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
<OutputPath>$(ProjectDir)../../output</OutputPath>
<OutputType>Exe</OutputType>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
<!--
<PropertyGroup>
<AppDesignerFolder>Properties</AppDesignerFolder>
<ApplicationIcon>discohawk.ico</ApplicationIcon>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<AssemblyName>DiscoHawk</AssemblyName>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<BootstrapperEnabled>true</BootstrapperEnabled>
<CodeAnalysisRuleSet Condition=" '$(OS)' == 'Windows_NT' ">AllRules.ruleset</CodeAnalysisRuleSet>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<ErrorReport>prompt</ErrorReport>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags/>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<IsWebBootstrapper>false</IsWebBootstrapper>
<LangVersion>8.0</LangVersion>
<MapFileExtensions>true</MapFileExtensions>
<NoWin32Manifest>true</NoWin32Manifest>
<OldToolsVersion>3.5</OldToolsVersion>
<OutputPath>$(ProjectDir)../../output</OutputPath>
<OutputType>Exe</OutputType>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<PlatformTarget>AnyCPU</PlatformTarget>
<ProductVersion>9.0.30729</ProductVersion>
<ProjectGuid>{C4366030-6D03-424B-AE53-F4F43BB217C3}</ProjectGuid>
<PublishUrl>publish/</PublishUrl>
@ -31,7 +30,6 @@
<SchemaVersion>2.0</SchemaVersion>
<StartupObject/>
<TargetFrameworkProfile/>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<UpdateEnabled>false</UpdateEnabled>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
@ -42,18 +40,6 @@
<UseApplicationTrust>false</UseApplicationTrust>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<DefineConstants>DEBUG;TRACE;WINDOWS</DefineConstants>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugSymbols>false</DebugSymbols>
<DebugType>pdbonly</DebugType>
<DefineConstants>TRACE;WINDOWS</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
@ -71,32 +57,15 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="../CommonStyleCopAnalyzer.props" />
<Import Project="../CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
-->
<ItemGroup>
<Reference Include="System" />
<!--<Reference Include="System.Core" RequiredTargetFramework="3.5" />-->
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<!--<Reference Include="System.Xml" />-->
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj"
Name="BizHawk.Common"
Project="{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj"
Name="BizHawk.Emulation.DiscSystem"
Project="{f51946ea-827f-4d82-b841-1f2f6d060312}" />
</ItemGroup>
<ItemGroup>
<Compile Include="**/*.cs" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
<Compile Include="$(ProjectDir)../Version/svnrev.cs" Link="svnrev.cs" />
<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" Link="VersionInfo.cs" />
<Content Include="discohawk.ico" />
<EmbeddedResource Include="**/*.resx" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Compile Update="About.cs" SubType="Form" />
@ -107,8 +76,10 @@
<EmbeddedResource Update="ComparisonResults.resx" DependentUpon="ComparisonResults.cs" />
<Compile Update="MainDiscoForm.cs" SubType="Form" />
<Compile Update="MainDiscoForm.Designer.cs" DependentUpon="MainDiscoForm.cs" />
<EmbeddedResource Remove="MainDiscoForm.resx" />
<!-- TODO uses non-string
<EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" />
-->
</ItemGroup>
<Import Project="$(MSBuildToolsPath)/Microsoft.CSharp.targets" />
<Import Project="../CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
</Project>

2
src/BizHawk.Client.DiscoHawk/MainDiscoForm.Designer.cs generated
View File

@ -253,7 +253,7 @@
this.Controls.Add(this.lblMagicDragArea);
this.Controls.Add(this.ExitButton);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
// this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); //TODO non-string in .resx
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "MainDiscoForm";