Update build scripts for latest

ChrisPulman · May 19, 2023 · 1fddd68 · 1fddd68
1 parent 87f60d9
commit 1fddd68
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 10 deletions.
diff --git a/.github/workflows/BuildOnly.yml b/.github/workflows/BuildOnly.yml
@@ -12,20 +12,38 @@ jobs:
     runs-on: windows-2022
 
     steps:
+    - name: Get Current Visual Studio Information
+      shell: bash
+      run: |
+        dotnet tool update -g dotnet-vs
+        echo "-- About RELEASE --"
+        vs where release
+
+    - name: Update Visual Studio Latest Release
+      shell: bash
+      run: |
+        echo "-- Update RELEASE --"
+        vs update release Enterprise
+        vs modify release Enterprise +mobile +desktop +uwp +web
+        echo "-- About RELEASE Updated --"
+        vs where release
+        
     - name: Checkout
       uses: actions/checkout@v3
       with:
        fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+            6.0.x
+            7.0.x
 
     - name: Add MSBuild to PATH
-      uses: glennawatson/setup-msbuild@v1.0.3
+      uses: microsoft/setup-msbuild@v1.1.3
       with:
-        prerelease: true
+        vs-prerelease: true
 
     - name: NBGV
       id: nbgv
@@ -43,7 +61,7 @@ jobs:
       working-directory: src
 
     - name: Run Unit Tests and Generate Coverage
-      uses: glennawatson/coverlet-msbuild@v1
+      uses: glennawatson/coverlet-msbuild@v2.1
       with:
         project-files: 'src/**/*Tests*.csproj'
         no-build: true

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -10,20 +10,38 @@ jobs:
     runs-on: windows-2022
 
     steps:
+    - name: Get Current Visual Studio Information
+      shell: bash
+      run: |
+        dotnet tool update -g dotnet-vs
+        echo "-- About RELEASE --"
+        vs where release
+
+    - name: Update Visual Studio Latest Release
+      shell: bash
+      run: |
+        echo "-- Update RELEASE --"
+        vs update release Enterprise
+        vs modify release Enterprise +mobile +desktop +uwp +web
+        echo "-- About RELEASE Updated --"
+        vs where release
+        
     - name: Checkout
       uses: actions/checkout@v3
       with:
        fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+            6.0.x
+            7.0.x
 
     - name: Add MSBuild to PATH
-      uses: glennawatson/setup-msbuild@v1.0.3
+      uses: microsoft/setup-msbuild@v1.1.3
       with:
-        prerelease: true
+        vs-prerelease: true
 
     - name: NBGV
       id: nbgv
@@ -41,7 +59,7 @@ jobs:
       working-directory: src
 
     - name: Run Unit Tests and Generate Coverage
-      uses: glennawatson/coverlet-msbuild@v1
+      uses: glennawatson/coverlet-msbuild@v2.1
       with:
         project-files: 'src/**/*Tests*.csproj'
         no-build: true