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

Move conditional PackageReferences to conditional .targets import 

Fixes build system bug introduced by c31050feb
This commit is contained in:
YoshiRulz 2019-12-27 16:31:12 +10:00
parent 0caf12f25e
commit 50373ac1ad
16 changed files with 145 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,36 +43,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
<PackageReference Include="Ionic.Zip" Version="1.9.1.8" />
<Reference
FusionName="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c"
Include="$(MachineNuGetPackageDir)/ionic.zip/1.9.1.8/lib/Ionic.Zip.dll"
Name="Ionic.Zip"
Private="true"
SpecificVersion="true" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<Reference
FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
<Reference
FusionName="SharpCompress, Version=0.24.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96"
Include="$(MachineNuGetPackageDir)/sharpcompress/0.24.0/lib/net45/SharpCompress.dll"
Name="SharpCompress"
Private="true"
SpecificVersion="true" />
<PackageReference Include="SharpZipLib" Version="1.1.0" />
<Reference
FusionName="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
Include="$(MachineNuGetPackageDir)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
Name="ICSharpCode.SharpZipLib"
Private="true"
SpecificVersion="true" />
</ItemGroup>
<Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../packages/Ionic.Zip.1.9.1.8/lib/Ionic.Zip.dll"

32
BizHawk.Client.Common/DotNetBuild.NuGet.targets Normal file
View File

@ -0,0 +1,32 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Ionic.Zip" Version="1.9.1.8" />
<Reference
FusionName="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c"
Include="$(MachineNuGetPackageDir)/ionic.zip/1.9.1.8/lib/Ionic.Zip.dll"
Name="Ionic.Zip"
Private="true"
SpecificVersion="true" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<Reference
FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
<Reference
FusionName="SharpCompress, Version=0.24.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96"
Include="$(MachineNuGetPackageDir)/sharpcompress/0.24.0/lib/net45/SharpCompress.dll"
Name="SharpCompress"
Private="true"
SpecificVersion="true" />
<PackageReference Include="SharpZipLib" Version="1.1.0" />
<Reference
FusionName="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
Include="$(MachineNuGetPackageDir)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
Name="ICSharpCode.SharpZipLib"
Private="true"
SpecificVersion="true" />
</ItemGroup>
</Project>

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

@ -69,22 +69,7 @@
<!--<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>-->
<CodeAnalysisRuleSet Condition=" '$(OS)' == 'Windows_NT' ">AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<Reference
FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
<PackageReference Include="SharpZipLib" Version="1.1.0" />
<Reference
FusionName="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
Include="$(MachineNuGetPackageDir)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
Name="ICSharpCode.SharpZipLib"
Private="true"
SpecificVersion="true" />
</ItemGroup>
<Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"

18
BizHawk.Client.EmuHawk/DotNetBuild.NuGet.targets Normal file
View File

@ -0,0 +1,18 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<Reference
FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
<PackageReference Include="SharpZipLib" Version="1.1.0" />
<Reference
FusionName="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
Include="$(MachineNuGetPackageDir)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
Name="ICSharpCode.SharpZipLib"
Private="true"
SpecificVersion="true" />
</ItemGroup>
</Project>

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

@ -41,15 +41,7 @@
<TargetFrameworkProfile />
<LangVersion>8.0</LangVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<Reference
FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
</ItemGroup>
<Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"

11
BizHawk.Emulation.Common/DotNetBuild.NuGet.targets Normal file
View File

@ -0,0 +1,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<Reference
FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
</ItemGroup>
</Project>

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

@ -63,29 +63,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
<PackageReference Include="ELFSharp" Version="0.1.0" />
<Reference
FusionName="ELFSharp, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null"
Include="$(MachineNuGetPackageDir)/elfsharp/0.1.0/lib/net40/ELFSharp.dll"
Name="ELFSharp"
Private="true"
SpecificVersion="true" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<Reference
FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
<PackageReference Include="OpenTK" Version="3.0.1" />
<Reference
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
</ItemGroup>
<Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../packages/ELFSharp.0.1/lib/net40/ELFSharp.dll"

25
BizHawk.Emulation.Cores/DotNetBuild.NuGet.targets Normal file
View File

@ -0,0 +1,25 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="ELFSharp" Version="0.1.0" />
<Reference
FusionName="ELFSharp, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null"
Include="$(MachineNuGetPackageDir)/elfsharp/0.1.0/lib/net40/ELFSharp.dll"
Name="ELFSharp"
Private="true"
SpecificVersion="true" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<Reference
FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
<PackageReference Include="OpenTK" Version="3.0.1" />
<Reference
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
</ItemGroup>
</Project>

10
Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj
View File

@ -38,15 +38,7 @@
<!--<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>-->
<CodeAnalysisRuleSet Condition=" '$(OS)' == 'Windows_NT' ">MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
<PackageReference Include="OpenTK" Version="3.0.1" />
<Reference
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
</ItemGroup>
<Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"

11
Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/DotNetBuild.NuGet.targets Normal file
View File

@ -0,0 +1,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="OpenTK" Version="3.0.1" />
<Reference
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
</ItemGroup>
</Project>

17
Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj
View File

@ -42,22 +42,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
<PackageReference Include="OpenTK" Version="3.0.1" />
<Reference
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
<PackageReference Include="OpenTK.GLControl" Version="3.0.1" />
<Reference
FusionName="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk.glcontrol/3.0.1/lib/net20/OpenTK.GLControl.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
</ItemGroup>
<Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"

18
Bizware/BizHawk.Bizware.BizwareGL.OpenTK/DotNetBuild.NuGet.targets Normal file
View File

@ -0,0 +1,18 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="OpenTK" Version="3.0.1" />
<Reference
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
<PackageReference Include="OpenTK.GLControl" Version="3.0.1" />
<Reference
FusionName="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk.glcontrol/3.0.1/lib/net20/OpenTK.GLControl.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
</ItemGroup>
</Project>

10
Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj
View File

@ -38,15 +38,7 @@
<!--<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>-->
<CodeAnalysisRuleSet Condition=" '$(OS)' == 'Windows_NT' ">MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
<PackageReference Include="OpenTK" Version="3.0.1" />
<Reference
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
</ItemGroup>
<Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"

11
Bizware/BizHawk.Bizware.BizwareGL.SlimDX/DotNetBuild.NuGet.targets Normal file
View File

@ -0,0 +1,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="OpenTK" Version="3.0.1" />
<Reference
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
</ItemGroup>
</Project>

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

@ -42,15 +42,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
<PackageReference Include="OpenTK" Version="3.0.1" />
<Reference
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
</ItemGroup>
<Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"

11
Bizware/BizHawk.Bizware.BizwareGL/DotNetBuild.NuGet.targets Normal file
View File

@ -0,0 +1,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="OpenTK" Version="3.0.1" />
<Reference
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
Name="OpenTK"
Private="true"
SpecificVersion="true" />
</ItemGroup>
</Project>