From 8cd2b82ea19a36acd3ec08a6f4e1f32f744e2e53 Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Wed, 7 Dec 2022 15:44:22 -0800
Subject: [PATCH] Update hosted builds (#201)

---
 .github/workflows/CI.yml       | 17 +++++------------
 .github/workflows/Official.yml | 15 +++++++--------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index c2067ae..e7bbaa0 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -43,20 +43,13 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET ${{ env.DotNet3Version }}
+    - name: Install .NET Core ${{ env.DotNet3Version }}, .NET ${{ env.DotNet6Version }}, and .NET ${{ env.DotNet7Version }}
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: ${{ env.DotNet3Version }}
-
-    - name: Install .NET ${{ env.DotNet6Version }}
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: ${{ env.DotNet6Version }}
-
-    - name: Install .NET ${{ env.DotNet7Version }}
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: ${{ env.DotNet7Version }}
+        dotnet-version: |
+          ${{ env.DotNet3Version }}
+          ${{ env.DotNet6Version }}
+          ${{ env.DotNet7Version }}
 
     - name: Build Solution
       run: dotnet build "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/build.binlog"
diff --git a/.github/workflows/Official.yml b/.github/workflows/Official.yml
index 7cc11f3..45b82c5 100644
--- a/.github/workflows/Official.yml
+++ b/.github/workflows/Official.yml
@@ -15,6 +15,7 @@ env:
   ContinuousIntegrationBuild: 'true'
   DotNet3Version: '3.x'
   DotNet6Version: '6.x'
+  DotNet7Version: '6.x'
 
 jobs:
   build:
@@ -27,15 +28,13 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET Core ${{ env.DotNet3Version }}
-      uses: actions/setup-dotnet@v1
+    - name: Install .NET Core ${{ env.DotNet3Version }}, .NET ${{ env.DotNet6Version }}, and .NET ${{ env.DotNet7Version }}
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: ${{ env.DotNet3Version }}
-
-    - name: Install .NET ${{ env.DotNet6Version }}
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: ${{ env.DotNet6Version }}
+        dotnet-version: |
+          ${{ env.DotNet3Version }}
+          ${{ env.DotNet6Version }}
+          ${{ env.DotNet7Version }}
 
     - name: Build Solution
       run: dotnet build "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}\build.binlog"