From c8b2844fecdc51b5233f652d534c3d0c007b773a Mon Sep 17 00:00:00 2001
From: adstep <stephensonadamj@gmail.com>
Date: Fri, 24 Oct 2025 19:03:49 -0700
Subject: [PATCH 1/3] publish cs projections w/ aot enabled

---
 source/NuGet.config                           |  2 ++
 source/uwp/winui3/AdaptiveCards.sln           | 32 +++++++++++++++++++
 .../ObjectModelCsProjection.csproj            |  2 ++
 .../RendererCsProjection.csproj               |  2 ++
 .../WinUI3ObjectModelTest/ObjectModelTests.cs |  1 -
 .../WinUI3ObjectModelTest.csproj              | 18 +++++++----
 6 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/source/NuGet.config b/source/NuGet.config
index 36ddf0fa2b..d385761f52 100644
--- a/source/NuGet.config
+++ b/source/NuGet.config
@@ -4,8 +4,10 @@
     <!-- remove any machine-wide sources with <clear/> -->
     <clear />
     <add key="AdaptiveCards-Dependencies" value="https://pkgs.dev.azure.com/shine-oss/AdaptiveCards/_packaging/AdaptiveCards-Dependencies/nuget/v3/index.json" />
+    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
+    <add key="AdaptiveCards-Dependencies" value="true" />
   </disabledPackageSources>
 </configuration>
diff --git a/source/uwp/winui3/AdaptiveCards.sln b/source/uwp/winui3/AdaptiveCards.sln
index de581d722d..95f1b224af 100644
--- a/source/uwp/winui3/AdaptiveCards.sln
+++ b/source/uwp/winui3/AdaptiveCards.sln
@@ -32,6 +32,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveCardVisualizer", "V
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedVisualizer", "..\SharedVisualizer\SharedVisualizer.shproj", "{85425680-C8BF-43F3-84C4-773D0ADE45EF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App1", "App1\App1.csproj", "{7F04B104-47A0-4D38-8F87-332E8063BEB0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -236,6 +238,36 @@ Global
 		{A0353998-CF26-43C8-85C3-9CC8011A3D91}.Release|x86.ActiveCfg = Release|x86
 		{A0353998-CF26-43C8-85C3-9CC8011A3D91}.Release|x86.Build.0 = Release|x86
 		{A0353998-CF26-43C8-85C3-9CC8011A3D91}.Release|x86.Deploy.0 = Release|x86
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|Any CPU.Build.0 = Debug|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|Any CPU.Deploy.0 = Debug|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|ARM.ActiveCfg = Debug|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|ARM.Build.0 = Debug|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|ARM.Deploy.0 = Debug|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|arm64.ActiveCfg = Debug|ARM64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|arm64.Build.0 = Debug|ARM64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|arm64.Deploy.0 = Debug|ARM64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x64.ActiveCfg = Debug|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x64.Build.0 = Debug|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x64.Deploy.0 = Debug|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x86.ActiveCfg = Debug|x86
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x86.Build.0 = Debug|x86
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x86.Deploy.0 = Debug|x86
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|Any CPU.ActiveCfg = Release|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|Any CPU.Build.0 = Release|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|Any CPU.Deploy.0 = Release|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|ARM.ActiveCfg = Release|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|ARM.Build.0 = Release|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|ARM.Deploy.0 = Release|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|arm64.ActiveCfg = Release|ARM64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|arm64.Build.0 = Release|ARM64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|arm64.Deploy.0 = Release|ARM64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x64.ActiveCfg = Release|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x64.Build.0 = Release|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x64.Deploy.0 = Release|x64
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x86.ActiveCfg = Release|x86
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x86.Build.0 = Release|x86
+		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj b/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj
index 89e49d7754..4e5df01b83 100644
--- a/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj
+++ b/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj
@@ -14,6 +14,8 @@
     <CsWinRTIncludes>AdaptiveCards.ObjectModel.WinUI3</CsWinRTIncludes>
     <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
     <BaseOutputPath>$(SolutionDir)\$(Platform)\$(MSBuildProjectName)</BaseOutputPath>
+    <CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
+    <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
   </PropertyGroup>
   <ItemGroup>
       <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
diff --git a/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj b/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj
index 642987293d..52080a3527 100644
--- a/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj
+++ b/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj
@@ -14,6 +14,8 @@
     <CsWinRTIncludes>AdaptiveCards.Rendering.WinUI3</CsWinRTIncludes>
     <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
     <BaseOutputPath>$(SolutionDir)\$(Platform)\$(MSBuildProjectName)</BaseOutputPath>
+    <CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
+    <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
   </PropertyGroup>
   <ItemGroup>
       <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
diff --git a/source/uwp/winui3/WinUI3ObjectModelTest/ObjectModelTests.cs b/source/uwp/winui3/WinUI3ObjectModelTest/ObjectModelTests.cs
index ae35575a3e..eede950b97 100644
--- a/source/uwp/winui3/WinUI3ObjectModelTest/ObjectModelTests.cs
+++ b/source/uwp/winui3/WinUI3ObjectModelTest/ObjectModelTests.cs
@@ -4,7 +4,6 @@
 using AdaptiveCards.ObjectModel.WinUI3;
 using Windows.Data.Json;
 
-
 namespace WinUI3ObjectModelTest
 {
     [TestClass]
diff --git a/source/uwp/winui3/WinUI3ObjectModelTest/WinUI3ObjectModelTest.csproj b/source/uwp/winui3/WinUI3ObjectModelTest/WinUI3ObjectModelTest.csproj
index 1e33347b92..117204e115 100644
--- a/source/uwp/winui3/WinUI3ObjectModelTest/WinUI3ObjectModelTest.csproj
+++ b/source/uwp/winui3/WinUI3ObjectModelTest/WinUI3ObjectModelTest.csproj
@@ -1,16 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <WindowsSdkPackageVersion>10.0.17763.38</WindowsSdkPackageVersion>
     <RootNamespace>WinUI3ObjectModelTest</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
+    
+    <!-- AOT Compatibility Analysis -->
+    <IsAotCompatible>true</IsAotCompatible>
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    
+    <!-- Enable AOT warnings to show at build time -->
+    <WarningsAsErrors>$(WarningsAsErrors);IL2026;IL3050;IL2087;IL2091</WarningsAsErrors>
   </PropertyGroup>
   
   <ItemGroup>
@@ -28,9 +34,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251003001" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
     <PackageReference Include="MSTest.TestAdapter">
         <Version>3.0.2</Version>
     </PackageReference>

From cda1dd5e07dcf18c790c974392a1b54f9a108ec7 Mon Sep 17 00:00:00 2001
From: adstep <stephensonadamj@gmail.com>
Date: Fri, 24 Oct 2025 19:11:08 -0700
Subject: [PATCH 2/3] publish .net 8 and .net 6

---
 source/uwp/winui3/AdaptiveCards.sln           | 32 -------------------
 .../AdaptiveCards.ObjectModel.WinUI3.nuspec   |  4 +++
 .../AdaptiveCards.Rendering.WinUI3.nuspec     |  4 +++
 .../ObjectModelCsProjection.csproj            |  8 +++--
 .../RendererCsProjection.csproj               |  8 +++--
 .../WinUI3ObjectModelTest.csproj              |  3 ++
 6 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/source/uwp/winui3/AdaptiveCards.sln b/source/uwp/winui3/AdaptiveCards.sln
index 95f1b224af..de581d722d 100644
--- a/source/uwp/winui3/AdaptiveCards.sln
+++ b/source/uwp/winui3/AdaptiveCards.sln
@@ -32,8 +32,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdaptiveCardVisualizer", "V
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedVisualizer", "..\SharedVisualizer\SharedVisualizer.shproj", "{85425680-C8BF-43F3-84C4-773D0ADE45EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App1", "App1\App1.csproj", "{7F04B104-47A0-4D38-8F87-332E8063BEB0}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -238,36 +236,6 @@ Global
 		{A0353998-CF26-43C8-85C3-9CC8011A3D91}.Release|x86.ActiveCfg = Release|x86
 		{A0353998-CF26-43C8-85C3-9CC8011A3D91}.Release|x86.Build.0 = Release|x86
 		{A0353998-CF26-43C8-85C3-9CC8011A3D91}.Release|x86.Deploy.0 = Release|x86
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|Any CPU.Build.0 = Debug|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|ARM.ActiveCfg = Debug|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|ARM.Build.0 = Debug|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|ARM.Deploy.0 = Debug|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|arm64.ActiveCfg = Debug|ARM64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|arm64.Build.0 = Debug|ARM64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|arm64.Deploy.0 = Debug|ARM64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x64.ActiveCfg = Debug|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x64.Build.0 = Debug|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x64.Deploy.0 = Debug|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x86.ActiveCfg = Debug|x86
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x86.Build.0 = Debug|x86
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Debug|x86.Deploy.0 = Debug|x86
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|Any CPU.ActiveCfg = Release|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|Any CPU.Build.0 = Release|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|Any CPU.Deploy.0 = Release|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|ARM.ActiveCfg = Release|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|ARM.Build.0 = Release|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|ARM.Deploy.0 = Release|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|arm64.ActiveCfg = Release|ARM64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|arm64.Build.0 = Release|ARM64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|arm64.Deploy.0 = Release|ARM64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x64.ActiveCfg = Release|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x64.Build.0 = Release|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x64.Deploy.0 = Release|x64
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x86.ActiveCfg = Release|x86
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x86.Build.0 = Release|x86
-		{7F04B104-47A0-4D38-8F87-332E8063BEB0}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
index 24a18fd50f..af99dc5973 100644
--- a/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
@@ -28,8 +28,12 @@
         <file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.lib" target="runtimes\win10-arm64\native"/>
         <file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.pdb" target="runtimes\win10-arm64\native"/>
 
+        <!-- .NET 6.0 projection -->
         <file src="..\AnyCPU\ObjectModelCsProjection\$Configuration$\net6.0-windows10.0.17763.0\ObjectModelCsProjection.dll" target="lib\net6.0-windows10.0.17763.0\ObjectModelCsProjection.dll"/>
 
+        <!-- .NET 8.0 projection -->
+        <file src="..\AnyCPU\ObjectModelCsProjection\$Configuration$\net8.0-windows10.0.17763.0\ObjectModelCsProjection.dll" target="lib\net8.0-windows10.0.17763.0\ObjectModelCsProjection.dll"/>
+
         <file src="EULA-Windows.txt" target="\"/>
         <file src="AdaptiveCards.ObjectModel.WinUI3.native.targets" target="build\native\AdaptiveCards.ObjectModel.WinUI3.targets"/>
     </files>
diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec b/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec
index e59bdfa89b..b040bc2bd9 100644
--- a/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec
@@ -31,8 +31,12 @@
         <file src="..\ARM64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.lib" target="runtimes\win10-arm64\native"/>
         <file src="..\ARM64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.pdb" target="runtimes\win10-arm64\native"/>
 
+        <!-- .NET 6.0 projection -->
         <file src="..\AnyCPU\RendererCsProjection\$Configuration$\net6.0-windows10.0.17763.0\RendererCsProjection.dll" target="lib\net6.0-windows10.0.17763.0\RendererCsProjection.dll" />
 
+        <!-- .NET 8.0 projection -->
+        <file src="..\AnyCPU\RendererCsProjection\$Configuration$\net8.0-windows10.0.17763.0\RendererCsProjection.dll" target="lib\net8.0-windows10.0.17763.0\RendererCsProjection.dll" />
+
         <file src="EULA-Windows.txt" target="\"/>
         <file src="AdaptiveCards.Rendering.WinUI3.native.targets" target="build\native\AdaptiveCards.Rendering.WinUI3.targets"/>
     </files>
diff --git a/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj b/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj
index 4e5df01b83..306ff308a7 100644
--- a/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj
+++ b/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
+    <TargetFrameworks>net6.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</TargetFrameworks>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <WindowsSdkPackageVersion>10.0.17763.38</WindowsSdkPackageVersion>
     <!-- Set Platform to AnyCPU to allow consumption of the projection assembly from any architecture. -->
     <Platform>AnyCPU</Platform>
     <RootNamespace>AdaptiveCards.ObjectModel.WinUI3</RootNamespace>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    
+    <!-- Suppress warning about win10-* RIDs in dependencies for .NET 8.0+ -->
+    <NoWarn>$(NoWarn);NETSDK1206</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <CsWinRTIncludes>AdaptiveCards.ObjectModel.WinUI3</CsWinRTIncludes>
diff --git a/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj b/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj
index 52080a3527..16fffebc27 100644
--- a/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj
+++ b/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
+    <TargetFrameworks>net6.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</TargetFrameworks>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <WindowsSdkPackageVersion>10.0.17763.38</WindowsSdkPackageVersion>
     <!-- Set Platform to AnyCPU to allow consumption of the projection assembly from any architecture. -->
     <Platform>AnyCPU</Platform>
     <RootNamespace>AdaptiveCards.Rendering.WinUI3</RootNamespace>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    
+    <!-- Suppress warning about win10-* RIDs in dependencies for .NET 8.0+ -->
+    <NoWarn>$(NoWarn);NETSDK1206</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <CsWinRTIncludes>AdaptiveCards.Rendering.WinUI3</CsWinRTIncludes>
diff --git a/source/uwp/winui3/WinUI3ObjectModelTest/WinUI3ObjectModelTest.csproj b/source/uwp/winui3/WinUI3ObjectModelTest/WinUI3ObjectModelTest.csproj
index 117204e115..b604fd7549 100644
--- a/source/uwp/winui3/WinUI3ObjectModelTest/WinUI3ObjectModelTest.csproj
+++ b/source/uwp/winui3/WinUI3ObjectModelTest/WinUI3ObjectModelTest.csproj
@@ -11,6 +11,9 @@
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
     
+    <!-- Suppress warning about win10-* RIDs in dependencies for .NET 8.0+ -->
+    <NoWarn>$(NoWarn);NETSDK1206</NoWarn>
+    
     <!-- AOT Compatibility Analysis -->
     <IsAotCompatible>true</IsAotCompatible>
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>

From 83a84924fb1ca9b07cb59300bff442e7acb2283d Mon Sep 17 00:00:00 2001
From: adstep <stephensonadamj@gmail.com>
Date: Tue, 18 Nov 2025 22:08:25 -0800
Subject: [PATCH 3/3] remove nuget reference

---
 source/NuGet.config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/NuGet.config b/source/NuGet.config
index d385761f52..e1ab2051f5 100644
--- a/source/NuGet.config
+++ b/source/NuGet.config
@@ -4,7 +4,6 @@
     <!-- remove any machine-wide sources with <clear/> -->
     <clear />
     <add key="AdaptiveCards-Dependencies" value="https://pkgs.dev.azure.com/shine-oss/AdaptiveCards/_packaging/AdaptiveCards-Dependencies/nuget/v3/index.json" />
-    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />