From 6ac2a45d80eab871cb314d117310a0689821416a Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 5 Jul 2022 11:06:26 -0700
Subject: [PATCH] Update to WinAppSDK 1.2.221109.1
---
.github/workflows/build.yml | 28 ++++++++++++++--------------
common/Labs.Head.WinAppSdk.props | 4 ++--
common/Labs.MultiTarget.props | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a8ffd349..4d6e61083 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,13 +26,13 @@ jobs:
steps:
# Needed until XAML Styler updates to .NET 6
- name: Install .NET Core 3.1 SDK
- uses: actions/setup-dotnet@v1
+ uses: actions/setup-dotnet@v3
with:
dotnet-version: '3.1.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
@@ -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
@@ -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
@@ -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/setup-msbuild@v1.0.3
@@ -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
diff --git a/common/Labs.Head.WinAppSdk.props b/common/Labs.Head.WinAppSdk.props
index ddd2885d1..e6ec2707f 100644
--- a/common/Labs.Head.WinAppSdk.props
+++ b/common/Labs.Head.WinAppSdk.props
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/common/Labs.MultiTarget.props b/common/Labs.MultiTarget.props
index 841cd5b20..8133f088c 100644
--- a/common/Labs.MultiTarget.props
+++ b/common/Labs.MultiTarget.props
@@ -31,7 +31,7 @@
-
+