From 64c43854cf48cd9bfd1d10044449ef7b060c6bf4 Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Wed, 22 Jan 2025 17:39:23 +0100
Subject: [PATCH] Updated RuntimeIdentifiers and PublishProfile

---
 MBTiles/WinUI/MBTiles.WinUI.csproj                     |  3 +--
 MapProjections/WinUI/MapProjections.WinUI.csproj       |  1 -
 MapUiTools/WinUI/MapUiTools.WinUI.csproj               |  1 -
 .../{win10-arm64.pubxml => win-arm64.pubxml}           | 10 ++--------
 .../{win10-x64.pubxml => win-x64.pubxml}               |  8 +-------
 .../{win10-x86.pubxml => win-x86.pubxml}               |  8 +-------
 SampleApps/WinUiApp/WinUiApp.csproj                    |  9 ++++-----
 7 files changed, 9 insertions(+), 31 deletions(-)
 rename SampleApps/WinUiApp/Properties/PublishProfiles/{win10-arm64.pubxml => win-arm64.pubxml} (55%)
 rename SampleApps/WinUiApp/Properties/PublishProfiles/{win10-x64.pubxml => win-x64.pubxml} (58%)
 rename SampleApps/WinUiApp/Properties/PublishProfiles/{win10-x86.pubxml => win-x86.pubxml} (58%)

diff --git a/MBTiles/WinUI/MBTiles.WinUI.csproj b/MBTiles/WinUI/MBTiles.WinUI.csproj
index 82d54678..9631cab3 100644
--- a/MBTiles/WinUI/MBTiles.WinUI.csproj
+++ b/MBTiles/WinUI/MBTiles.WinUI.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
-        <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-        <UseRidGraph>true</UseRidGraph>
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
         <UseWinUI>true</UseWinUI>
         <DefineConstants>WINUI</DefineConstants>
         <RootNamespace>MapControl.MBTiles</RootNamespace>
diff --git a/MapProjections/WinUI/MapProjections.WinUI.csproj b/MapProjections/WinUI/MapProjections.WinUI.csproj
index 40ede842..ea409e55 100644
--- a/MapProjections/WinUI/MapProjections.WinUI.csproj
+++ b/MapProjections/WinUI/MapProjections.WinUI.csproj
@@ -2,7 +2,6 @@
     <PropertyGroup>
         <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-        <UseRidGraph>true</UseRidGraph>
         <UseWinUI>true</UseWinUI>
         <DefineConstants>WINUI</DefineConstants>
         <RootNamespace>MapControl.Projections</RootNamespace>
diff --git a/MapUiTools/WinUI/MapUiTools.WinUI.csproj b/MapUiTools/WinUI/MapUiTools.WinUI.csproj
index d77a75da..ad2462ee 100644
--- a/MapUiTools/WinUI/MapUiTools.WinUI.csproj
+++ b/MapUiTools/WinUI/MapUiTools.WinUI.csproj
@@ -2,7 +2,6 @@
     <PropertyGroup>
         <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-        <UseRidGraph>true</UseRidGraph>
         <UseWinUI>true</UseWinUI>
         <DefineConstants>WINUI</DefineConstants>
         <RootNamespace>MapControl.UiTools</RootNamespace>
diff --git a/SampleApps/WinUiApp/Properties/PublishProfiles/win10-arm64.pubxml b/SampleApps/WinUiApp/Properties/PublishProfiles/win-arm64.pubxml
similarity index 55%
rename from SampleApps/WinUiApp/Properties/PublishProfiles/win10-arm64.pubxml
rename to SampleApps/WinUiApp/Properties/PublishProfiles/win-arm64.pubxml
index a132e44c..8953cce9 100644
--- a/SampleApps/WinUiApp/Properties/PublishProfiles/win10-arm64.pubxml
+++ b/SampleApps/WinUiApp/Properties/PublishProfiles/win-arm64.pubxml
@@ -5,16 +5,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <Platform>arm64</Platform>
-    <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
+    <Platform>ARM64</Platform>
+    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
     <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-   <!-- 
-    See https://github.com/microsoft/CsWinRT/issues/373
-    <PublishTrimmed>True</PublishTrimmed>
-    -->
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/SampleApps/WinUiApp/Properties/PublishProfiles/win10-x64.pubxml b/SampleApps/WinUiApp/Properties/PublishProfiles/win-x64.pubxml
similarity index 58%
rename from SampleApps/WinUiApp/Properties/PublishProfiles/win10-x64.pubxml
rename to SampleApps/WinUiApp/Properties/PublishProfiles/win-x64.pubxml
index 26ea7e55..cd995617 100644
--- a/SampleApps/WinUiApp/Properties/PublishProfiles/win10-x64.pubxml
+++ b/SampleApps/WinUiApp/Properties/PublishProfiles/win-x64.pubxml
@@ -6,15 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x64</Platform>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-   <!-- 
-    See https://github.com/microsoft/CsWinRT/issues/373
-    <PublishTrimmed>True</PublishTrimmed>
-    -->
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/SampleApps/WinUiApp/Properties/PublishProfiles/win10-x86.pubxml b/SampleApps/WinUiApp/Properties/PublishProfiles/win-x86.pubxml
similarity index 58%
rename from SampleApps/WinUiApp/Properties/PublishProfiles/win10-x86.pubxml
rename to SampleApps/WinUiApp/Properties/PublishProfiles/win-x86.pubxml
index 34d14d4d..a70c6942 100644
--- a/SampleApps/WinUiApp/Properties/PublishProfiles/win10-x86.pubxml
+++ b/SampleApps/WinUiApp/Properties/PublishProfiles/win-x86.pubxml
@@ -6,15 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x86</Platform>
-    <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-   <!-- 
-    See https://github.com/microsoft/CsWinRT/issues/373
-    <PublishTrimmed>True</PublishTrimmed>
-    -->
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/SampleApps/WinUiApp/WinUiApp.csproj b/SampleApps/WinUiApp/WinUiApp.csproj
index 9d8683a8..e3e27024 100644
--- a/SampleApps/WinUiApp/WinUiApp.csproj
+++ b/SampleApps/WinUiApp/WinUiApp.csproj
@@ -2,16 +2,15 @@
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
         <TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
-        <Platforms>x64</Platforms>
-        <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
-        <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-        <UseRidGraph>true</UseRidGraph>
+        <Platforms>x86;x64;ARM64</Platforms>
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+        <PublishProfile>win-$(Platform).pubxml</PublishProfile>
         <UseWinUI>true</UseWinUI>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <RootNamespace>SampleApplication</RootNamespace>
         <AssemblyTitle>XAML Map Control WinUI Sample Application</AssemblyTitle>
         <AnalysisLevel>none</AnalysisLevel>
-        <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+        <EnableMsixTooling>true</EnableMsixTooling>
         <DefineConstants>WINUI</DefineConstants>
     </PropertyGroup>