UTY-2646: new dotnet version (#1443)

Updates all tooling to use .NET Core SDK v3.1.302 and pin C# version to 8.0.
spatialos · Aug 11, 2020 · 515adce · 515adce
1 parent fcb1b4b
commit 515adce
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 11 deletions.
diff --git a/.buildkite/premerge.steps.yaml b/.buildkite/premerge.steps.yaml
@@ -13,7 +13,7 @@ windows: &windows
     - "environment=production"
     - "permission_set=builder"
     - "platform=windows"
-    - "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-06-124455-bk13081-5d808a4a}"
+    - "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-30-165418-bk13785-82b83865-d}"
     - "scaler_version=2"
     - "minimum_instances=1"
     - "agent_count=1"

diff --git a/.buildkite/release-qa.steps.yaml b/.buildkite/release-qa.steps.yaml
@@ -13,7 +13,7 @@ windows: &windows
     - "environment=production"
     - "permission_set=builder"
     - "platform=windows"
-    - "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-06-124455-bk13081-5d808a4a}"
+    - "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-07-30-165418-bk13785-82b83865-d}"
     - "scaler_version=2"
     - "minimum_instances=1"
     - "agent_count=1"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
   - This no longer supports AuthorityImminentLoss.
 - ComponentUpdateSystem no longer has the API `GetAuthority`, `GetComponent`, and `HasComponent`. [#1364](https://github.com/spatialos/gdk-for-unity/pull/1364)
   - Use the Unity Entities `EntityManager` instead.
+- 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)
 
 ### Added
 

diff --git a/UPGRADE_GUIDE.md b/UPGRADE_GUIDE.md
@@ -17,6 +17,12 @@ The `WorkerSystem` and `ComponentDatabase` can be used to convert from `entityId
 
 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.
 
+### .NET Core Update
+
+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). 
+
+To update, download and install the new version from the link provided above.
+
 ## From `0.3.7` to `0.3.8`
 
 ### Asset based entity representation

diff --git a/ci/shared-ci.pinned b/ci/shared-ci.pinned
@@ -1 +1 @@
-master e23a8b76403a62d8029ec4bc249e98e759592670
+master 90c5ca1814e6bd0b7cbcbae37f4b80d9ba83fc03
diff --git a/ci/sonar-scanner.sh b/ci/sonar-scanner.sh
@@ -60,12 +60,14 @@ fi
 #
 # To enable this to work with Unity, we first need to generate the `.sln` and `.csproj` files in order to build them with `msbuild`
 # For ease of use, we execute msbuild through `dotnet`!
+
 pushd "workers/unity"
     # This finds all .xml files in the logs/ directory and concatentates their relative path together, separated by comma:
     # E.g. - -d:sonar.cs.opencover.reportsPath=./logs/coverage-results/my-first-report.xml,./logs/coverage-results/my-second-report.xml
     # Wildcards don't appear to play nice with this.
     args+=("-d:sonar.cs.opencover.reportsPaths=$(find ./logs -name "*.xml" | paste -sd "," -)")
-
+    trap "rm -f ${PROJECT_DIR}/workers/unity/global.json" EXIT
+    dotnet new globaljson --sdk-version 2.2.402 --force
     traceStart "Execute sonar-scanner :sonarqube:"
         dotnet-sonarscanner begin "${args[@]}"
         dotnet msbuild ./unity.sln -t:Rebuild -nr:false | tee "${PROJECT_DIR}/logs/sonar-msbuild.log"

diff --git a/ci/test.sh b/ci/test.sh
@@ -83,6 +83,8 @@ traceStart "Testing Unity: Playmode :joystick:"
     popd
 traceEnd
 
-ci/sonar-scanner.sh
+if ! isMacOS; then
+    ci/sonar-scanner.sh
+fi
 
 cleanUnity "$(pwd)/workers/unity"
diff --git a/...ckages/io.improbable.gdk.deploymentlauncher/.DeploymentLauncher/DeploymentLauncher.csproj b/...ckages/io.improbable.gdk.deploymentlauncher/.DeploymentLauncher/DeploymentLauncher.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...rs/unity/Packages/io.improbable.gdk.testutils/.SpotShim/SpotShim/SpotShim/SpotShim.csproj b/...rs/unity/Packages/io.improbable.gdk.testutils/.SpotShim/SpotShim/SpotShim/SpotShim.csproj
@@ -2,8 +2,8 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
-        <LangVersion>7.1</LangVersion>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <LangVersion>8.0</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/workers/unity/Packages/io.improbable.gdk.tools/.CodeGenTemplate/CodeGen/CodeGen.csproj b/workers/unity/Packages/io.improbable.gdk.tools/.CodeGenTemplate/CodeGen/CodeGen.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
     <StartupObject>Improbable.Gdk.CodeGenerator.CodeGenerator</StartupObject>
   </PropertyGroup>
   <ItemGroup>

diff --git a/...kages/io.improbable.gdk.tools/.CodeGenTemplate/CodeGenerationLib/CodeGenerationLib.csproj b/...kages/io.improbable.gdk.tools/.CodeGenTemplate/CodeGenerationLib/CodeGenerationLib.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>CodeGenerationLib</RootNamespace>
+        <LangVersion>8.0</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		master e23a8b76403a62d8029ec4bc249e98e759592670
		master 90c5ca1814e6bd0b7cbcbae37f4b80d9ba83fc03