Merge branch 'hotfix/2.18.0' into develop

Terradue · Nov 6, 2023 · 7523064 · 7523064
2 parents 373a343 + 266ea53
commit 7523064
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -19,9 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: | 
-            6.0.x
-            7.0.x
+        global-json-file: global.json
     - name: Install dependencies (hdf5)
       run: sudo apt install hdf5-tools -y
     - name: Restore dependencies

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,9 +41,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: | 
-            6.0.x
-            7.0.x
+        global-json-file: global.json
     - name: Make packages
       run: |
         dotnet tool restore

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Packaging.Targets">
+      <Version>0.1.220-*</Version>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+    "sdk": {
+      "version": "6.0.300",
+      "rollForward": "latestFeature"
+    }
+  }