From c5d4a5b58ed625ec88418491c9a6e1281b9ac421 Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Thu, 30 Sep 2021 08:16:32 +0530
Subject: [PATCH] Simplify Toolbox Icon naming

Since, we only use the same Root Namespace for all controls, we don't need to specify them.
---
 ....Uwp.UI.Controls.Menu.icon.png => Menu.icon.png} | Bin
 ...ls.RotatorTile.icon.png => RotatorTile.icon.png} | Bin
 build/Windows.Toolkit.VisualStudio.Design.props     |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/{Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png => Menu.icon.png} (100%)
 rename Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/{Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png => RotatorTile.icon.png} (100%)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Menu.icon.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Menu.icon.png
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/RotatorTile.icon.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png
rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/RotatorTile.icon.png
diff --git a/build/Windows.Toolkit.VisualStudio.Design.props b/build/Windows.Toolkit.VisualStudio.Design.props
index 6a46316ee1d..06432dfc837 100644
--- a/build/Windows.Toolkit.VisualStudio.Design.props
+++ b/build/Windows.Toolkit.VisualStudio.Design.props
@@ -17,7 +17,7 @@
   <ItemGroup>
     <AppDesigner Include="Properties\"/>
       <!-- The 'LogicalName' metadata changes the default manifest naming scheme -->
-    <EmbeddedResource Include="Icons\$(ParentProjectName).*.icon.png" LogicalName="$(ParentProjectRootNamespace).%(Filename)%(Extension)"/>
+    <EmbeddedResource Include="Icons\*.icon.png" LogicalName="$(ParentProjectRootNamespace).%(Filename)%(Extension)"/>
     <EmbeddedResource Include="$(ParentProjectOutputPath)$(ParentProjectName).xml" LinkBase="Properties\" LogicalName="%(Filename)%(Extension)"/>
   </ItemGroup>