Skip to content

Commit f5949d9

Browse files
committed
Use only .NET 6 and Gmod.NET 0.7.0 RC 1
1 parent ec9a3f3 commit f5949d9

File tree

5 files changed

+12
-19
lines changed

5 files changed

+12
-19
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88

99

1010
env:
11-
DOTNET_SDK_VERSION: '6.0.100-preview.5.21302.13'
12-
GMOD_DOT_NET_VERSION: '0.7.0-beta.2.46713465.main'
11+
GMOD_DOT_NET_VERSION: '0.7.0-rc.1.56307663.main'
1312

1413
jobs:
1514
linux-test:
@@ -20,9 +19,7 @@ jobs:
2019
uses: actions/checkout@v2.3.4
2120

2221
- name: Setup .NET SDK
23-
uses: actions/setup-dotnet@v1.7.2
24-
with:
25-
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
22+
uses: actions/setup-dotnet@v1.8.2
2623

2724
- name: Download Steam and install garrysmod
2825
run: |
@@ -37,7 +34,7 @@ jobs:
3734
- name: Download GmodDotNet
3835
working-directory: ./gmod/garrysmod/lua/bin/
3936
run: |
40-
wget https://gleb-krasilich.fra1.digitaloceanspaces.com/GmodNETStorage/storage/gmod-dot-net-linux.${{ env.GMOD_DOT_NET_VERSION }}.tar.gz
37+
wget https://github.com/GmodNET/runtime-nightly/releases/download/${{ GMOD_DOT_NET_VERSION }}/gmod-dot-net-linux.${{ GMOD_DOT_NET_VERSION }}.tar.gz
4138
tar -xvf gmod-dot-net-linux.${{ env.GMOD_DOT_NET_VERSION }}.tar.gz
4239
rm -rfv gmod-dot-net-linux.${{ env.GMOD_DOT_NET_VERSION }}.tar.gz
4340
@@ -66,9 +63,7 @@ jobs:
6663
uses: actions/checkout@v2.0.0
6764

6865
- name: Setup .NET SDK
69-
uses: actions/setup-dotnet@v1.7.2
70-
with:
71-
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
66+
uses: actions/setup-dotnet@v1.8.2
7267

7368
- name: Download Steam and install Garrys Mod
7469
shell: pwsh
@@ -84,7 +79,7 @@ jobs:
8479
working-directory: ./gmod/garrysmod/lua/bin/
8580
shell: pwsh
8681
run: |
87-
Invoke-WebRequest -Uri https://gleb-krasilich.fra1.digitaloceanspaces.com/GmodNETStorage/storage/gmod-dot-net-windows.${{ env.GMOD_DOT_NET_VERSION }}.zip -OutFile gmodnet.zip
82+
Invoke-WebRequest -Uri https://github.com/GmodNET/runtime-nightly/releases/download/${{ GMOD_DOT_NET_VERSION }}/gmod-dot-net-windows.${{ GMOD_DOT_NET_VERSION }}.zip -OutFile gmodnet.zip
8883
Expand-Archive -Path gmodnet.zip -DestinationPath .\
8984
9085
- name: Copy Lua file
@@ -122,9 +117,7 @@ jobs:
122117
uses: actions/checkout@v2.0.0
123118

124119
- name: Install .NET SDK
125-
uses: actions/setup-dotnet@v1.7.2
126-
with:
127-
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
120+
uses: actions/setup-dotnet@v1.8.2
128121

129122
- name: Create NuGet package
130123
run: dotnet pack ./GmodNET.Serilog.Sink/GmodNET.Serilog.Sink.csproj -c Release -o nupkgs

GmodNET.Serilog.Sink/GmodNET.Serilog.Sink.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
4+
<TargetFramework>net6.0</TargetFramework>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<DebugType>Portable</DebugType>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>

Tests/Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="GmodNET.API" Version="0.7.0-beta.2.46713465.main" />
9+
<PackageReference Include="GmodNET.API" Version="0.7.0-rc.1.56307663.main" />
1010
<ProjectReference Include="../GmodNET.Serilog.Sink/GmodNET.Serilog.Sink.csproj" />
1111
</ItemGroup>
1212

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-preview.5.21302.13"
3+
"version": "6.0.100-rc.2.21505.57"
44
}
5-
}
5+
}

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"Version": "1.0.0-preview.1"
2+
"Version": "1.1.0-preview.1"
33
}

0 commit comments

Comments
 (0)