Skip to content

Commit e6f4c08

Browse files
housekeeping: make VS2022 not restart action (#2924)
Co-authored-by: Chris Pulman <[email protected]>
1 parent 0f9758a commit e6f4c08

File tree

3 files changed

+45
-19
lines changed

3 files changed

+45
-19
lines changed

.github/workflows/build-samples.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,33 @@ jobs:
1212
matrix:
1313
configuration: [Debug, Release]
1414

15-
runs-on: windows-latest
16-
15+
runs-on: windows-2022
1716
steps:
17+
18+
- name: Update VS2022 preview
19+
shell: bash
20+
run: |
21+
dotnet tool update -g dotnet-vs
22+
vs modify preview +mobile +xamarin +core +desktop +uwp +web
23+
echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
24+
25+
- name: Install Windows SDK 10.0.16299
26+
shell: pwsh
27+
run: |
28+
Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe
29+
$startInfo = New-Object System.Diagnostics.ProcessStartInfo
30+
$startInfo.FileName = "winsdk.exe"
31+
$startInfo.Arguments = "/norestart /quiet"
32+
$process = New-Object System.Diagnostics.Process
33+
$process.StartInfo = $startInfo
34+
$process.Start()
35+
$process.WaitForExit()
36+
1837
- name: Checkout
1938
uses: actions/checkout@v2
2039
with:
2140
fetch-depth: 0
22-
lfs: true
41+
lfs: true
2342

2443
- name: Install .NET Core
2544
uses: actions/[email protected]
@@ -46,13 +65,6 @@ jobs:
4665
dotnet workload install macos
4766
dotnet workload install maui
4867
49-
- name: Install VS2022 preview
50-
shell: bash
51-
run: |
52-
dotnet tool update -g dotnet-vs
53-
vs install preview -sku:enterprise --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools +Microsoft.VisualStudio.Workload.NetCrossPlat +Microsoft.VisualStudio.Workload.Universal
54-
echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
55-
5668
- name: Add MSBuild to PATH
5769
uses: glennawatson/[email protected]
5870
with:

.github/workflows/ci-build.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,30 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: windows-latest
16+
runs-on: windows-2022
1717
outputs:
1818
nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
1919
steps:
20+
21+
- name: Update VS2022 preview
22+
shell: bash
23+
run: |
24+
dotnet tool update -g dotnet-vs
25+
vs modify preview +mobile +xamarin +core +desktop +uwp +web
26+
echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
27+
28+
- name: Install Windows SDK 10.0.16299
29+
shell: pwsh
30+
run: |
31+
Invoke-WebRequest -Uri https://go.microsoft.com/fwlink/p/?linkid=864422 -OutFile winsdk.exe
32+
$startInfo = New-Object System.Diagnostics.ProcessStartInfo
33+
$startInfo.FileName = "winsdk.exe"
34+
$startInfo.Arguments = "/norestart /quiet"
35+
$process = New-Object System.Diagnostics.Process
36+
$process.StartInfo = $startInfo
37+
$process.Start()
38+
$process.WaitForExit()
39+
2040
- name: Checkout
2141
uses: actions/checkout@v2
2242
with:
@@ -46,13 +66,7 @@ jobs:
4666
dotnet workload install tvos
4767
dotnet workload install macos
4868
dotnet workload install maui
49-
50-
- name: Install VS2022 preview
51-
shell: bash
52-
run: |
53-
dotnet tool update -g dotnet-vs
54-
vs install preview -sku:enterprise --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools +Microsoft.VisualStudio.Workload.NetCrossPlat +Microsoft.VisualStudio.Workload.Universal
55-
echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
69+
dotnet workload restore "src/ReactiveUI/ReactiveUI.csproj"
5670
5771
- name: Add MSBuild to PATH
5872
uses: glennawatson/[email protected]

src/ReactiveUI.Uno/ReactiveUI.Uno.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
25-
<PackageReference Include="Uno.UI" Version="3.10.0-dev.591" />
25+
<PackageReference Include="Uno.UI" Version="3.10.0-dev.725" />
2626
</ItemGroup>
2727

2828
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">

0 commit comments

Comments
 (0)