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

Use SolutionDir to make relative paths absolute 

No need for warning of relative paths in filename anymore
This commit is contained in:
YoshiRulz 2020-01-24 04:59:27 +10:00
parent 3537c516fb
commit 3ae58fd9d6
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
17 changed files with 71 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
View File

@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Common.abs.props" /> <Import Project="$(SolutionDir)Common.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>../output/dll</OutputPath>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<ProjectReference Include="../BizHawk.Common/BizHawk.Common.csproj" /> <ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

7
BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
View File

@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Common.abs.props" /> <Import Project="$(SolutionDir)Common.props" />
<PropertyGroup> <PropertyGroup>
<OutputPath>../output/dll</OutputPath>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -18,11 +17,11 @@
<!--<Reference Include="System.Xml.Linq" />--> <!--<Reference Include="System.Xml.Linq" />-->
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../BizHawk.Client.Common/BizHawk.Client.Common.csproj" /> <ProjectReference Include="$(SolutionDir)BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Classes/Api/PluginBase.cs" /> <Compile Remove="Classes/Api/PluginBase.cs" />
<Compile Remove="Interfaces/IPlugin.cs" /> <Compile Remove="Interfaces/IPlugin.cs" />
</ItemGroup> </ItemGroup>
<Import Project="../NamespaceAliasHack.abs.targets" /> <Import Project="$(SolutionDir)NamespaceAliasHack.targets" />
</Project> </Project>

17
BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Common.abs.props" /> <Import Project="$(SolutionDir)Common.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>../output/dll</OutputPath>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -14,7 +13,7 @@
<!--<Reference Include="System.Data.DataSetExtensions" />--> <!--<Reference Include="System.Data.DataSetExtensions" />-->
<Reference Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64"> <Reference Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>../References/x64/SQLite/System.Data.SQLite.dll</HintPath> <HintPath>$(SolutionDir)References/x64/SQLite/System.Data.SQLite.dll</HintPath>
</Reference> </Reference>
<!--<Reference Include="System.Drawing" />--> <!--<Reference Include="System.Drawing" />-->
<Reference Include="System.IO.Compression" /> <Reference Include="System.IO.Compression" />
@ -26,18 +25,18 @@
<PackageReference Include="Ionic.Zip" Version="1.9.1.8" PrivateAssets="All" /> <PackageReference Include="Ionic.Zip" Version="1.9.1.8" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" />
<Reference Include="NLua" <Reference Include="NLua"
HintPath="../output/dll/nlua/NLua.dll" HintPath="$(SolutionDir)output/dll/nlua/NLua.dll"
Private="False" /> Private="False" />
<PackageReference Include="SharpCompress" Version="0.24.0" PrivateAssets="All" /> <PackageReference Include="SharpCompress" Version="0.24.0" PrivateAssets="All" />
<PackageReference Include="SharpZipLib" Version="1.1.0" PrivateAssets="All" /> <PackageReference Include="SharpZipLib" Version="1.1.0" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" /> <ProjectReference Include="$(SolutionDir)BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
<ProjectReference Include="../Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" /> <ProjectReference Include="$(SolutionDir)Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="../Version/svnrev.cs" /> <Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="../Version/VersionInfo.cs" /> <Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="lua/LuaExamples.cs" /> <Compile Remove="lua/LuaExamples.cs" />
@ -51,5 +50,5 @@
<Compile Update="movie/tasproj/TasMovie.Editing.cs" DependentUpon="TasMovie.cs" /> <Compile Update="movie/tasproj/TasMovie.Editing.cs" DependentUpon="TasMovie.cs" />
<Compile Update="movie/tasproj/TasMovie.IO.cs" DependentUpon="TasMovie.cs" /> <Compile Update="movie/tasproj/TasMovie.IO.cs" DependentUpon="TasMovie.cs" />
</ItemGroup> </ItemGroup>
<Import Project="../NamespaceAliasHack.abs.targets" /> <Import Project="$(SolutionDir)NamespaceAliasHack.targets" />
</Project> </Project>

16
BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
View File

@ -20,7 +20,7 @@
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<NoWin32Manifest>true</NoWin32Manifest> <NoWin32Manifest>true</NoWin32Manifest>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<OutputPath>../output</OutputPath> <OutputPath>$(SolutionDir)output</OutputPath>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform> <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@ -71,8 +71,8 @@
<Install>true</Install> <Install>true</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<Import Project="../CommonStyleCopAnalyzer.abs.props" /> <Import Project="$(SolutionDir)CommonStyleCopAnalyzer.props" />
<Import Project="../CommonRefAssemblies.abs.props" Condition=" '$(OS)' != 'Windows_NT' " /> <Import Project="$(SolutionDir)CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<!--<Reference Include="System.Core" RequiredTargetFramework="3.5" />--> <!--<Reference Include="System.Core" RequiredTargetFramework="3.5" />-->
@ -83,17 +83,17 @@
<!--<Reference Include="System.Xml" />--> <!--<Reference Include="System.Xml" />-->
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../BizHawk.Common/BizHawk.Common.csproj" <ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj"
Name="BizHawk.Common" Name="BizHawk.Common"
Project="{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" /> Project="{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" />
<ProjectReference Include="../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" <ProjectReference Include="$(SolutionDir)BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj"
Name="BizHawk.Emulation.DiscSystem" Name="BizHawk.Emulation.DiscSystem"
Project="{f51946ea-827f-4d82-b841-1f2f6d060312}" /> Project="{f51946ea-827f-4d82-b841-1f2f6d060312}" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**/*.cs" /> <Compile Include="**/*.cs" />
<Compile Include="../Version/svnrev.cs" Link="svnrev.cs" /> <Compile Include="$(SolutionDir)Version/svnrev.cs" Link="svnrev.cs" />
<Compile Include="../Version/VersionInfo.cs" Link="VersionInfo.cs" /> <Compile Include="$(SolutionDir)Version/VersionInfo.cs" Link="VersionInfo.cs" />
<Compile Remove="DiscoHawkDialog.cs" /> <Compile Remove="DiscoHawkDialog.cs" />
<Compile Remove="DiscoHawkDialog.Designer.cs" /> <Compile Remove="DiscoHawkDialog.Designer.cs" />
<Compile Remove="ProgressDialog.cs" /> <Compile Remove="ProgressDialog.cs" />
@ -116,5 +116,5 @@
<EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" /> <EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)/Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)/Microsoft.CSharp.targets" />
<Import Project="../CommonResourceGen.rel.props" Condition="'$(MSBuildRuntimeType)' == 'Core'" /> <Import Project="$(SolutionDir)CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
</Project> </Project>

42
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -21,7 +21,7 @@
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<OutputPath>../output</OutputPath> <OutputPath>$(SolutionDir)output</OutputPath>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform> <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@ -89,31 +89,31 @@
<Install>true</Install> <Install>true</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<Import Project="../CommonStyleCopAnalyzer.abs.props" /> <Import Project="$(SolutionDir)CommonStyleCopAnalyzer.props" />
<Import Project="../CommonRefAssemblies.abs.props" Condition=" '$(OS)' != 'Windows_NT' " /> <Import Project="$(SolutionDir)CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
<Import Project="ProjectPkgRefs.abs.props" Condition=" '$(OS)' != 'Windows_NT' " /> <Import Project="ProjectPkgRefs.props" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' "> <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll" HintPath="$(SolutionDir)packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
Private="true" /> Private="true" />
<Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73" <Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
HintPath="../packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll" HintPath="$(SolutionDir)packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
Private="true" /> Private="true" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="GongShell" <Reference Include="GongShell"
HintPath="../References/GongShell.dll" HintPath="$(SolutionDir)References/GongShell.dll"
Private="true" /> Private="true" />
<Reference Include="NLua, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL" <Reference Include="NLua, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL"
HintPath="../output/dll/nlua/NLua.dll" HintPath="$(SolutionDir)output/dll/nlua/NLua.dll"
Private="true" Private="true"
SpecificVersion="false" /> SpecificVersion="false" />
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL" <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL"
HintPath="../References/OpenTK.dll" HintPath="$(SolutionDir)References/OpenTK.dll"
Private="true" Private="true"
SpecificVersion="false" /> SpecificVersion="false" />
<Reference Include="SlimDX" <Reference Include="SlimDX"
HintPath="../References/x64/SlimDX.dll" HintPath="$(SolutionDir)References/x64/SlimDX.dll"
Private="true" /> Private="true" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -135,30 +135,30 @@
<!--<Reference Include="WindowsBase" />--> <!--<Reference Include="WindowsBase" />-->
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj" <ProjectReference Include="$(SolutionDir)BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj"
Name="BizHawk.Client.ApiHawk" Name="BizHawk.Client.ApiHawk"
Project="{8e2f11f2-3955-4382-8c3a-ceba1276caea}" /> Project="{8e2f11f2-3955-4382-8c3a-ceba1276caea}" />
<ProjectReference Include="../BizHawk.Client.Common/BizHawk.Client.Common.csproj" <ProjectReference Include="$(SolutionDir)BizHawk.Client.Common/BizHawk.Client.Common.csproj"
Name="BizHawk.Client.Common" Name="BizHawk.Client.Common"
Project="{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" /> Project="{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" />
<ProjectReference Include="../BizHawk.Common/BizHawk.Common.csproj" <ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj"
Name="BizHawk.Common" Name="BizHawk.Common"
Project="{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" /> Project="{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" />
<ProjectReference Include="../BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" <ProjectReference Include="$(SolutionDir)BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj"
Name="BizHawk.Emulation.Common" Name="BizHawk.Emulation.Common"
Project="{e1a23168-b571-411c-b360-2229e7225e0e}" /> Project="{e1a23168-b571-411c-b360-2229e7225e0e}" />
<ProjectReference Include="../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" <ProjectReference Include="$(SolutionDir)BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj"
Name="BizHawk.Emulation.Cores" Name="BizHawk.Emulation.Cores"
Project="{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" /> Project="{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" />
<ProjectReference Include="../Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" <ProjectReference Include="$(SolutionDir)Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj"
Name="BizHawk.Bizware.BizwareGL" Name="BizHawk.Bizware.BizwareGL"
Project="{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}" /> Project="{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**/*.cs" /> <Compile Include="**/*.cs" />
<Compile Include="../BizHawk.Common/OSTailoredCode.cs" Link="OSTailoredCode.cs" /> <Compile Include="$(SolutionDir)BizHawk.Common/OSTailoredCode.cs" Link="OSTailoredCode.cs" />
<Compile Include="../Version/svnrev.cs" Link="svnrev.cs" /> <Compile Include="$(SolutionDir)Version/svnrev.cs" Link="svnrev.cs" />
<Compile Include="../Version/VersionInfo.cs" Link="VersionInfo.cs" /> <Compile Include="$(SolutionDir)Version/VersionInfo.cs" Link="VersionInfo.cs" />
<Compile Remove="DisplayManager/SwappableBitmapBufferSet.cs" /> <Compile Remove="DisplayManager/SwappableBitmapBufferSet.cs" />
<Compile Remove="ExternalCoreSupport.cs" /> <Compile Remove="ExternalCoreSupport.cs" />
<Compile Remove="Global.cs" /> <Compile Remove="Global.cs" />
@ -208,7 +208,7 @@
<None Remove="MainForm.resources" /> <None Remove="MainForm.resources" />
<None Remove="NameStateForm.resources" /> <None Remove="NameStateForm.resources" />
<None Remove="packages.config" /> <None Remove="packages.config" />
<None Remove="ProjectPkgRefs.abs.props" /> <None Remove="ProjectPkgRefs.props" />
<None Remove="Properties/Resources.resources" /> <None Remove="Properties/Resources.resources" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -697,7 +697,7 @@
<Compile Update="UpdateChecker.cs" SubType="Code" /> <Compile Update="UpdateChecker.cs" SubType="Code" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)/Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)/Microsoft.CSharp.targets" />
<Import Project="../CommonResourceGen.rel.props" Condition="'$(MSBuildRuntimeType)' == 'Core'" /> <Import Project="$(SolutionDir)CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
<Target Name="AfterBuild"> <Target Name="AfterBuild">
<ItemGroup> <ItemGroup>
<AssetFiles Include="$(SolutionDir)Assets/**/*.*" Exclude="$(SolutionDir)Assets/**/.gitempty;$(SolutionDir)Assets/**/.gitignore" /> <AssetFiles Include="$(SolutionDir)Assets/**/*.*" Exclude="$(SolutionDir)Assets/**/.gitempty;$(SolutionDir)Assets/**/.gitignore" />

0
BizHawk.Client.EmuHawk/ProjectPkgRefs.abs.props → BizHawk.Client.EmuHawk/ProjectPkgRefs.props
View File

9
BizHawk.Common/BizHawk.Common.csproj
View File

@ -1,9 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Common.abs.props" /> <Import Project="$(SolutionDir)Common.props" />
<Import Project="../CommonNullable.abs.props" /> <Import Project="$(SolutionDir)CommonNullable.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>../output/dll</OutputPath>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks> <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -11,8 +10,8 @@
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" PrivateAssets="All" /> <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="../Version/svnrev.cs" /> <Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="../Version/VersionInfo.cs" /> <Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
<Compile Remove="Extensions/BinaryReaderExtensions.cs" /> <Compile Remove="Extensions/BinaryReaderExtensions.cs" />
<Compile Remove="SuperGloballyUniqueID.cs" /> <Compile Remove="SuperGloballyUniqueID.cs" />
</ItemGroup> </ItemGroup>

9
BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
View File

@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Common.abs.props" /> <Import Project="$(SolutionDir)Common.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>../output/dll</OutputPath>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -19,11 +18,11 @@
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" /> <ProjectReference Include="$(SolutionDir)BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="../Version/svnrev.cs" /> <Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="../Version/VersionInfo.cs" /> <Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Interfaces/IHookManager.cs" /> <Compile Remove="Interfaces/IHookManager.cs" />

17
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Common.abs.props" /> <Import Project="$(SolutionDir)Common.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>../output/dll</OutputPath>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>
</PropertyGroup> </PropertyGroup>
<!-- This stuff was unique to this project and also not mentioned in the tutorial, so I've left them commented here. --> <!-- This stuff was unique to this project and also not mentioned in the tutorial, so I've left them commented here. -->
@ -52,19 +51,19 @@
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" />
<PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" /> <PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" />
<Reference Include="PeNet" <Reference Include="PeNet"
HintPath="../References/PeNet.dll" HintPath="$(SolutionDir)References/PeNet.dll"
Private="true" /> Private="true" />
<Reference Include="Virtu" <Reference Include="Virtu"
HintPath="../References/Virtu.dll" HintPath="$(SolutionDir)References/Virtu.dll"
Private="true" /> Private="true" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../BizHawk.BizInvoke/BizHawk.BizInvoke.csproj" /> <ProjectReference Include="$(SolutionDir)BizHawk.BizInvoke/BizHawk.BizInvoke.csproj" />
<ProjectReference Include="../BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" /> <ProjectReference Include="$(SolutionDir)BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="../Version/svnrev.cs" /> <Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="../Version/VersionInfo.cs" /> <Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="CPUs/MOS 6502X/6502XXX/**/*" /> <Compile Remove="CPUs/MOS 6502X/6502XXX/**/*" />
@ -125,5 +124,5 @@
<Compile Update="Properties/Resources.Designer.cs" AutoGen="true" DependentUpon="Resources.resx" DesignTime="true" /> <Compile Update="Properties/Resources.Designer.cs" AutoGen="true" DependentUpon="Resources.resx" DesignTime="true" />
<EmbeddedResource Update="Properties/Resources.resx" LastGenOutput="Resources.Designer.cs" /> <EmbeddedResource Update="Properties/Resources.resx" LastGenOutput="Resources.Designer.cs" />
</ItemGroup> </ItemGroup>
<Import Project="../NamespaceAliasHack.abs.targets" /> <Import Project="$(SolutionDir)NamespaceAliasHack.targets" />
</Project> </Project>

9
BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
View File

@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Common.abs.props" /> <Import Project="$(SolutionDir)Common.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>../output/dll</OutputPath>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -16,11 +15,11 @@
<!--<Reference Include="System.Xml.Linq" />--> <!--<Reference Include="System.Xml.Linq" />-->
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../BizHawk.Common/BizHawk.Common.csproj" /> <ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="../Version/svnrev.cs" /> <Compile Include="$(SolutionDir)Version/svnrev.cs" />
<Compile Include="../Version/VersionInfo.cs" /> <Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
</ItemGroup> </ItemGroup>
</Project> </Project>

7
Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
View File

@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../Common.abs.props" /> <Import Project="$(SolutionDir)Common.props" />
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>../../output/dll</OutputPath>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -11,9 +10,9 @@
<PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" /> <PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" />
<PackageReference Include="OpenTK.GLControl" Version="3.0.1" PrivateAssets="All" /> <PackageReference Include="OpenTK.GLControl" Version="3.0.1" PrivateAssets="All" />
<Reference Include="SlimDX" <Reference Include="SlimDX"
HintPath="../../References/x64/SlimDX.dll" HintPath="$(SolutionDir)References/x64/SlimDX.dll"
Private="true" /> Private="true" />
<ProjectReference Include="../../BizHawk.Common/BizHawk.Common.csproj" /> <ProjectReference Include="$(SolutionDir)BizHawk.Common/BizHawk.Common.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="CacheBlendState.cs" /> <Compile Remove="CacheBlendState.cs" />

1
Common.abs.props → Common.props
View File

@ -4,6 +4,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
<OutputPath>$(SolutionDir)output/dll</OutputPath>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

0
CommonNullable.abs.props → CommonNullable.props
View File

0
CommonRefAssemblies.abs.props → CommonRefAssemblies.props
View File

10
CommonResourceGen.rel.props → CommonResourceGen.props
View File

@ -6,14 +6,14 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System.Buffers" <Reference Include="System.Buffers"
HintPath="../References/System.Buffers.dll" /> HintPath="$(SolutionDir)References/System.Buffers.dll" />
<Reference Include="System.Memory" <Reference Include="System.Memory"
HintPath="../References/System.Memory.dll" /> HintPath="$(SolutionDir)References/System.Memory.dll" />
<Reference Include="System.Numerics.Vectors" <Reference Include="System.Numerics.Vectors"
HintPath="../References/System.Numerics.Vectors.dll" /> HintPath="$(SolutionDir)References/System.Numerics.Vectors.dll" />
<Reference Include="System.Resources.Extensions" <Reference Include="System.Resources.Extensions"
HintPath="../References/System.Resources.Extensions.dll" /> HintPath="$(SolutionDir)References/System.Resources.Extensions.dll" />
<Reference Include="System.Runtime.CompilerServices.Unsafe" <Reference Include="System.Runtime.CompilerServices.Unsafe"
HintPath="../References/System.Runtime.CompilerServices.Unsafe.dll" /> HintPath="$(SolutionDir)References/System.Runtime.CompilerServices.Unsafe.dll" />
</ItemGroup> </ItemGroup>
</Project> </Project>

0
CommonStyleCopAnalyzer.abs.props → CommonStyleCopAnalyzer.props
View File

0
NamespaceAliasHack.abs.targets → NamespaceAliasHack.targets
View File