From ed5582522d46142e255b9d4eacf8306fb88b7f3c Mon Sep 17 00:00:00 2001
From: Kyaw Thant <kythant@microsoft.com>
Date: Fri, 19 Jul 2024 14:26:14 -0700
Subject: [PATCH 1/4] Enable CentralPackageManagement on Certain Projects

---
 Directory.Packages.props                      | 27 -------------------
 .../unittests/MrtCoreManagedTest.csproj       | 13 ++-------
 ...osoft.FrameworkUdk.PackageReference.csproj |  7 +----
 3 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index da74b62603..e69de29bb2 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,27 +0,0 @@
-<!--
-    This is the project file used by CentralPackageVersions, and used to control all PackageReference's
-    and make sure the version is only declared in a single place
-
-    In order to the CentralPackageVersions, add this to your SDK-Style .csproj file:
-    <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.1" />
-
-    For more info: https://github.com/microsoft/MSBuildSdks/tree/master/src/CentralPackageVersions
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
-    <PackageVersion Include="Microsoft.SourceLink.Common" Version="$(MicrosoftSourceLinkCommonVersion)" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" />
-    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.3.32804.24" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageVersion Include="NuGet.VisualStudio" Version="17.6.1" />
-    <PackageVersion Include="Microsoft.VisualStudio.TemplateWizardInterface" Version="17.5.33428.366" />
-    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
-    <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.4.2118" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="$(WindowsAppSDKVersion)" Condition=" '$(WindowsAppSDKVersion)' != '' " />
-    <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" Condition=" '$(CppWinRTVersion)' != '' " />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="$(WindowsSDKBuildToolsVersion)" Condition=" '$(WindowsSDKBuildToolsVersion)' != '' " />
-    <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="$(WILVersion)" Condition=" '$(WILVersion)' != '' " />
-  </ItemGroup>
-</Project>
diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/unittests/MrtCoreManagedTest.csproj b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/unittests/MrtCoreManagedTest.csproj
index a534854c19..ebca713954 100644
--- a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/unittests/MrtCoreManagedTest.csproj
+++ b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/unittests/MrtCoreManagedTest.csproj
@@ -21,11 +21,6 @@
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- Getting errors. Disable for now -->
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineConstants>NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
@@ -152,12 +147,8 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.10</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.2</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageReference Include="Newtonsoft.Json"/ >
   </ItemGroup>
     <!-- For some reason, TAEF binplaces the wrong version of Wex.Logger.Interop.dll - we need to fix that.
        Removing the version from the binaries directory to allow us to use the version from the lib directory is sufficient here.-->
diff --git a/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj b/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj
index 5de5f6f9c8..8401154f5b 100644
--- a/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj
+++ b/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj
@@ -10,12 +10,7 @@
     <AssemblyTitle>Microsoft.FrameworkUdk.PackageReference</AssemblyTitle>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- Getting obj reference error. Disable for now (incompatible with PackageDownload??) -->
-    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageDownload Include="Microsoft.FrameworkUdk" version="[$(MicrosoftFrameworkUdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.FrameworkUdk" />
   </ItemGroup>
 </Project>

From ba6fe5941d7a253f5136eb38df2b89df57ff70ec Mon Sep 17 00:00:00 2001
From: Kyaw Thant <kythant@microsoft.com>
Date: Fri, 19 Jul 2024 14:29:38 -0700
Subject: [PATCH 2/4] bring this back

---
 Directory.Packages.props | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e69de29bb2..007663ee1c 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -0,0 +1,29 @@
+<!--
+    This is the project file used by CentralPackageVersions, and used to control all PackageReference's
+    and make sure the version is only declared in a single place
+
+    In order to the CentralPackageVersions, add this to your SDK-Style .csproj file:
+    <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.1" />
+
+    For more info: https://github.com/microsoft/MSBuildSdks/tree/master/src/CentralPackageVersions
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
+    <PackageVersion Include="Microsoft.SourceLink.Common" Version="$(MicrosoftSourceLinkCommonVersion)" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" />
+    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.3.32804.24" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageVersion Include="NuGet.VisualStudio" Version="17.6.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.TemplateWizardInterface" Version="17.5.33428.366" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
+    <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.4.2118" />
+    <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.10" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="$(WindowsAppSDKVersion)" Condition=" '$(WindowsAppSDKVersion)' != '' " />
+    <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" Condition=" '$(CppWinRTVersion)' != '' " />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="$(WindowsSDKBuildToolsVersion)" Condition=" '$(WindowsSDKBuildToolsVersion)' != '' " />
+    <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="$(WILVersion)" Condition=" '$(WILVersion)' != '' " />
+    <PackageVersion Include="Microsoft.FrameworkUdk" version="[$(MicrosoftFrameworkUdkPackageVersion)]" Condition=" '$(MicrosoftFrameworkUdkPackageVersion)' != '' " />
+  </ItemGroup>
+</Project>

From ba76e8ac24d9679a5192f8676ebe64fa3f298a94 Mon Sep 17 00:00:00 2001
From: Kyaw Thant <kythant@microsoft.com>
Date: Fri, 19 Jul 2024 15:02:37 -0700
Subject: [PATCH 3/4] Fixes

---
 .../unittests/MrtCoreManagedTest.csproj                      | 2 +-
 .../Microsoft.FrameworkUdk.PackageReference.csproj           | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/unittests/MrtCoreManagedTest.csproj b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/unittests/MrtCoreManagedTest.csproj
index ebca713954..af3e1b2b9f 100644
--- a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/unittests/MrtCoreManagedTest.csproj
+++ b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/unittests/MrtCoreManagedTest.csproj
@@ -148,7 +148,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
-    <PackageReference Include="Newtonsoft.Json"/ >
+    <PackageReference Include="Newtonsoft.Json" />
   </ItemGroup>
     <!-- For some reason, TAEF binplaces the wrong version of Wex.Logger.Interop.dll - we need to fix that.
        Removing the version from the binaries directory to allow us to use the version from the lib directory is sufficient here.-->
diff --git a/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj b/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj
index 8401154f5b..dda8cdb7af 100644
--- a/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj
+++ b/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj
@@ -11,6 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageDownload Include="Microsoft.FrameworkUdk" />
+    <PackageReference Include="Microsoft.FrameworkUdk">
+        <IncludeAssets>None</IncludeAssets> <!-- Default is `all`, can be omitted-->
+        <ExcludeAssets>all</ExcludeAssets>
+    </PackageReference>
   </ItemGroup>
 </Project>

From b4acf8260c6f86980ea07a7a91cfb841f549ca68 Mon Sep 17 00:00:00 2001
From: Kyaw Thant <kythant@microsoft.com>
Date: Fri, 19 Jul 2024 15:03:22 -0700
Subject: [PATCH 4/4] Just exclude assets

---
 .../Microsoft.FrameworkUdk.PackageReference.csproj             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj b/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj
index dda8cdb7af..7632ad19ff 100644
--- a/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj
+++ b/eng/PackageReference/FrameworkUdk/Microsoft.FrameworkUdk.PackageReference.csproj
@@ -12,8 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.FrameworkUdk">
-        <IncludeAssets>None</IncludeAssets> <!-- Default is `all`, can be omitted-->
-        <ExcludeAssets>all</ExcludeAssets>
+      <ExcludeAssets>all</ExcludeAssets>
     </PackageReference>
   </ItemGroup>
 </Project>