Skip to content

Commit fa89b58

Browse files
authored
Merge pull request #341 from CommunityToolkit/fix/issue337
Updated workflow versions
2 parents c10c2f1 + 01c4cb7 commit fa89b58

File tree

5 files changed

+26
-22
lines changed

5 files changed

+26
-22
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"uno.check": {
6-
"version": "1.3.1",
6+
"version": "1.10.0",
77
"commands": [
88
"uno-check"
99
]
@@ -15,4 +15,4 @@
1515
]
1616
}
1717
}
18-
}
18+
}

.github/workflows/build.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
# Steps represent a sequence of tasks that will be executed as part of the job
2626
steps:
2727
- name: Install .NET 6 SDK
28-
uses: actions/setup-dotnet@v1
28+
uses: actions/setup-dotnet@v3
2929
with:
3030
dotnet-version: '6.0.x'
3131

3232
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
3333
- name: Checkout Repository
34-
uses: actions/checkout@v2
34+
uses: actions/checkout@v3
3535

3636
# Restore Tools from Manifest list in the Repository
3737
- name: Restore dotnet tools
@@ -54,13 +54,13 @@ jobs:
5454
# Steps represent a sequence of tasks that will be executed as part of the job
5555
steps:
5656
- name: Install .NET 6 SDK
57-
uses: actions/setup-dotnet@v1
57+
uses: actions/setup-dotnet@v3
5858
with:
59-
dotnet-version: '6.0.202'
59+
dotnet-version: '6.0.x'
6060

6161
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
6262
- name: Checkout Repository
63-
uses: actions/checkout@v2
63+
uses: actions/checkout@v3
6464

6565
# Restore Tools from Manifest list in the Repository
6666
- name: Restore dotnet tools
@@ -134,13 +134,13 @@ jobs:
134134

135135
steps:
136136
- name: Install .NET 6 SDK
137-
uses: actions/setup-dotnet@v1
137+
uses: actions/setup-dotnet@v3
138138
with:
139-
dotnet-version: '6.0.202'
139+
dotnet-version: '6.0.x'
140140

141141
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
142142
- name: Checkout Repository
143-
uses: actions/checkout@v2
143+
uses: actions/checkout@v3
144144

145145
- name: Add msbuild to PATH
146146
uses: microsoft/[email protected]
@@ -191,13 +191,13 @@ jobs:
191191

192192
steps:
193193
- name: Install .NET 6 SDK
194-
uses: actions/setup-dotnet@v1
194+
uses: actions/setup-dotnet@v3
195195
with:
196-
dotnet-version: '6.0.201'
196+
dotnet-version: '6.0.x'
197197

198198
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
199199
- name: Checkout Repository
200-
uses: actions/checkout@v2
200+
uses: actions/checkout@v3
201201

202202
- name: Generate solution
203203
shell: pwsh
@@ -210,6 +210,6 @@ jobs:
210210
# See launch.json configuration file for analogous command we're emulating here to build LINK: ../../.vscode/launch.json:CommunityToolkit.Labs.Wasm.csproj
211211
- name: dotnet build
212212
working-directory: ./platforms/CommunityToolkit.Labs.Wasm/
213-
run: dotnet build /r /bl /p:UnoSourceGeneratorUseGenerationHost=true /p:UnoSourceGeneratorUseGenerationController=false -p:TargetFrameworks=netstandard2.0 -p:TargetFramework=net5.0
213+
run: dotnet build /r /bl /p:UnoSourceGeneratorUseGenerationHost=true /p:UnoSourceGeneratorUseGenerationController=false
214214

215215
# TODO: Do we want to run tests here? Can we do that on linux easily?

common/Labs.Head.WinAppSdk.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
22-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
21+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
22+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
2323
<Manifest Include="$(ApplicationManifest)" />
2424
</ItemGroup>
2525

common/MultiTarget/MultiTarget.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<ItemGroup>
4646
<PackageReference Condition="'$(TargetFramework)' == '$(UwpTargetFramework)'" Include="Microsoft.UI.Xaml" Version="2.7.0" />
47-
<PackageReference Condition="'$(TargetFramework)' == '$(WinAppSdkTargetFramework)'" Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
47+
<PackageReference Condition="'$(TargetFramework)' == '$(WinAppSdkTargetFramework)'" Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
4848
</ItemGroup>
4949

5050
<ItemGroup>

global.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
2-
"msbuild-sdks":
3-
{
4-
"MSBuild.Sdk.Extras":"3.0.23"
5-
}
6-
}
2+
"sdk": {
3+
"version": "6.0.403",
4+
"rollForward": "latestFeature"
5+
},
6+
"msbuild-sdks":
7+
{
8+
"MSBuild.Sdk.Extras":"3.0.23"
9+
}
10+
}

0 commit comments

Comments
 (0)