Skip to content

Commit

Permalink
Merge branch 'main' into codespace/fix-container-build
Browse files Browse the repository at this point in the history
  • Loading branch information
Arlodotexe authored Aug 21, 2024
2 parents 94ac55f + b99aa1f commit 8261c1b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ jobs:
uses: actions/upload-artifact@v4
if: ${{ env.IS_RELEASE == 'true' }}
with:
name: signed-nuget-packages-${{ matrix.platform }}
name: signed-nuget-packages-${{ matrix.winui }}
if-no-files-found: error
path: |
${{ github.workspace }}/packages/**/*.nupkg
Expand All @@ -375,18 +375,18 @@ jobs:
strategy:
fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them both to run to completion.
matrix:
platform: [WinUI2, WinUI3]
winui: [2, 3]

steps:
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Download signed packages for ${{ matrix.platform }}
- name: Download signed packages for WinUI ${{ matrix.winui }}
uses: actions/download-artifact@v4
with:
name: signed-nuget-packages-${{ matrix.platform }}
name: signed-nuget-packages-${{ matrix.winui }}
path: ./packages

- name: Push to NuGet.org
Expand Down
12 changes: 8 additions & 4 deletions ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ _Building something cool? Want to engage with other developers? Want to contribu

### [Try out our Sample Gallery from the Microsoft Store](https://aka.ms/windowstoolkitapp)

Want to see the toolkit in action before jumping into the code? Download and play with the [Windows Community Toolkit Gallery](https://www.microsoft.com/store/apps/9nblggh4tlcq) from the Store.
Want to see the toolkit in action before jumping into the code? Download and play with the [Windows Community Toolkit Gallery](https://aka.ms/windowstoolkitapp) from the Store.

Please read the [Getting Started with the Windows Community Toolkit](https://docs.microsoft.com/dotnet/communitytoolkit/windows/getting-started) page for more detailed information about using the toolkit.

If you're updating from a pre-8.x version of the Windows Community Toolkit, see [our migration notes here](https://aka.ms/toolkit/windows/migration).

### Windows Community Toolkit Labs

Have an idea for a new feature? Want to checkout the latest things being built. _[Then head over to Windows Community Toolkit Labs](https://aka.ms/toolkit/labs/windows)_.
Expand All @@ -34,9 +36,11 @@ git clone --recurse-submodules https://github.com/CommunityToolkit/Windows.git
## Build Requirements

- Visual Studio 2022 (UWP & Desktop Workloads for .NET)
- .NET 6 SDK
- Windows App SDK
- Windows SDK 19041
- .NET 8 SDK
- Windows 10 SDK, version 2004 (10.0.19041.0)
- Windows 10 21H1 (Build 19043) or greater
- Run `dotnet tool restore` from the project root to install SlnGen
- Run build scripts from the [Developer Command Prompt for Visual Studio](https://learn.microsoft.com/visualstudio/ide/reference/command-prompt-powershell) or from elsewhere after adding `MSBuild.exe` to your PATH

## 🚀 Contribution

Expand Down

0 comments on commit 8261c1b

Please sign in to comment.