Dedup some project file stuff

This commit is contained in:
YoshiRulz 2021-11-19 00:39:25 +10:00
parent 69d65009a0
commit b1b06cc04a
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 4 additions and 4 deletions

View File

@ -5,13 +5,11 @@
<Import Project="../MainSlnExecutable.props" /> <Import Project="../MainSlnExecutable.props" />
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>discohawk.ico</ApplicationIcon> <ApplicationIcon>discohawk.ico</ApplicationIcon>
<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
<Nullable>disable</Nullable> <Nullable>disable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" /> <ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
<Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" />
<Content Include="discohawk.ico" /> <Content Include="discohawk.ico" />
<EmbeddedResource Include="discohawk.ico" /> <EmbeddedResource Include="discohawk.ico" />
</ItemGroup> </ItemGroup>

View File

@ -7,7 +7,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplicationIcon>images/logo.ico</ApplicationIcon> <ApplicationIcon>images/logo.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
<Nullable>disable</Nullable> <Nullable>disable</Nullable>
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch> <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
</PropertyGroup> </PropertyGroup>
@ -24,7 +23,6 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.DirectX/BizHawk.Bizware.DirectX.csproj" /> <ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.DirectX/BizHawk.Bizware.DirectX.csproj" />
<ProjectReference Include="$(ProjectDir)../BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj" /> <ProjectReference Include="$(ProjectDir)../BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj" />
<Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" />
<Compile Remove="Properties/Settings.Designer.cs" /> <Compile Remove="Properties/Settings.Designer.cs" />
<Content Include="images/logo.ico" /> <Content Include="images/logo.ico" />
<EmbeddedResource Include="images/**/*" /> <EmbeddedResource Include="images/**/*" />

View File

@ -1,6 +1,7 @@
<Project> <Project>
<Import Project="MainSlnCommon.props" /> <Import Project="MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>
<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
<OutputPath>$(ProjectDir)../../output</OutputPath> <OutputPath>$(ProjectDir)../../output</OutputPath>
<TargetName>$(MSBuildProjectName.Substring($([MSBuild]::Add($(MSBuildProjectName.LastIndexOf('.')), 1))))</TargetName> <TargetName>$(MSBuildProjectName.Substring($([MSBuild]::Add($(MSBuildProjectName.LastIndexOf('.')), 1))))</TargetName>
</PropertyGroup> </PropertyGroup>
@ -10,6 +11,9 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">
<ItemGroup> <ItemGroup>
<NotExecFilesFromExecProj Include="$(OutputPath)*.deps.json" /> <NotExecFilesFromExecProj Include="$(OutputPath)*.deps.json" />