From a4ce48b15172cfe725d52ac18ce84beba20ed2f8 Mon Sep 17 00:00:00 2001
From: Johan Laanstra <jlaanstra1221@outlook.com>
Date: Wed, 15 Nov 2023 19:09:47 -0800
Subject: [PATCH 1/2] Add the implementation dll to make sure design time
 builds pick up on the output.

---
 nuget/Microsoft.Windows.CsWinRT.targets | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nuget/Microsoft.Windows.CsWinRT.targets b/nuget/Microsoft.Windows.CsWinRT.targets
index 1e7f531f3..cea4777d6 100644
--- a/nuget/Microsoft.Windows.CsWinRT.targets
+++ b/nuget/Microsoft.Windows.CsWinRT.targets
@@ -56,9 +56,11 @@ Copyright (C) Microsoft Corporation. All rights reserved.
       <!--Prevent NETSDK1130 errors from winmd references-->
       <ReferencePath Remove="@(ReferencePath)" Condition="'%(ReferencePath.Extension)' == '.winmd'" />
       <ReferencePathWithRefAssemblies Remove="@(CsWinRTRemovedReferences)" 
-        Condition="'%(CsWinRTRemovedReferences.Filename)%(CsWinRTRemovedReferences.Extension)' == '%(ReferencePathWithRefAssemblies.Filename)%(ReferencePathWithRefAssemblies.Extension)'" />
-      <!--Do not publish projection source winmds -->
+        Condition="'%(CsWinRTRemovedReferences.Filename)%(CsWinRTRemovedReferences.Extension)' == '%(ReferencePathWithRefAssemblies.Filename)%(ReferencePathWithRefAssemblies.Extension)'" />    
+      <!--Do not publish projection source winmds, but do include implementation dlls -->
       <ReferenceCopyLocalPaths Remove="@(CsWinRTRemovedReferences)" />
+      <ReferenceCopyLocalPaths Include="@(CsWinRTRemovedReferences->'%(RootDir)%(Directory)%(DestinationSubDirectory)%(Implementation)')" 
+                               Condition="'%(CsWinRTRemovedReferences.Implementation)' != '' AND Exists('%(CsWinRTRemovedReferences.RootDir)%(CsWinRTRemovedReferences.Directory)%(CsWinRTRemovedReferences.DestinationSubDirectory)%(CsWinRTRemovedReferences.Implementation)')" />
       <!--Remove winmd references from deps.json to prevent CLR failing unit test execution-->
       <ReferenceDependencyPaths Remove="@(ReferenceDependencyPaths)" Condition="%(ReferenceDependencyPaths.Extension) == '.winmd'"/>
     </ItemGroup>

From d4e0b9a470cd291104104e2b1610d3275b83e98e Mon Sep 17 00:00:00 2001
From: Johan Laanstra <jlaanstra1221@outlook.com>
Date: Wed, 15 Nov 2023 19:12:32 -0800
Subject: [PATCH 2/2] Update Microsoft.Windows.CsWinRT.targets

---
 nuget/Microsoft.Windows.CsWinRT.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuget/Microsoft.Windows.CsWinRT.targets b/nuget/Microsoft.Windows.CsWinRT.targets
index cea4777d6..38bc5f549 100644
--- a/nuget/Microsoft.Windows.CsWinRT.targets
+++ b/nuget/Microsoft.Windows.CsWinRT.targets
@@ -56,7 +56,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
       <!--Prevent NETSDK1130 errors from winmd references-->
       <ReferencePath Remove="@(ReferencePath)" Condition="'%(ReferencePath.Extension)' == '.winmd'" />
       <ReferencePathWithRefAssemblies Remove="@(CsWinRTRemovedReferences)" 
-        Condition="'%(CsWinRTRemovedReferences.Filename)%(CsWinRTRemovedReferences.Extension)' == '%(ReferencePathWithRefAssemblies.Filename)%(ReferencePathWithRefAssemblies.Extension)'" />    
+        Condition="'%(CsWinRTRemovedReferences.Filename)%(CsWinRTRemovedReferences.Extension)' == '%(ReferencePathWithRefAssemblies.Filename)%(ReferencePathWithRefAssemblies.Extension)'" />
       <!--Do not publish projection source winmds, but do include implementation dlls -->
       <ReferenceCopyLocalPaths Remove="@(CsWinRTRemovedReferences)" />
       <ReferenceCopyLocalPaths Include="@(CsWinRTRemovedReferences->'%(RootDir)%(Directory)%(DestinationSubDirectory)%(Implementation)')"