Skip to content
This repository has been archived by the owner on Oct 16, 2024. It is now read-only.

Commit

Permalink
Undo atrocities
Browse files Browse the repository at this point in the history
  • Loading branch information
misandrie committed Dec 17, 2023
1 parent 7522881 commit 6328435
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 17 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: SS14.Launcher.Tests
run: dotnet test SS14.Launcher.Tests/SS14.Launcher.Tests.csproj -v n
- uses: actions/checkout@v2
with:
submodules: 'recursive'
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: SS14.Launcher.Tests
run: dotnet test SS14.Launcher.Tests/SS14.Launcher.Tests.csproj -v n
1 change: 1 addition & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NSec.Cryptography" Version="22.4.0" />
<PackageVersion Include="SharpZstd.Interop" Version="1.5.2-beta2" />
<PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="8.0.0" />
<!-- Loader -->
<PackageVersion Include="Robust.Natives" Version="0.1.1" />
<!-- Launcher -->
Expand Down
1 change: 1 addition & 0 deletions SS14.Launcher/SS14.Launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<PackageReference Include="Mono.Posix.NETStandard" />
<PackageReference Include="SharpZstd.Interop" />
<PackageReference Include="SpaceWizards.Sodium" />
<PackageReference Include="Microsoft.NET.ILLink.Tasks" />
</ItemGroup>
<ItemGroup>
<None Remove="Utility\runtime.json" />
Expand Down
1 change: 1 addition & 0 deletions SS14.Loader/SS14.Loader.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<PackageReference Include="NSec.Cryptography" />
<PackageReference Include="Robust.Natives" />
<PackageReference Include="SharpZstd.Interop" />
<PackageReference Include="Microsoft.NET.ILLink.Tasks" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion publish_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd "$(dirname "$0")"
rm -r **/bin bin/publish/Linux
rm SS14.Launcher_Linux.zip

dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release --no-self-contained -r linux-x64 /nologo #/p:RobustILLink=true
dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release --no-self-contained -r linux-x64 /nologo /p:RobustILLink=true
dotnet publish SS14.Loader/SS14.Loader.csproj -c Release --no-self-contained -r linux-x64 /nologo

# Create intermediate directories.
Expand Down
2 changes: 1 addition & 1 deletion publish_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd "$(dirname "$0")"
rm -r **/bin bin/publish/macOS
rm SS14.Launcher_macOS.zip

dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release --no-self-contained -r osx-x64 --framework net7.0 /nologo #/p:RobustILLink=true
dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release --no-self-contained -r osx-x64 --framework net7.0 /nologo /p:RobustILLink=true
dotnet publish SS14.Loader/SS14.Loader.csproj -c Release --no-self-contained -r osx-x64 /nologo

# Create intermediate directories.
Expand Down
3 changes: 1 addition & 2 deletions publish_windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ cd "$(dirname "$0")"
rm -r **/bin bin/publish/Windows
rm SS14.Launcher_Windows.zip

#dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release --no-self-contained -r win-x64 --framework net7.0 /nologo /p:RobustILLink=true
dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release --no-self-contained -r win-x64 --framework net7.0 /nologo
dotnet publish SS14.Launcher/SS14.Launcher.csproj /p:FullRelease=True -c Release --no-self-contained -r win-x64 --framework net7.0 /nologo /p:RobustILLink=true
dotnet publish SS14.Loader/SS14.Loader.csproj -c Release --no-self-contained -r win-x64 /nologo
dotnet publish SS14.Launcher.Bootstrap/SS14.Launcher.Bootstrap.csproj -c Release /nologo

Expand Down

0 comments on commit 6328435

Please sign in to comment.