Merge pull request github#15475 from github/henti/update_dotnet

henti · web-flow · commit 16e62e664986 · 2024-02-01T11:25:21.000Z
Updated dotnet version to 8.0.101
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 8.0.101
 
     - name: Checkout repository
       uses: actions/checkout@v4
diff --git a/.github/workflows/csharp-qltest.yml b/.github/workflows/csharp-qltest.yml
@@ -74,13 +74,13 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.100
+          dotnet-version: 8.0.101
       - name: Extractor unit tests
         run: |
-          dotnet test -p:RuntimeFrameworkVersion=8.0.0 extractor/Semmle.Util.Tests
-          dotnet test -p:RuntimeFrameworkVersion=8.0.0 extractor/Semmle.Extraction.Tests
-          dotnet test -p:RuntimeFrameworkVersion=8.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
-          dotnet test -p:RuntimeFrameworkVersion=8.0.0 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"
+          dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Util.Tests
+          dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Extraction.Tests
+          dotnet test -p:RuntimeFrameworkVersion=8.0.1 autobuilder/Semmle.Autobuild.CSharp.Tests
+          dotnet test -p:RuntimeFrameworkVersion=8.0.1 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"
         shell: bash
   stubgentest:
     runs-on: ubuntu-latest
diff --git a/csharp/actions/create-extractor-pack/action.yml b/csharp/actions/create-extractor-pack/action.yml
@@ -7,7 +7,7 @@ runs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 8.0.101
     - name: Build Extractor
       shell: bash
       run: scripts/create-extractor-pack.sh
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml/global.json b/csharp/ql/integration-tests/all-platforms/cshtml/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/global.json b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/global.json b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/global.json b/csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_missing_project_files/global.json b/csharp/ql/integration-tests/all-platforms/diag_missing_project_files/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/global.json b/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/global.json b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_build/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_build/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_pack/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_pack/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_publish/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_publish/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_run/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_run/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone/global.json b/csharp/ql/integration-tests/all-platforms/standalone/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100"
+    "version": "8.0.101"
   }
 }
diff --git a/csharp/ql/integration-tests/linux-only/compiler_args/CompilerArgs.expected b/csharp/ql/integration-tests/linux-only/compiler_args/CompilerArgs.expected
diff --git a/csharp/ql/integration-tests/linux-only/compiler_args/global.json b/csharp/ql/integration-tests/linux-only/compiler_args/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
-}
+}
diff --git a/csharp/ql/integration-tests/linux-only/standalone_dependencies_non_utf8_filename/global.json b/csharp/ql/integration-tests/linux-only/standalone_dependencies_non_utf8_filename/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/posix-only/dotnet_test/global.json b/csharp/ql/integration-tests/posix-only/dotnet_test/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/posix-only/dotnet_test_mstest/global.json b/csharp/ql/integration-tests/posix-only/dotnet_test_mstest/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/posix-only/inherit-env-vars/global.json b/csharp/ql/integration-tests/posix-only/inherit-env-vars/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.expected
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies/global.json b/csharp/ql/integration-tests/posix-only/standalone_dependencies/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100"
+    "version": "8.0.101"
   }
 }
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_multi_target/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_multi_target/Assemblies.expected
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_multi_target/global.json b/csharp/ql/integration-tests/posix-only/standalone_dependencies_multi_target/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100"
+    "version": "8.0.101"
   }
 }
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget/global.json b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/posix-only/warn_as_error/global.json b/csharp/ql/integration-tests/posix-only/warn_as_error/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0.100"
+        "version": "8.0.101"
     }
 }
diff --git a/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.expected
diff --git a/csharp/ql/integration-tests/windows-only/standalone_dependencies/global.json b/csharp/ql/integration-tests/windows-only/standalone_dependencies/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100"
+    "version": "8.0.101"
   }
 }
diff --git a/csharp/ql/test/library-tests/cil/attributes/attribute.expected b/csharp/ql/test/library-tests/cil/attributes/attribute.expected
diff --git a/csharp/scripts/create-extractor-pack.sh b/csharp/scripts/create-extractor-pack.sh
@@ -21,7 +21,7 @@ mkdir -p extractor-pack
 mkdir -p extractor-pack/tools/${platform}
 
 function dotnet_publish {
-  dotnet publish --self-contained --configuration Release --runtime ${dotnet_platform} -p:RuntimeFrameworkVersion=8.0.0 $1 --output extractor-pack/tools/${platform}
+  dotnet publish --self-contained --configuration Release --runtime ${dotnet_platform} -p:RuntimeFrameworkVersion=8.0.1 $1 --output extractor-pack/tools/${platform}
 }
 
 dotnet_publish extractor/Semmle.Extraction.CSharp.Standalone
diff --git a/csharp/scripts/stubs/helpers.py b/csharp/scripts/stubs/helpers.py
@@ -110,7 +110,7 @@ def make_stubs(self):
         bqrsFile = os.path.join(rawOutputDir, outputName + '.bqrs')
         jsonFile = os.path.join(rawOutputDir, outputName + '.json')
 
-        sdk_version = '8.0.100'
+        sdk_version = '8.0.101'
         print("\n* Creating new global.json file and setting SDK to " + sdk_version)
         self.run_cmd(['dotnet', 'new', 'globaljson', '--force', '--sdk-version', sdk_version, '--output', self.workDir])
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.100"`
	`3`	`+ "version": "8.0.101"`
`4`	`4`	`}`
`5`	`5`	`}`