themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel' into dependency_base_path

Browse source
This commit is contained in:
Lucas Nicodemus 2022-10-07 01:43:49 -07:00 • committed by GitHub
commit 06a631af7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci-otapi3-nuget.yml vendored
View file

@ -15,7 +15,7 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: Setup .NET - name: Setup .NET
uses: actions/setup-dotnet@v2 uses: actions/setup-dotnet@v3
with: with:
dotnet-version: 6.0.400 dotnet-version: 6.0.400
- name: Restore dependencies - name: Restore dependencies

10
.github/workflows/ci-otapi3.yml vendored
View file

@ -7,11 +7,11 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
submodules: 'recursive' submodules: 'recursive'
- uses: actions/setup-dotnet@v1 - uses: actions/setup-dotnet@v3
with: with:
dotnet-version: '6.0.100' dotnet-version: '6.0.100'
@ -25,11 +25,11 @@ jobs:
arch: ["win-x64", "osx-x64", "linux-x64", "linux-arm64", "linux-arm"] arch: ["win-x64", "osx-x64", "linux-x64", "linux-arm64", "linux-arm"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
submodules: 'recursive' submodules: 'recursive'
- uses: actions/setup-dotnet@v1 - uses: actions/setup-dotnet@v3
with: with:
dotnet-version: '6.0.100' dotnet-version: '6.0.100'
@ -49,7 +49,7 @@ jobs:
cd TShockLauncher/bin/Release/net6.0/${{ matrix.arch }}/publish/ cd TShockLauncher/bin/Release/net6.0/${{ matrix.arch }}/publish/
tar -cvf ../../../../../../TShock-Beta-${{ matrix.arch }}-Release.tar * tar -cvf ../../../../../../TShock-Beta-${{ matrix.arch }}-Release.tar *
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
with: with:
name: TShock-Beta-${{ matrix.arch }}-Release name: TShock-Beta-${{ matrix.arch }}-Release
path: TShock-Beta-${{ matrix.arch }}-Release.tar path: TShock-Beta-${{ matrix.arch }}-Release.tar

2
TShockAPI/TShockAPI.csproj
View file

@ -34,7 +34,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" /> <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
<PackageReference Include="MySql.Data" Version="8.0.30" /> <PackageReference Include="MySql.Data" Version="8.0.30" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.8" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.9" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
TShockLauncher.Tests/TShockLauncher.Tests.csproj
View file

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="NUnit.Analyzers" Version="3.3.0" /> <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />

2
TShockLauncher/TShockLauncher.csproj
View file

@ -22,7 +22,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" /> <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
<PackageReference Include="MySql.Data" Version="8.0.30" /> <PackageReference Include="MySql.Data" Version="8.0.30" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.8" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.9" />
<PackageReference Include="ModFramework" Version="1.1.3-alpha" GeneratePathProperty="true" /> <!-- only used to extract out to ./bin. --> <PackageReference Include="ModFramework" Version="1.1.3-alpha" GeneratePathProperty="true" /> <!-- only used to extract out to ./bin. -->
<!-- the launcher doesnt need the direct OTAPI reference, but since PackageReference[ExcludeFromSingleFile] doesnt work, exclude the assets and copy manually --> <!-- the launcher doesnt need the direct OTAPI reference, but since PackageReference[ExcludeFromSingleFile] doesnt work, exclude the assets and copy manually -->

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit 36bcd9594cc0406d34393dac5e7e806c2c4ea66e Subproject commit de9e3c7ec59dbccbb8076f269ddc7b684546b4dd