diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b135fae1c..081792c0e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,13 +3,13 @@ "isRoot": true, "tools": { "uno.check": { - "version": "1.3.1", + "version": "1.5.4", "commands": [ "uno-check" ] }, "xamlstyler.console": { - "version": "3.2008.4", + "version": "3.2206.4", "commands": [ "xstyler" ] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a8ffd349..cbfc4c374 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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 @@ - +