From 3a2e3b8277a08f843c663f828848854f953f95bb Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome@platform.uno>
Date: Tue, 24 Sep 2024 11:06:33 -0400
Subject: [PATCH] fix: Adjust for invalid embedded resource inclusion

(cherry picked from commit 38770ed4c2a1e06e835af97626c29c98cc6257c2)
---
 ...unityToolkit.WinUI.UI.Controls.DataGrid.csproj | 15 ++++++++++++---
 version.json                                      |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CommunityToolkit.WinUI.UI.Controls.DataGrid/CommunityToolkit.WinUI.UI.Controls.DataGrid.csproj b/CommunityToolkit.WinUI.UI.Controls.DataGrid/CommunityToolkit.WinUI.UI.Controls.DataGrid.csproj
index 13c2e14496..d445e629a2 100644
--- a/CommunityToolkit.WinUI.UI.Controls.DataGrid/CommunityToolkit.WinUI.UI.Controls.DataGrid.csproj
+++ b/CommunityToolkit.WinUI.UI.Controls.DataGrid/CommunityToolkit.WinUI.UI.Controls.DataGrid.csproj
@@ -20,7 +20,6 @@
       <CustomToolNamespace>$(RootNamespace)</CustomToolNamespace>
       <!-- The 'ManifestResourceName' metadata changes the default manifest naming scheme -->
       <ManifestResourceName>$(RootNamespace).%(Filename)</ManifestResourceName>
-      <LogicalName>$(RootNamespace).%(Filename).resources</LogicalName>
     </EmbeddedResource>
     <Compile Update="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -29,8 +28,18 @@
     </Compile>
   </ItemGroup>
 
-
-	<!-- BEGIN UNO SPECIFIC -->
+  <Target Name="AdjustResources" BeforeTargets="_UnoEmbeddedResourcesInjection">
+    <!--
+    Workaround for issue fixed in later uno where existing
+    embedded resources are overridden incorrectly
+    https://github.com/unoplatform/uno/pull/16522
+    -->
+    <ItemGroup>
+      <EmbeddedResource Remove="@(EmbeddedResource)" Condition="'%(EmbeddedResource.LogicalName)'==''" />
+    </ItemGroup>
+  </Target>
+
+  <!-- BEGIN UNO SPECIFIC -->
 	<PropertyGroup>
 		<TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
 		<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
diff --git a/version.json b/version.json
index 89f482edc3..e7e5de514a 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "7.1.202",
+  "version": "7.1.203",
   "publicReleaseRefSpec": [
     "^refs/heads/main$", // we release out of main
     "^refs/heads/dev$", // we release out of dev
@@ -15,4 +15,4 @@
       "enabled": false
     }
   }
-}
+}
\ No newline at end of file