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

Use env. var for nuget pkg dir on Linux, and don't set CscToolExe 

Also removed comments and used SolutionDir in .csproj/.props, and enabled Roslyn
Analyzers on GitLab CI builds
This commit is contained in:
YoshiRulz 2020-03-19 14:08:34 +10:00
parent efb34f74e1
commit 89abab7a52
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -12,7 +12,7 @@ build:
- output
when: always
script:
- dotnet build BizHawk.sln -c Release -m -p:MachineNuGetPackageDir=$HOME/.nuget/packages
- Dist/BuildRelease.sh -p:MachineRunAnalyzersDuringBuild=true
stage: build
deploy_artifact:

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

@ -96,17 +96,14 @@
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
HintPath="$(SolutionDir)packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
Private="true" />
<!--<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
HintPath="../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"
Private="true" />-->
<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="$(SolutionDir)packages/OpenTK.GLControl.3.0.1/lib/net20/OpenTK.GLControl.dll"
Private="true" />
<Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
HintPath="$(SolutionDir)packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
Private="true" />
<Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"
HintPath="../packages/System.Drawing.Common.4.7.0/lib/net461/System.Drawing.Common.dll"
HintPath="$(SolutionDir)packages/System.Drawing.Common.4.7.0/lib/net461/System.Drawing.Common.dll"
Private="true" />
</ItemGroup>
<ItemGroup>

14
BizHawk.Client.EmuHawk/ProjectPkgRefs.props
View File

@ -1,31 +1,25 @@
<Project>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" />
<Reference Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
<Reference Include="$(NUGET_PACKAGES)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
<!--<PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" />
<Reference Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Name="OpenTK"
Private="true"
SpecificVersion="true" />-->
<PackageReference Include="OpenTK.GLControl" Version="3.0.1" PrivateAssets="All" />
<Reference Include="$(MachineNuGetPackageDir)/opentk.glcontrol/3.0.1/lib/net20/OpenTK.GLControl.dll"
<Reference Include="$(NUGET_PACKAGES)/opentk.glcontrol/3.0.1/lib/net20/OpenTK.GLControl.dll"
FusionName="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
Name="OpenTK.GLControl"
Private="true"
SpecificVersion="true" />
<PackageReference Include="SharpZipLib" Version="1.1.0" PrivateAssets="All" />
<Reference Include="$(MachineNuGetPackageDir)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
<Reference Include="$(NUGET_PACKAGES)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
FusionName="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
Name="ICSharpCode.SharpZipLib"
Private="true"
SpecificVersion="true" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" PrivateAssets="All" />
<Reference Include="$(MachineNuGetPackageDir)/system.drawing.common/4.7.0/lib/net461/System.Drawing.Common.dll"
<Reference Include="$(NUGET_PACKAGES)/system.drawing.common/4.7.0/lib/net461/System.Drawing.Common.dll"
FusionName="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"
Name="System.Drawing.Common"
Private="true"

3
Dist/BuildDebug.sh
View File

@ -1,2 +1,3 @@
#!/bin/sh
cd "$(dirname "$0")/.." && CscToolExe="$(which csc)" dotnet build BizHawk.sln -c Debug -m -p:MachineNuGetPackageDir=$HOME/.nuget/packages "$@"
if [ -z "$NUGET_PACKAGES" ]; then export NUGET_PACKAGES="$HOME/.nuget/packages"; fi
cd "$(dirname "$0")/.." && dotnet build BizHawk.sln -c Debug -m "$@"

3
Dist/BuildRelease.sh
View File

@ -1,2 +1,3 @@
#!/bin/sh
cd "$(dirname "$0")/.." && CscToolExe="$(which csc)" dotnet build BizHawk.sln -c Release -m -p:MachineNuGetPackageDir=$HOME/.nuget/packages "$@"
if [ -z "$NUGET_PACKAGES" ]; then export NUGET_PACKAGES="$HOME/.nuget/packages"; fi
cd "$(dirname "$0")/.." && dotnet build BizHawk.sln -c Release -m "$@"