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

Update paths in projects (fixes build)

This commit is contained in:
YoshiRulz 2020-05-03 10:58:35 +10:00
parent 3a3b22c03b
commit 5a8349b5a5
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
13 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BizHawk.sln
View File

@ -2,34 +2,34 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28729.10
MinimumVisualStudioVersion = 16.0.28729.10
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Version", "Version\Version.csproj", "{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Version", "src\Version\Version.csproj", "{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Client.Common", "BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Client.Common", "src\BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}"
ProjectSection(ProjectDependencies) = postProject
{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Common", "BizHawk.Common\BizHawk.Common.csproj", "{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Common", "src\BizHawk.Common\BizHawk.Common.csproj", "{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}"
ProjectSection(ProjectDependencies) = postProject
{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.EmuHawk", "BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.EmuHawk", "src\BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}"
ProjectSection(ProjectDependencies) = postProject
{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.DiscoHawk", "BizHawk.Client.DiscoHawk\BizHawk.Client.DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.DiscoHawk", "src\BizHawk.Client.DiscoHawk\BizHawk.Client.DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}"
ProjectSection(ProjectDependencies) = postProject
{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.DiscSystem", "BizHawk.Emulation.DiscSystem\BizHawk.Emulation.DiscSystem.csproj", "{F51946EA-827F-4D82-B841-1F2F6D060312}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.DiscSystem", "src\BizHawk.Emulation.DiscSystem\BizHawk.Emulation.DiscSystem.csproj", "{F51946EA-827F-4D82-B841-1F2F6D060312}"
ProjectSection(ProjectDependencies) = postProject
{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.Common", "BizHawk.Emulation.Common\BizHawk.Emulation.Common.csproj", "{E1A23168-B571-411C-B360-2229E7225E0E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.Common", "src\BizHawk.Emulation.Common\BizHawk.Emulation.Common.csproj", "{E1A23168-B571-411C-B360-2229E7225E0E}"
ProjectSection(ProjectDependencies) = postProject
{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
EndProjectSection
@ -38,16 +38,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{B51F11
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Emulation", "Emulation", "{3627C08B-3E43-4224-9DA4-40BD69495FBC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.Cores", "BizHawk.Emulation.Cores\BizHawk.Emulation.Cores.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.Cores", "src\BizHawk.Emulation.Cores\BizHawk.Emulation.Cores.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
ProjectSection(ProjectDependencies) = postProject
{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Bizware.BizwareGL", "BizHawk.Bizware.BizwareGL\BizHawk.Bizware.BizwareGL.csproj", "{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Bizware.BizwareGL", "src\BizHawk.Bizware.BizwareGL\BizHawk.Bizware.BizwareGL.csproj", "{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.BizInvoke", "BizHawk.BizInvoke\BizHawk.BizInvoke.csproj", "{E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.BizInvoke", "src\BizHawk.BizInvoke\BizHawk.BizInvoke.csproj", "{E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.WinForms.Controls", "BizHawk.WinForms.Controls\BizHawk.WinForms.Controls.csproj", "{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.WinForms.Controls", "src\BizHawk.WinForms.Controls\BizHawk.WinForms.Controls.csproj", "{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

2
Build/standin.sh
View File

@ -1,2 +1,2 @@
#!/bin/sh
cd "$(dirname "$0")/../Version" && printf "static class SubWCRev\n{\n\tpublic const string SVN_REV = \"%s\";\n\tpublic const string GIT_BRANCH = \"%s\";\n\tpublic const string GIT_SHORTHASH = \"%s\";\n}" "$(git rev-list HEAD --count)" "$(git rev-parse --abbrev-ref HEAD)" "$(git log -1 --format="%h")" >svnrev.cs
cd "$(dirname "$0")/../src/Version" && printf "static class SubWCRev\n{\n\tpublic const string SVN_REV = \"%s\";\n\tpublic const string GIT_BRANCH = \"%s\";\n\tpublic const string GIT_SHORTHASH = \"%s\";\n}" "$(git rev-list HEAD --count)" "$(git rev-parse --abbrev-ref HEAD)" "$(git log -1 --format="%h")" >svnrev.cs

8
src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
View File

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)MainSlnCommon.props" />
<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj" />
<Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj" />
<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
</ItemGroup>
</Project>

8
src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)MainSlnCommon.props" />
<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
@ -8,9 +8,9 @@
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="All" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" PrivateAssets="All" />
<PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" />
<ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj" />
<Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj" />
<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
</ItemGroup>
<ItemGroup>
<Compile Update="IGuiRenderer.cs" SubType="Code" />

10
src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)MainSlnCommon.props" />
<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>netstandard2.0</TargetFramework><!-- some NuGet packages aren't for Standard, and are only loaded at runtime because EmuHawk is still Framework. More work will be required to move to Core. -->
@ -16,10 +16,10 @@
Private="False" />
<PackageReference Include="SharpCompress" Version="0.24.0" PrivateAssets="All" />
<PackageReference Include="SharpZipLib" Version="1.1.0" PrivateAssets="All" />
<ProjectReference Include="$(SolutionDir)BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
<ProjectReference Include="$(SolutionDir)BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
<Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
<ProjectReference Include="$(SolutionDir)src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
</ItemGroup>
<ItemGroup>
<Compile Update="movie/bk2/Bk2Movie.HeaderApi.cs" DependentUpon="Bk2Movie.cs" />

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

@ -71,8 +71,8 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(SolutionDir)CommonStyleCopAnalyzer.props" />
<Import Project="$(SolutionDir)CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
<Import Project="$(SolutionDir)src/CommonStyleCopAnalyzer.props" />
<Import Project="$(SolutionDir)src/CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup>
<Reference Include="System" />
<!--<Reference Include="System.Core" RequiredTargetFramework="3.5" />-->
@ -83,17 +83,17 @@
<!--<Reference Include="System.Xml" />-->
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj"
<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj"
Name="BizHawk.Common"
Project="{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" />
<ProjectReference Include="$(SolutionDir)BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj"
<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj"
Name="BizHawk.Emulation.DiscSystem"
Project="{f51946ea-827f-4d82-b841-1f2f6d060312}" />
</ItemGroup>
<ItemGroup>
<Compile Include="**/*.cs" />
<Compile Include="$(SolutionDir)Version/svnrev.cs" Link="svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" Link="VersionInfo.cs" />
<Compile Include="$(SolutionDir)src/Version/svnrev.cs" Link="svnrev.cs" />
<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" Link="VersionInfo.cs" />
<Content Include="discohawk.ico" />
<EmbeddedResource Include="**/*.resx" />
<None Include="app.config" />
@ -110,5 +110,5 @@
<EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)/Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
<Import Project="$(SolutionDir)src/CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
</Project>

24
src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -89,8 +89,8 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(SolutionDir)CommonStyleCopAnalyzer.props" />
<Import Project="$(SolutionDir)CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
<Import Project="$(SolutionDir)src/CommonStyleCopAnalyzer.props" />
<Import Project="$(SolutionDir)src/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"
@ -144,30 +144,30 @@
<!--<Reference Include="WindowsBase" />-->
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)BizHawk.Client.Common/BizHawk.Client.Common.csproj"
<ProjectReference Include="$(SolutionDir)src/BizHawk.Client.Common/BizHawk.Client.Common.csproj"
Name="BizHawk.Client.Common"
Project="{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" />
<ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj"
<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj"
Name="BizHawk.Common"
Project="{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" />
<ProjectReference Include="$(SolutionDir)BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj"
<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj"
Name="BizHawk.Emulation.Common"
Project="{e1a23168-b571-411c-b360-2229e7225e0e}" />
<ProjectReference Include="$(SolutionDir)BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj"
<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj"
Name="BizHawk.Emulation.Cores"
Project="{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" />
<ProjectReference Include="$(SolutionDir)BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj"
<ProjectReference Include="$(SolutionDir)src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj"
Name="BizHawk.WinForms.Controls"
Project="{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A}" />
<ProjectReference Include="$(SolutionDir)BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj"
<ProjectReference Include="$(SolutionDir)src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj"
Name="BizHawk.Bizware.BizwareGL"
Project="{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}" />
</ItemGroup>
<ItemGroup>
<Compile Include="**/*.cs" />
<Compile Include="$(SolutionDir)BizHawk.Common/OSTailoredCode.cs" Link="OSTailoredCode.cs" />
<Compile Include="$(SolutionDir)Version/svnrev.cs" Link="svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" Link="VersionInfo.cs" />
<Compile Include="$(SolutionDir)src/BizHawk.Common/OSTailoredCode.cs" Link="OSTailoredCode.cs" />
<Compile Include="$(SolutionDir)src/Version/svnrev.cs" Link="svnrev.cs" />
<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" Link="VersionInfo.cs" />
<Compile Remove="Properties/Settings.Designer.cs" />
<Content Include="images/logo.ico" />
<EmbeddedResource Include="**/*.resx" />
@ -694,7 +694,7 @@
<Compile Update="UpdateChecker.cs" SubType="Code" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)/Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
<Import Project="$(SolutionDir)src/CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
<Target Name="AfterBuild">
<ItemGroup>
<AssetFiles Include="$(SolutionDir)Assets/**/*.*" Exclude="$(SolutionDir)Assets/**/.gitempty;$(SolutionDir)Assets/**/.gitignore" />

6
src/BizHawk.Common/BizHawk.Common.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)MainSlnCommon.props" />
<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
<Import Project="$(SolutionDir)CommonNullable.props" />
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -12,7 +12,7 @@
Condition=" '$(MachineRunAnalyzersDuringBuild)' != '' " />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164"
Condition=" '$(MachineRunAnalyzersDuringBuild)' != '' " />
<Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
</ItemGroup>
</Project>

8
src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
View File

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)MainSlnCommon.props" />
<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" />
<ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj" />
<Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj" />
<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
</ItemGroup>
</Project>

12
src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)MainSlnCommon.props" />
<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
@ -10,11 +10,11 @@
<PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" />
<Reference Include="PeNet" HintPath="$(SolutionDir)References/PeNet.dll" Private="true" />
<Reference Include="Virtu" HintPath="$(SolutionDir)References/Virtu.dll" Private="true" />
<ProjectReference Include="$(SolutionDir)BizHawk.BizInvoke/BizHawk.BizInvoke.csproj" />
<ProjectReference Include="$(SolutionDir)BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" />
<ProjectReference Include="$(SolutionDir)BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
<Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
<ProjectReference Include="$(SolutionDir)src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj" />
<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" />
<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
<EmbeddedResource Include="Resources/**/*" />
</ItemGroup>
<ItemGroup>

8
src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)MainSlnCommon.props" />
<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj" />
<Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj" />
<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
</ItemGroup>
</Project>

6
src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj
View File

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)MainSlnCommon.props" />
<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
<Import Project="$(SolutionDir)CommonNullable.props" />
<PropertyGroup>
<TargetFramework>net48</TargetFramework>
@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<Reference Include="System.Windows.Forms" />
<Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
</ItemGroup>
</Project>

4
src/Version/Version.csproj
View File

@ -18,7 +18,7 @@
<Exec Command="&quot;$(MSBuildProjectDirectory)\subwcrev.bat&quot; $(MSBuildProjectDirectory)" Condition=" '$(OS)' == 'Windows_NT' " WorkingDirectory="$(MSBuildProjectDirectory)" />
</Target>
<Target Name="PreBuild" AfterTargets="PreBuildEvent">
<Exec Command='"$(ProjectDir)..\Build\BizHawk.Build.Tool.exe" GIT_REV --wc "$(ProjectDir).." --template "$(ProjectDir)svnrev_template" --out "$(ProjectDir)svnrev.cs"' Condition=" '$(OS)' == 'Windows_NT' " />
<Exec Command='"$(ProjectDir)../Build/standin.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
<Exec Command='"$(ProjectDir)..\..\Build\BizHawk.Build.Tool.exe" GIT_REV --wc "$(ProjectDir).." --template "$(ProjectDir)svnrev_template" --out "$(ProjectDir)svnrev.cs"' Condition=" '$(OS)' == 'Windows_NT' " />
<Exec Command='"$(ProjectDir)../../Build/standin.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
</Target>
</Project>