Merge branch 'main' into feature/upgrade-dotnet-sdk

ZEISS · Nov 12, 2024 · 1ada4c3 · 1ada4c3
2 parents 7703cb5 + 922cf00
commit 1ada4c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/czishrink_dotnet.yml b/.github/workflows/czishrink_dotnet.yml
@@ -54,6 +54,9 @@ jobs:
         with:
           dotnet-version: ${{ steps.get_dotnet_version.outputs.dotnetversion }}
 
+      - name: Print .NET version
+        run: dotnet --version
+
       - name: Get Version from Directory.Build.props
         id: getversion
         run: |

diff --git a/czishrink/global.json b/czishrink/global.json
@@ -2,6 +2,6 @@
   "sdk": {
     "version": "8.0.403",
     "allowPrerelease": false,
-    "rollForward": "feature"
+    "rollForward": "disable"
   }
 }