housekeeping: make VS2022 not restart action (#2924)

Co-authored-by: Chris Pulman <chris.pulman@yahoo.com>
reactiveui · Sep 12, 2021 · e6f4c08 · e6f4c08
1 parent 0f9758a
commit e6f4c08
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 19 deletions.
diff --git a/.github/workflows/build-samples.yml b/.github/workflows/build-samples.yml
@@ -12,14 +12,33 @@ jobs:
       matrix:
         configuration: [Debug, Release]
 
-    runs-on: windows-latest
-
+    runs-on: windows-2022
     steps:
+
+    - name: Update VS2022 preview
+      shell: bash
+      run: |
+        dotnet tool update -g dotnet-vs
+        vs modify preview +mobile +xamarin +core +desktop +uwp +web
+        echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
+
+    - name: Install Windows SDK 10.0.16299
+      shell: pwsh
+      run: |
+        Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe
+        $startInfo = New-Object System.Diagnostics.ProcessStartInfo
+        $startInfo.FileName = "winsdk.exe"
+        $startInfo.Arguments = "/norestart /quiet"
+        $process = New-Object System.Diagnostics.Process
+        $process.StartInfo = $startInfo
+        $process.Start()
+        $process.WaitForExit()
+
     - name: Checkout
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
-        lfs: true
+        lfs: true       
 
     - name: Install .NET Core
       uses: actions/setup-dotnet@v1.8.1
@@ -46,13 +65,6 @@ jobs:
         dotnet workload install macos
         dotnet workload install maui
         
-    - name: Install VS2022 preview
-      shell: bash
-      run: |
-        dotnet tool update -g dotnet-vs
-        vs install preview -sku:enterprise --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools +Microsoft.VisualStudio.Workload.NetCrossPlat +Microsoft.VisualStudio.Workload.Universal
-        echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
-
     - name: Add MSBuild to PATH
       uses: glennawatson/setup-msbuild@v1.0.3
       with:

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -13,10 +13,30 @@ env:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: windows-2022
     outputs:
       nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
     steps:
+
+    - name: Update VS2022 preview
+      shell: bash
+      run: |
+        dotnet tool update -g dotnet-vs
+        vs modify preview +mobile +xamarin +core +desktop +uwp +web
+        echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
+
+    - name: Install Windows SDK 10.0.16299
+      shell: pwsh
+      run: |
+        Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe
+        $startInfo = New-Object System.Diagnostics.ProcessStartInfo
+        $startInfo.FileName = "winsdk.exe"
+        $startInfo.Arguments = "/norestart /quiet"
+        $process = New-Object System.Diagnostics.Process
+        $process.StartInfo = $startInfo
+        $process.Start()
+        $process.WaitForExit()        
+        
     - name: Checkout
       uses: actions/checkout@v2
       with:
@@ -46,13 +66,7 @@ jobs:
         dotnet workload install tvos
         dotnet workload install macos
         dotnet workload install maui
-
-    - name: Install VS2022 preview
-      shell: bash
-      run: |
-        dotnet tool update -g dotnet-vs
-        vs install preview -sku:enterprise --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools +Microsoft.VisualStudio.Workload.NetCrossPlat +Microsoft.VisualStudio.Workload.Universal
-        echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
+        dotnet workload restore "src/ReactiveUI/ReactiveUI.csproj"
 
     - name: Add MSBuild to PATH
       uses: glennawatson/setup-msbuild@v1.0.3

diff --git a/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj b/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
-    <PackageReference Include="Uno.UI" Version="3.10.0-dev.591" />
+    <PackageReference Include="Uno.UI" Version="3.10.0-dev.725" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">