Migrate EmuHawk to new .csproj format

This commit is contained in:
YoshiRulz 2020-05-03 11:51:35 +10:00
parent 178c491a9f
commit 2bf1dfbd09
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
5 changed files with 27 additions and 149 deletions

View File

@ -1,30 +1,29 @@
<?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>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AppDesignerFolder>Properties</AppDesignerFolder>
<ApplicationIcon>images/logo.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
<OutputPath>$(ProjectDir)../../output</OutputPath>
<OutputType>WinExe</OutputType>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
<!--
<PropertyGroup>
<AppDesignerFolder>Properties</AppDesignerFolder>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<AssemblyName>EmuHawk</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>
<OldToolsVersion>3.5</OldToolsVersion>
<OutputPath>$(ProjectDir)../../output</OutputPath>
<OutputType>WinExe</OutputType>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
<ProjectGuid>{DD448B37-BA3F-4544-9754-5406E8094723}</ProjectGuid>
<ProductVersion>9.0.30729</ProductVersion>
@ -34,7 +33,6 @@
<SchemaVersion>2.0</SchemaVersion>
<StartupObject>BizHawk.Client.EmuHawk.Program</StartupObject>
<TargetFrameworkProfile/>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<UpdateEnabled>false</UpdateEnabled>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
@ -45,18 +43,6 @@
<UseApplicationTrust>false</UseApplicationTrust>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<DefineConstants>DEBUG;EXE_PROJECT</DefineConstants>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugSymbols>false</DebugSymbols>
<DebugType>pdbonly</DebugType>
<DefineConstants>EXE_PROJECT</DefineConstants>
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
@ -89,27 +75,21 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="../CommonStyleCopAnalyzer.props" />
<Import Project="../CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
<Import Project="ProjectPkgRefs.props" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
HintPath="$(ProjectDir)../../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
Private="true" />
<Reference Include="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
HintPath="$(ProjectDir)../../packages/OpenTK.GLControl.3.0.1/lib/net20/OpenTK.GLControl.dll"
Private="true" />
<Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
HintPath="$(ProjectDir)../../packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
Private="true" />
<Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"
HintPath="$(ProjectDir)../../packages/System.Drawing.Common.4.7.0/lib/net461/System.Drawing.Common.dll"
Private="true" />
-->
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="All" /><!-- for (extra?) dynamic type support -->
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="System.DirectoryServices" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" PrivateAssets="all" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Reference Include="GongShell"
HintPath="$(ProjectDir)../../References/GongShell.dll"
Private="true" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="all" />
<Reference Include="NLua, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL"
HintPath="$(ProjectDir)../../output/dll/nlua/NLua.dll"
Private="true"
@ -118,6 +98,8 @@
HintPath="$(ProjectDir)../../References/OpenTK.dll"
Private="true"
SpecificVersion="false" />
<PackageReference Include="OpenTK.GLControl" Version="3.0.1" PrivateAssets="all" />
<PackageReference Include="SharpZipLib" Version="1.1.0" PrivateAssets="all" />
<Reference Include="SlimDX"
HintPath="$(ProjectDir)../../References/x64/SlimDX.dll"
Private="true" />
@ -126,51 +108,13 @@
Private="true" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="System" />
<!--<Reference Include="System.Core" RequiredTargetFramework="3.5" />-->
<Reference Include="System.Data" />
<!--<Reference Include="System.Data.DataSetExtensions" RequiredTargetFramework="3.5" />-->
<!--<Reference Include="System.Deployment" Condition=" '$(OS)' == 'Windows_NT' " />-->
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Numerics" />
<Reference Include="System.Windows.Forms" />
<!--<Reference Include="System.Xaml" />-->
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" /><!-- RequiredTargetFramework="3.5" -->
<!--<Reference Include="WindowsBase" />-->
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj"
Name="BizHawk.Client.Common"
Project="{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj"
Name="BizHawk.Common"
Project="{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj"
Name="BizHawk.Emulation.Common"
Project="{e1a23168-b571-411c-b360-2229e7225e0e}" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj"
Name="BizHawk.Emulation.Cores"
Project="{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" />
<ProjectReference Include="$(ProjectDir)../BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj"
Name="BizHawk.WinForms.Controls"
Project="{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A}" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj"
Name="BizHawk.Bizware.BizwareGL"
Project="{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}" />
</ItemGroup>
<ItemGroup>
<Compile Include="**/*.cs" />
<Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" Link="OSTailoredCode.cs" />
<Compile Include="$(ProjectDir)../Version/svnrev.cs" Link="svnrev.cs" />
<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" Link="VersionInfo.cs" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
<ProjectReference Include="$(ProjectDir)../BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj" />
<Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" />
<Compile Include="$(ProjectDir)../Version/svnrev.cs" />
<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" />
<Compile Remove="Properties/Settings.Designer.cs" />
<Content Include="images/logo.ico" />
<EmbeddedResource Include="**/*.resx" />
<EmbeddedResource Include="images/**/*" />
<EmbeddedResource Include="Resources/**/*" />
<EmbeddedResource Remove="images/.ico" />
@ -207,10 +151,7 @@
<EmbeddedResource Remove="images/WarningHS.png" />
<EmbeddedResource Remove="Resources/courier16px.bmfc" />
<EmbeddedResource Remove="Resources/ZXSpectrumKeyboard.bmp" />
<None Include="app.config" />
<None Include="app.manifest" />
<None Remove="packages.config" />
<None Remove="ProjectPkgRefs.props" />
<None Remove="Properties/Resources.resources" />
</ItemGroup>
<ItemGroup>
@ -693,8 +634,6 @@
<Compile Update="tools/Watch/WatchValueBox.cs" SubType="Component" />
<Compile Update="UpdateChecker.cs" SubType="Code" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)/Microsoft.CSharp.targets" />
<Import Project="../CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
<Target Name="AfterBuild">
<ItemGroup>
<AssetFiles Include="$(ProjectDir)../../Assets/**/*.*" Exclude="$(ProjectDir)../../Assets/**/.gitempty;$(ProjectDir)../../Assets/**/.gitignore" />

View File

@ -1,28 +0,0 @@
<Project>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" />
<Reference Include="$(NUGET_PACKAGES)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
<PackageReference Include="OpenTK.GLControl" Version="3.0.1" PrivateAssets="All" />
<Reference Include="$(NUGET_PACKAGES)/opentk.glcontrol/3.0.1/lib/net20/OpenTK.GLControl.dll"
FusionName="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Name="OpenTK.GLControl"
Private="true"
SpecificVersion="true" />
<PackageReference Include="SharpZipLib" Version="1.1.0" PrivateAssets="All" />
<Reference Include="$(NUGET_PACKAGES)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
FusionName="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
Name="ICSharpCode.SharpZipLib"
Private="true"
SpecificVersion="true" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" PrivateAssets="All" />
<Reference Include="$(NUGET_PACKAGES)/system.drawing.common/4.7.0/lib/net461/System.Drawing.Common.dll"
FusionName="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"
Name="System.Drawing.Common"
Private="true"
SpecificVersion="true" />
</ItemGroup>
</Project>

View File

@ -1,5 +0,0 @@
<Project>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
</Project>

View File

@ -1,19 +0,0 @@
<Project>
<PropertyGroup>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<GenerateResourceMSBuildArchitecture Condition=" '$(GenerateResourceMSBuildArchitecture)' == '' ">CurrentArchitecture</GenerateResourceMSBuildArchitecture>
<GenerateResourceMSBuildRuntime Condition=" '$(GenerateResourceMSBuildRuntime)' == '' ">CurrentRuntime</GenerateResourceMSBuildRuntime>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Buffers"
HintPath="$(ProjectDir)../../References/System.Buffers.dll" />
<Reference Include="System.Memory"
HintPath="$(ProjectDir)../../References/System.Memory.dll" />
<Reference Include="System.Numerics.Vectors"
HintPath="$(ProjectDir)../../References/System.Numerics.Vectors.dll" />
<Reference Include="System.Resources.Extensions"
HintPath="$(ProjectDir)../../References/System.Resources.Extensions.dll" />
<Reference Include="System.Runtime.CompilerServices.Unsafe"
HintPath="$(ProjectDir)../../References/System.Runtime.CompilerServices.Unsafe.dll" />
</ItemGroup>
</Project>

View File

@ -1,9 +0,0 @@
<Project>
<PropertyGroup>
<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
<Analyzer Include="$(ProjectDir)../../packages/StyleCop.Analyzers.Unstable.1.2.0.164/analyzers/dotnet/cs/*.dll" /><!-- already restored by first transitive dep (BizHawk.Common) -->
</ItemGroup>
</Project>