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

Migrate from packages.config to PackageReference

This commit is contained in:
YoshiRulz 2019-12-26 15:57:33 +10:00
parent 88ae783ef0
commit c31050feb6
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
10 changed files with 199 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,27 +43,59 @@
<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>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../packages/Ionic.Zip.1.9.1.8/lib/Ionic.Zip.dll"
Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c"
Private="true" />
<Reference
HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Private="true" />
<Reference
HintPath="../packages/SharpCompress.0.24.0/lib/net45/SharpCompress.dll"
Include="SharpCompress, Version=0.24.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96"
Private="true" />
<Reference
HintPath="../packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
Private="true" />
</ItemGroup>
<ItemGroup>
<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>
<Private>True</Private>
</Reference>
<Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c">
<HintPath>../packages/Ionic.Zip.1.9.1.8/lib/Ionic.Zip.dll</HintPath>
<Private>True</Private>
</Reference>
<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>
<Private>True</Private>
</Reference>
<Reference Include="NLua">
<HintPath>..\output\dll\nlua\NLua.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="SharpCompress, Version=0.24.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96">
<HintPath>../packages/SharpCompress.0.24.0/lib/net45/SharpCompress.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64">
@ -316,9 +348,6 @@
<Name>BizHawk.Bizware.BizwareGL</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>

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

@ -69,21 +69,39 @@
<!--<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>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Private="true" />
<Reference
HintPath="../packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
Private="true" />
</ItemGroup>
<ItemGroup>
<Reference Include="GongShell">
<HintPath>..\References\GongShell.dll</HintPath>
</Reference>
<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>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<!--<Reference Include="Microsoft.VisualBasic" Condition=" '$(OS)' == 'Windows_NT' " />-->
<Reference Include="Microsoft.VisualBasic" />
<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>
<Private>True</Private>
</Reference>
<Reference Include="NLua, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\output\dll\nlua\NLua.dll</HintPath>

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

@ -41,11 +41,22 @@
<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>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Private="true" />
</ItemGroup>
<ItemGroup>
<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>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />

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

@ -63,19 +63,44 @@
<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>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../packages/ELFSharp.0.1/lib/net40/ELFSharp.dll"
Include="ELFSharp, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null"
Private="true" />
<Reference
HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Private="true" />
<Reference
HintPath="../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"
Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Private="true" />
</ItemGroup>
<ItemGroup>
<Reference Include="ELFSharp, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../packages/ELFSharp.0.1/lib/net40/ELFSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<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>
<Private>True</Private>
</Reference>
<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
<HintPath>../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PeNet">
<HintPath>..\References\PeNet.dll</HintPath>
</Reference>

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

@ -38,11 +38,22 @@
<!--<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>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"
Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Private="true" />
</ItemGroup>
<ItemGroup>
<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
<HintPath>../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />

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

@ -42,15 +42,33 @@
<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>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"
Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Private="true" />
<Reference
HintPath="../../packages/OpenTK.GLControl.3.0.1/lib/net20/OpenTK.GLControl.dll"
Include="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Private="true" />
</ItemGroup>
<ItemGroup>
<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
<HintPath>../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
<HintPath>../../packages/OpenTK.GLControl.3.0.1/lib/net20/OpenTK.GLControl.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />

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

@ -38,11 +38,22 @@
<!--<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>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"
Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Private="true" />
</ItemGroup>
<ItemGroup>
<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
<HintPath>../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SlimDX">
<HintPath>..\..\References\x64\SlimDX.dll</HintPath>
</Reference>

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

@ -42,11 +42,22 @@
<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>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference
HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"
Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Private="true" />
</ItemGroup>
<ItemGroup>
<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4">
<HintPath>../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />

2
Dist/BuildDebug.sh
View File

@ -1,2 +1,2 @@
#!/bin/sh
cd "$(dirname "$0")/.." && nuget restore BizHawk.sln && CscToolExe="$(which csc)" dotnet build BizHawk.sln "$@"
cd "$(dirname "$0")/.." && CscToolExe="$(which csc)" dotnet build BizHawk.sln -c Debug -m -p:MachineNuGetPackageDir=$HOME/.nuget/packages "$@"

2
Dist/BuildRelease.sh
View File

@ -1,2 +1,2 @@
#!/bin/sh
cd "$(dirname "$0")/.." && nuget restore BizHawk.sln && CscToolExe="$(which csc)" dotnet build BizHawk.sln -c Release "$@"
cd "$(dirname "$0")/.." && CscToolExe="$(which csc)" dotnet build BizHawk.sln -c Release -m -p:MachineNuGetPackageDir=$HOME/.nuget/packages "$@"