Merge branch 'dev' into v1next

blish-hud · Aug 14, 2023 · 01447cb · 01447cb
2 parents c133973 + 9449012
commit 01447cb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,6 +18,10 @@ jobs:
           fetch-depth: 0
       - uses: microsoft/setup-msbuild@v1.1
 
+      - name: Ensure dotnet 3.1 is available
+        shell: powershell
+        run: |
+          choco install dotnetcore-3.1-runtime
       # GitVersion action doesn't support /ensureassemblyinfo, see https://github.com/GitTools/actions/issues/220
       # So we need to create a new file to let GitVersion populate it
       - name: Create assembly info file for GitVersion

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,6 +13,10 @@ jobs:
           fetch-depth: 0
       - uses: microsoft/setup-msbuild@v1.1
 
+      - name: Ensure dotnet 3.1 is available
+        shell: powershell
+        run: |
+          choco install dotnetcore-3.1-runtime
       # GitVersion action doesn't support /ensureassemblyinfo, see https://github.com/GitTools/actions/issues/220
       # So we need to create a new file to let GitVersion populate it
       - name: Create assembly info file for GitVersion