Skip to content

Commit

Permalink
Update to WinAppSDK 1.2.221109.1
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-hawker committed Nov 15, 2022
1 parent 55af407 commit 9f2f637
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"isRoot": true,
"tools": {
"uno.check": {
"version": "1.3.1",
"version": "1.10.0",
"commands": [
"uno-check"
]
},
"xamlstyler.console": {
"version": "3.2008.4",
"version": "3.2206.4",
"commands": [
"xstyler"
]
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Needed until XAML Styler updates to .NET 6
- name: Install .NET Core 3.1 SDK
uses: actions/setup-dotnet@v1
- name: Install .NET 6 SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: '3.1.x'
dotnet-version: '6.0.x'

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

# Restore Tools from Manifest list in the Repository
- name: Restore dotnet tools
Expand All @@ -49,13 +49,13 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Install .NET 6 SDK
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.202'
dotnet-version: '6.0.x'

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

# Restore Tools from Manifest list in the Repository
- name: Restore dotnet tools
Expand Down Expand Up @@ -123,13 +123,13 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Install .NET 6 SDK
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.202'
dotnet-version: '6.0.x'

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

# Restore Tools from Manifest list in the Repository
- name: Restore dotnet tools
Expand Down Expand Up @@ -200,13 +200,13 @@ jobs:

steps:
- name: Install .NET 6 SDK
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.202'
dotnet-version: '6.0.x'

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

- name: Add msbuild to PATH
uses: microsoft/[email protected]
Expand Down Expand Up @@ -255,13 +255,13 @@ jobs:

steps:
- name: Install .NET 6 SDK
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.201'
dotnet-version: '6.0.x'

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

- name: Generate solution
shell: pwsh
Expand Down
4 changes: 2 additions & 2 deletions common/Labs.Head.WinAppSdk.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion common/Labs.MultiTarget.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Condition="'$(TargetFramework)' == '$(UwpTargetFramework)'" Include="Microsoft.UI.Xaml" Version="2.7.0" />
<PackageReference Condition="'$(TargetFramework)' == '$(WinAppSdkTargetFramework)'" Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
<PackageReference Condition="'$(TargetFramework)' == '$(WinAppSdkTargetFramework)'" Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 9f2f637

Please sign in to comment.