Merge branch 'main' into components/notifications

CommunityToolkit · Oct 30, 2024 · 5a1c279 · 5a1c279
2 parents d782f50 + 49395d9
commit 5a1c279
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 4 deletions.
diff --git a/components/DataTable/src/CommunityToolkit.WinUI.Controls.DataTable.csproj b/components/DataTable/src/CommunityToolkit.WinUI.Controls.DataTable.csproj
@@ -6,6 +6,7 @@
 
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.WinUI.Controls.DataTableRns</RootNamespace>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <!-- Sets this up as a toolkit component's source project -->

diff --git a/components/MarkdownTextBlock/src/CommunityToolkit.WinUI.Controls.MarkdownTextBlock.csproj b/components/MarkdownTextBlock/src/CommunityToolkit.WinUI.Controls.MarkdownTextBlock.csproj
@@ -7,6 +7,7 @@
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.WinUI.Controls.MarkdownTextBlockRns</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <!-- Sets this up as a toolkit component's source project -->

diff --git a/components/Ribbon/src/CommunityToolkit.WinUI.Controls.Ribbon.csproj b/components/Ribbon/src/CommunityToolkit.WinUI.Controls.Ribbon.csproj
@@ -7,11 +7,12 @@
 
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.WinUI.Controls.RibbonRns</RootNamespace>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
-  <ItemGroup>
-    <UpToDateCheckInput Remove="RibbonStyle.xaml" />
+  <ItemGroup>
+    <UpToDateCheckInput Remove="RibbonStyle.xaml" />
   </ItemGroup>
 </Project>
diff --git a/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj b/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj
@@ -6,6 +6,7 @@
 
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.Labs.WinUI.RivePlayerRns</RootNamespace>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <!-- Sets this up as a toolkit component's source project -->

diff --git a/components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj b/components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj
@@ -6,6 +6,7 @@
 
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.Labs.WinUI.TokenViewRns</RootNamespace>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <!-- Sets this up as a toolkit component's source project -->

diff --git a/components/TransitionHelper/src/CommunityToolkit.Labs.WinUI.TransitionHelper.csproj b/components/TransitionHelper/src/CommunityToolkit.Labs.WinUI.TransitionHelper.csproj
@@ -10,6 +10,7 @@
     <!-- TODO: Putting here as seems to get flagged on different partials, need to deal with TokenSource being disposible -->
     <!-- See: https://github.com/CommunityToolkit/Labs-Windows/issues/407 -->
     <NoWarn>$(NoWarn);CA1001</NoWarn>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <!-- Sets this up as a toolkit component's source project -->

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.201",
+    "version": "8.0.403",
     "rollForward": "latestFeature"
   },
   "msbuild-sdks": 

diff --git a/tooling b/tooling
+4 −5		.github/workflows/build.yml
+22 −2		Build-Toolkit-Components.ps1
+13 −13		MultiTarget/AvailableTargetFrameworks.props
+11 −11		MultiTarget/EnabledTargetFrameworks.props
+2 −6		MultiTarget/PackageReferences/WinAppSdk.props
+8 −5		MultiTarget/UseTargetFrameworks.ps1
+0 −3		MultiTarget/WinUI.Extra.props
+1 −0		ProjectHeads/Head.WinAppSdk.props
+1 −1		global.json