Skip to content

Commit 85b0d4b

Browse files
authored
Merge branch 'main' into net9.0
2 parents 4f12e80 + eccfbc8 commit 85b0d4b

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ on:
1717

1818
env:
1919
DOTNET_VERSION: ${{ '9.0.x' }}
20+
DOTNET_INSTALL_DIR: dotnet-install
21+
DOTNET_ROOT: dotnet-install
2022
ENABLE_DIAGNOSTICS: false
2123
#COREHOST_TRACE: 1
2224
COREHOST_TRACEFILE: corehosttrace.log

.github/workflows/config/Directory.Build.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
<Copyright>(c) .NET Foundation and Contributors. All rights reserved.</Copyright>
1818
<PackageProjectUrl>https://github.com/CommunityToolkit/Tooling-Windows-Submodule</PackageProjectUrl>
1919
<PackageReleaseNotes>https://github.com/CommunityToolkit/Tooling-Windows-Submodule/releases</PackageReleaseNotes>
20-
<!-- TODO: Remove when closing https://github.com/CommunityToolkit/Labs-Windows/issues/256 -->
21-
<NoWarn>$(NoWarn);NU1505;NU1504</NoWarn>
20+
21+
<!-- See https://github.com/CommunityToolkit/Labs-Windows/pull/605#issuecomment-2498743676 -->
22+
<WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
2223
</PropertyGroup>
2324

2425
<PropertyGroup>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
3+
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
4+
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.Windows.CsWinRt" Version="2.1.6" PrivateAssets="all" />
45
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.Web.WebView2" Version="1.0.2903.40" PrivateAssets="all" />
56
</ItemGroup>
67
</Project>

ProjectHeads/App.Head.WinAppSdk.Dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Nuget package dependencies for all deployable UWP project heads -->
1+
<!-- Nuget package dependencies for all deployable WASDK project heads -->
22
<!-- Due to the quirks of non-sdk style projects, we cannot create a unified Dependencies.props for deployable head. -->
33
<Project>
44
<ItemGroup>

0 commit comments

Comments
 (0)