From b28c6ada481b5cba6bf151e53366b37e5e5d2b49 Mon Sep 17 00:00:00 2001
From: Dongle <29563098+dongle-the-gadget@users.noreply.github.com>
Date: Tue, 11 Feb 2025 21:34:34 +0700
Subject: [PATCH 1/3] Change win10 RIDs to win RIDs, for .NET 8.

---
 ...tiveCards.ObjectModel.WinUI3.managed.props |  7 ++++++
 ...veCards.ObjectModel.WinUI3.managed.targets |  6 +++++
 .../AdaptiveCards.ObjectModel.WinUI3.nuspec   | 20 ++++++++--------
 ...aptiveCards.Rendering.WinUI3.managed.props |  7 ++++++
 ...tiveCards.Rendering.WinUI3.managed.targets |  6 +++++
 .../AdaptiveCards.Rendering.WinUI3.nuspec     | 23 +++++++++++--------
 .../ObjectModelCsProjection.csproj            |  1 -
 .../RendererCsProjection.csproj               |  1 -
 8 files changed, 49 insertions(+), 22 deletions(-)
 create mode 100644 source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.managed.props
 create mode 100644 source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.managed.targets
 create mode 100644 source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.managed.props
 create mode 100644 source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.managed.targets

diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.managed.props b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.managed.props
new file mode 100644
index 0000000000..10da99ed5c
--- /dev/null
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.managed.props
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <AdaptiveCardsObjectModelWinUI3WinMD>$(MSBuildThisFileDirectory)..\..\lib\uap10.0\AdaptiveCards.ObjectModel.WinUI3.winmd</AdaptiveCardsObjectModelWinUI3WinMD>
+        <AdaptiveCardsObjectModelWinUI3DllName>AdaptiveCards.ObjectModel.WinUI3.dll</AdaptiveCardsObjectModelWinUI3DllName>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.managed.targets b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.managed.targets
new file mode 100644
index 0000000000..54a5c209d0
--- /dev/null
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.managed.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+        <WindowsMetadataReference Include="$(AdaptiveCardsObjectModelWinUI3WinMD)" Implementation="$(AdaptiveCardsObjectModelWinUI3DllName)" />
+    </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
index 24a18fd50f..400c258459 100644
--- a/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>AdaptiveCards.ObjectModel.WinUI3</id>
-        <version>0.4.0</version>
+        <version>3.0.0</version>
         <authors>Microsoft</authors>
         <summary>Adaptive Cards Object Model library for WinUI3</summary>
         <description>Used to work with the object model for Adaptive Cards</description>
@@ -16,17 +16,17 @@
     <files>
         <file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.winmd" target="lib\uap10.0"/>
 
-        <file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.dll" target="runtimes\win10-x86\native"/>
-        <file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.lib" target="runtimes\win10-x86\native"/>
-        <file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.pdb" target="runtimes\win10-x86\native"/>
+        <file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.dll" target="runtimes\win-x86\native"/>
+        <file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.lib" target="runtimes\win-x86\native"/>
+        <file src="..\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.pdb" target="runtimes\win-x86\native"/>
 
-        <file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.dll" target="runtimes\win10-x64\native"/>
-        <file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.lib" target="runtimes\win10-x64\native"/>
-        <file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.pdb" target="runtimes\win10-x64\native"/>
+        <file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.dll" target="runtimes\win-x64\native"/>
+        <file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.lib" target="runtimes\win-x64\native"/>
+        <file src="..\x64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.pdb" target="runtimes\win-x64\native"/>
 
-        <file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.dll" target="runtimes\win10-arm64\native"/>
-        <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"/>
+        <file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.dll" target="runtimes\win-arm64\native"/>
+        <file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.lib" target="runtimes\win-arm64\native"/>
+        <file src="..\ARM64\$Configuration$\AdaptiveCardsObjectModel\AdaptiveCards.ObjectModel.WinUI3.pdb" target="runtimes\win-arm64\native"/>
 
         <file src="..\AnyCPU\ObjectModelCsProjection\$Configuration$\net6.0-windows10.0.17763.0\ObjectModelCsProjection.dll" target="lib\net6.0-windows10.0.17763.0\ObjectModelCsProjection.dll"/>
 
diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.managed.props b/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.managed.props
new file mode 100644
index 0000000000..34308de3c7
--- /dev/null
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.managed.props
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <AdaptiveCardsRenderingWinUI3WinMD>$(MSBuildThisFileDirectory)..\..\lib\uap10.0\AdaptiveCards.Rendering.WinUI3.winmd</AdaptiveCardsRenderingWinUI3WinMD>
+        <AdaptiveCardsRenderingWinUI3DllName>AdaptiveCards.Rendering.WinUI3.dll</AdaptiveCardsRenderingWinUI3DllName>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.managed.targets b/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.managed.targets
new file mode 100644
index 0000000000..702ffb7537
--- /dev/null
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.managed.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+        <WindowsMetadataReference Include="$(AdaptiveCardsRenderingWinUI3WinMD)" Implementation="$(AdaptiveCardsRenderingWinUI3DllName)" />
+    </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec b/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec
index e59bdfa89b..806aa0ead0 100644
--- a/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>AdaptiveCards.Rendering.WinUI3</id>
-        <version>1.0.2</version>
+        <version>3.0.0</version>
         <authors>Microsoft</authors>
         <summary>Adaptive Cards library for WinUI3</summary>
         <description>Used to render Adaptive Cards into WinUI3 XAML</description>
@@ -19,21 +19,24 @@
     <files>
         <file src="..\x64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.winmd" target="lib\uap10.0"/>
 
-        <file src="..\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.dll" target="runtimes\win10-x86\native"/>
-        <file src="..\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.lib" target="runtimes\win10-x86\native"/>
-        <file src="..\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.pdb" target="runtimes\win10-x86\native"/>
+        <file src="..\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.dll" target="runtimes\win-x86\native"/>
+        <file src="..\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.lib" target="runtimes\win-x86\native"/>
+        <file src="..\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.pdb" target="runtimes\win-x86\native"/>
 
-        <file src="..\x64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.dll" target="runtimes\win10-x64\native"/>
-        <file src="..\x64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.lib" target="runtimes\win10-x64\native"/>
-        <file src="..\x64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.pdb" target="runtimes\win10-x64\native"/>
+        <file src="..\x64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.dll" target="runtimes\win-x64\native"/>
+        <file src="..\x64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.lib" target="runtimes\win-x64\native"/>
+        <file src="..\x64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.pdb" target="runtimes\win-x64\native"/>
 
-        <file src="..\ARM64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.dll" target="runtimes\win10-arm64\native"/>
-        <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"/>
+        <file src="..\ARM64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.dll" target="runtimes\win-arm64\native"/>
+        <file src="..\ARM64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.lib" target="runtimes\win-arm64\native"/>
+        <file src="..\ARM64\$Configuration$\AdaptiveCardRenderer\AdaptiveCards.Rendering.WinUI3.pdb" target="runtimes\win-arm64\native"/>
 
         <file src="..\AnyCPU\RendererCsProjection\$Configuration$\net6.0-windows10.0.17763.0\RendererCsProjection.dll" target="lib\net6.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"/>
+        
+        <file src="AdaptiveCards.Rendering.WinUI3.managed.targets" target="build\net6.0-windows10.0.17763.0\AdaptiveCards.Rendering.WinUI3.targets"/>
+        <file src="AdaptiveCards.Rendering.WinUI3.managed.props" target="build\net6.0-windows10.0.17763.0\AdaptiveCards.Rendering.WinUI3.props"/>
     </files>
 </package>
diff --git a/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj b/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj
index 89e49d7754..8650d6e75a 100644
--- a/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj
+++ b/source/uwp/winui3/ObjectModelCsProjection/ObjectModelCsProjection.csproj
@@ -6,7 +6,6 @@
     <!-- 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>
     <UseWinUI>true</UseWinUI>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>
diff --git a/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj b/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj
index 642987293d..2cbbe268cb 100644
--- a/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj
+++ b/source/uwp/winui3/RendererCsProjection/RendererCsProjection.csproj
@@ -6,7 +6,6 @@
     <!-- 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>
     <UseWinUI>true</UseWinUI>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
   </PropertyGroup>

From 2d28bdbc8f2413f91719597ac0a3061f8d58ce7e Mon Sep 17 00:00:00 2001
From: Dongle <29563098+dongle-the-gadget@users.noreply.github.com>
Date: Tue, 11 Feb 2025 21:38:51 +0700
Subject: [PATCH 2/3] Restore old version (mistake)

---
 source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec | 2 +-
 source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
index 400c258459..3bbeb84a86 100644
--- a/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>AdaptiveCards.ObjectModel.WinUI3</id>
-        <version>3.0.0</version>
+        <version>1.0.2</version>
         <authors>Microsoft</authors>
         <summary>Adaptive Cards Object Model library for WinUI3</summary>
         <description>Used to work with the object model for Adaptive Cards</description>
diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec b/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec
index 806aa0ead0..a39e9e8667 100644
--- a/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.Rendering.WinUI3.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>AdaptiveCards.Rendering.WinUI3</id>
-        <version>3.0.0</version>
+        <version>1.0.2</version>
         <authors>Microsoft</authors>
         <summary>Adaptive Cards library for WinUI3</summary>
         <description>Used to render Adaptive Cards into WinUI3 XAML</description>

From 86bcc648b0ee5b414d47d184cc92bcd3975f90b1 Mon Sep 17 00:00:00 2001
From: Dongle <29563098+dongle-the-gadget@users.noreply.github.com>
Date: Sat, 15 Feb 2025 13:51:18 +0700
Subject: [PATCH 3/3] Revert objmodel version

---
 .../uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
index 3bbeb84a86..0c39a4e7b1 100644
--- a/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
+++ b/source/uwp/winui3/NuGet/AdaptiveCards.ObjectModel.WinUI3.nuspec
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>AdaptiveCards.ObjectModel.WinUI3</id>
-        <version>1.0.2</version>
+        <version>0.4.0</version>
         <authors>Microsoft</authors>
         <summary>Adaptive Cards Object Model library for WinUI3</summary>
         <description>Used to work with the object model for Adaptive Cards</description>