From e6f4c0814a702175b56d8d1ba28a3fc51a813113 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Sun, 12 Sep 2021 11:55:01 +1000 Subject: [PATCH] housekeeping: make VS2022 not restart action (#2924) Co-authored-by: Chris Pulman --- .github/workflows/build-samples.yml | 32 ++++++++++++++++-------- .github/workflows/ci-build.yml | 30 ++++++++++++++++------ src/ReactiveUI.Uno/ReactiveUI.Uno.csproj | 2 +- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-samples.yml b/.github/workflows/build-samples.yml index b2a631ff94..a5b43e8e85 100644 --- 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 index 3ed6f61df7..ba5db96c87 100644 --- 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 index a3b2feb072..5162014472 100644 --- a/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj +++ b/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj @@ -22,7 +22,7 @@ - +