Skip to content
This repository was archived by the owner on Jan 18, 2022. It is now read-only.

Commit 515adce

Browse files
authored
UTY-2646: new dotnet version (#1443)
Updates all tooling to use .NET Core SDK v3.1.302 and pin C# version to 8.0.
1 parent fcb1b4b commit 515adce

File tree

11 files changed

+24
-11
lines changed

11 files changed

+24
-11
lines changed

.buildkite/premerge.steps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ windows: &windows
1313
- "environment=production"
1414
- "permission_set=builder"
1515
- "platform=windows"
16-
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-06-124455-bk13081-5d808a4a}"
16+
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-30-165418-bk13785-82b83865-d}"
1717
- "scaler_version=2"
1818
- "minimum_instances=1"
1919
- "agent_count=1"

.buildkite/release-qa.steps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ windows: &windows
1313
- "environment=production"
1414
- "permission_set=builder"
1515
- "platform=windows"
16-
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-06-124455-bk13081-5d808a4a}"
16+
- "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-30-165418-bk13785-82b83865-d}"
1717
- "scaler_version=2"
1818
- "minimum_instances=1"
1919
- "agent_count=1"

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- This no longer supports AuthorityImminentLoss.
99
- ComponentUpdateSystem no longer has the API `GetAuthority`, `GetComponent`, and `HasComponent`. [#1364](https://github.com/spatialos/gdk-for-unity/pull/1364)
1010
- Use the Unity Entities `EntityManager` instead.
11+
- The GDK now depends on .NET Core v3.1.3xx instead of v2.2.2xx. [#1443](https://github.com/spatialos/gdk-for-unity/pull/1443)
1112

1213
### Added
1314

UPGRADE_GUIDE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ The `WorkerSystem` and `ComponentDatabase` can be used to convert from `entityId
1717

1818
The `Reader` and `Writer` classes have had their `public Authority Authority` property changed to `public bool HasAuthority`. `HasAuthority` now indicates whether you have authority over the given component or not.
1919

20+
### .NET Core Update
21+
22+
The GDK, in particular the code generator and deployment launcher, has been updated to use [.NET Core SDK v3.1.3xx](https://dotnet.microsoft.com/download/dotnet-core/3.1).
23+
24+
To update, download and install the new version from the link provided above.
25+
2026
## From `0.3.7` to `0.3.8`
2127

2228
### Asset based entity representation

ci/shared-ci.pinned

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
master e23a8b76403a62d8029ec4bc249e98e759592670
1+
master 90c5ca1814e6bd0b7cbcbae37f4b80d9ba83fc03

ci/sonar-scanner.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,14 @@ fi
6060
#
6161
# To enable this to work with Unity, we first need to generate the `.sln` and `.csproj` files in order to build them with `msbuild`
6262
# For ease of use, we execute msbuild through `dotnet`!
63+
6364
pushd "workers/unity"
6465
# This finds all .xml files in the logs/ directory and concatentates their relative path together, separated by comma:
6566
# E.g. - -d:sonar.cs.opencover.reportsPath=./logs/coverage-results/my-first-report.xml,./logs/coverage-results/my-second-report.xml
6667
# Wildcards don't appear to play nice with this.
6768
args+=("-d:sonar.cs.opencover.reportsPaths=$(find ./logs -name "*.xml" | paste -sd "," -)")
68-
69+
trap "rm -f ${PROJECT_DIR}/workers/unity/global.json" EXIT
70+
dotnet new globaljson --sdk-version 2.2.402 --force
6971
traceStart "Execute sonar-scanner :sonarqube:"
7072
dotnet-sonarscanner begin "${args[@]}"
7173
dotnet msbuild ./unity.sln -t:Rebuild -nr:false | tee "${PROJECT_DIR}/logs/sonar-msbuild.log"

ci/test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ traceStart "Testing Unity: Playmode :joystick:"
8383
popd
8484
traceEnd
8585

86-
ci/sonar-scanner.sh
86+
if ! isMacOS; then
87+
ci/sonar-scanner.sh
88+
fi
8789

8890
cleanUnity "$(pwd)/workers/unity"

workers/unity/Packages/io.improbable.gdk.deploymentlauncher/.DeploymentLauncher/DeploymentLauncher.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
6-
<LangVersion>7.3</LangVersion>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<LangVersion>8.0</LangVersion>
77
</PropertyGroup>
88

99
<ItemGroup>

workers/unity/Packages/io.improbable.gdk.testutils/.SpotShim/SpotShim/SpotShim/SpotShim.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
6-
<LangVersion>7.1</LangVersion>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<LangVersion>8.0</LangVersion>
77
</PropertyGroup>
88

99
<ItemGroup>

workers/unity/Packages/io.improbable.gdk.tools/.CodeGenTemplate/CodeGen/CodeGen.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<LangVersion>8.0</LangVersion>
56
<StartupObject>Improbable.Gdk.CodeGenerator.CodeGenerator</StartupObject>
67
</PropertyGroup>
78
<ItemGroup>

0 commit comments

Comments
 (0)