From 4b8a67dbd5735ddec34cfd83117b8227e88ac3a7 Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Sat, 31 Jul 2021 10:10:45 +0530
Subject: [PATCH] Manage Dependencies centrally

Update package versions.
Use Static Graph restore when applicable.
Manage Packages Centrally using NuGet's CPVM feature.
---
 Directory.Build.props                         |   8 +-
 Directory.Packages.props                      | 102 ++++++++++++++++++
 Directory.Solution.props                      |  14 +++
 GazeInputTest/GazeInputTest.csproj            |   4 +-
 ...Microsoft.Toolkit.Uwp.Notifications.csproj |  12 +--
 .../Microsoft.Toolkit.Uwp.SampleApp.csproj    |  32 ++----
 ...Toolkit.Uwp.Samples.BackgroundTasks.csproj |   4 +-
 .../Microsoft.Toolkit.Uwp.UI.Behaviors.csproj |   2 +-
 ...ft.Toolkit.Uwp.UI.Controls.Markdown.csproj |   2 +-
 ...osoft.Toolkit.Uwp.UI.Controls.Media.csproj |   4 +-
 .../Microsoft.Toolkit.Uwp.UI.Media.csproj     |   4 +-
 .../Microsoft.Toolkit.Uwp.UI.csproj           |   2 +-
 .../Microsoft.Toolkit.Uwp.csproj              |   2 +-
 ...oft.Toolkit.Win32.WpfCore.SampleApp.csproj |   2 +-
 SmokeTests/SmokeTest.csproj                   |   8 +-
 UITests/UITests.App/UITests.App.csproj        |  24 ++---
 .../UITests.Tests.MSTest.csproj               |  22 ++--
 .../UITests.Tests.TAEF.csproj                 |  10 +-
 .../UnitTests.Notifications.NetCore.csproj    |   6 +-
 .../UnitTests.Notifications.UWP.csproj        |  22 ++--
 .../UnitTests.Notifications.WinRT.csproj      |  20 +---
 UnitTests/UnitTests.UWP/UnitTests.UWP.csproj  |  50 +++------
 .../UnitTests.XamlIslands.UWPApp.csproj       |  14 +--
 .../UnitTests.XamlIslands.csproj              |   2 +-
 build/Windows.Toolkit.Common.targets          |  11 ++
 build/Windows.Toolkit.UWP.Controls.targets    |   2 +-
 ...indows.Toolkit.VisualStudio.Design.targets |   4 +-
 build/build.cake                              |   6 +-
 28 files changed, 219 insertions(+), 176 deletions(-)
 create mode 100644 Directory.Packages.props
 create mode 100644 Directory.Solution.props

diff --git a/Directory.Build.props b/Directory.Build.props
index 3ddb90b8c38..32629db9aa8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,7 @@
 <Project>
 
+  <Import Project="Directory.Solution.props" />
+
   <PropertyGroup>
     <RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
     <BuildToolsDirectory>$(RepositoryDirectory)build\</BuildToolsDirectory>
@@ -46,7 +48,7 @@
         <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
       </PropertyGroup>
       <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
+        <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" />
       </ItemGroup>
     </When>
   </Choose>
@@ -54,7 +56,7 @@
   <Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.props" Condition="$(IsDesignProject)" />
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="All" />
   </ItemGroup>
 
   <Choose>
@@ -68,7 +70,7 @@
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
       </PropertyGroup>
       <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
       </ItemGroup>
     </When>
   </Choose>
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 00000000000..9bd7dac96e7
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,102 @@
+<Project>
+
+  <PropertyGroup Label="Core">
+    <NETStandardImplicitPackageVersion>2.0.3</NETStandardImplicitPackageVersion>
+    <ExtrasUwpMetaPackageVersion>6.2.13</ExtrasUwpMetaPackageVersion>
+  </PropertyGroup>
+
+  <ItemGroup Label="Core">
+    <!-- UWP SDK -->
+    <PackageVersion Include="Win2D.uwp" Version="1.26.0" />
+    <PackageVersion Include="ColorCode.UWP" Version="2.0.12" />
+    <PackageVersion Include="Microsoft.UI.Xaml" Version="2.7.1" />
+    <PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
+    <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
+    <!-- MSBuild SDK Extras refernces the following package implicitly -->
+    <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'" />
+    <!-- C# Compiler SDK -->
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
+    <!-- Visual Studio DesignTime SDK -->
+    <PackageVersion Include="Microsoft.VisualStudio.DesignTools.Extensibility" Version="16.4.29519.181" />
+  </ItemGroup>
+
+  <ItemGroup Label="Toolkit">
+    <PackageVersion Include="Microsoft.Toolkit" Version="7.1.2" />
+    <PackageVersion Include="Microsoft.Toolkit.Diagnostics" Version="7.1.2" />
+    <PackageVersion Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Label="Global">
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.4.255" />
+    <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
+
+  <ItemGroup Label="Samples">
+    <!-- Store Services SDK -->
+    <PackageVersion Include="Microsoft.Services.Store.Engagement" Version="10.1901.28001" />
+    <!-- Forms and Graph Toolkit -->
+    <PackageVersion Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.1.3" />
+    <PackageVersion Include="Microsoft.Toolkit.Graph.Controls" Version="7.0.0-preview2" />
+    <PackageVersion Include="Microsoft.Toolkit.Win32.UI.XamlApplication" Version="6.1.3" />
+    <!-- Monaco JS Text Editor for WinRT JS -->
+    <PackageVersion Include="Monaco.Editor" Version="0.9.0-beta" />
+  </ItemGroup>
+
+  <ItemGroup Label="Tests">
+    <!-- MSTest -->
+    <PackageVersion Include="MSTest.TestAdapter" Version="2.2.9" />
+    <PackageVersion Include="MSTest.TestFramework" Version="2.2.9" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <!-- Test Helpers -->
+    <PackageVersion Include="FluentAssertions" Version="6.6.0" />
+    <!-- DO NOT UPGRADE: This version is used for upgrade testing between 6.1.1 and 7.0.0 for the Object Serializers -->
+    <PackageVersion Include="Newtonsoft.Json" Version="10.0.3" Pin="true" />
+    <!-- WinUI Test Infra -->
+    <PackageVersion Include="MUXAppTestHelpers" Version="0.0.4" />
+    <PackageVersion Include="MUXTestInfra.TAEF" Version="0.0.4" />
+    <PackageVersion Include="MUXTestInfra.MSTest" Version="0.0.4" />
+    <PackageVersion Include="MUXCustomBuildTasks" Version="1.0.67" />
+    <PackageVersion Include="TAEF.Redist.Wlk" Version="10.57.200928001" />
+    <!-- Windows App Test Infra -->
+    <PackageVersion Include="Microsoft.Windows.Apps.Test" Version="1.0.181205002" />
+  </ItemGroup>
+
+  <ItemGroup Label="System">
+    <!-- BCL Extensions -->
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
+    <!-- Dependency Injection -->
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
+    <!-- Windows Registry -->
+    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <!-- Annotations -->
+    <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <!-- Diagnostics -->
+    <PackageVersion Include="System.Diagnostics.Contracts" Version="4.3.0" />
+    <PackageVersion Include="System.Diagnostics.Process" Version="4.3.0" />
+    <!-- Drawing -->
+    <PackageVersion Include="System.Drawing.Common" Version="5.0.3" />
+    <PackageVersion Include="System.Drawing.Primitives" Version="4.3.0" />
+    <!-- Memory -->
+    <PackageVersion Include="System.Memory" Version="4.5.4" />
+    <!-- Numerics -->
+    <PackageVersion Include="System.Numerics.Vectors" Version="4.5.0" />
+    <!-- Reflection -->
+    <PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />
+    <!-- Runtime -->
+    <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
+    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
+    <!-- Tasks -->
+    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageVersion Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
+    <!-- Text - JSON -->
+    <PackageVersion Include="System.Text.Json" Version="5.0.2" />
+    <!-- Text - XML -->
+    <PackageVersion Include="System.Xml.ReaderWriter" Version="4.3.1" />
+    <PackageVersion Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/Directory.Solution.props b/Directory.Solution.props
new file mode 100644
index 00000000000..ac476e14109
--- /dev/null
+++ b/Directory.Solution.props
@@ -0,0 +1,14 @@
+<Project>
+
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>True</ManagePackageVersionsCentrally>
+    <RestoreUseStaticGraphEvaluation>True</RestoreUseStaticGraphEvaluation>
+  </PropertyGroup>
+
+  <!-- Options that are supported only when using the Full MSBuild! -->
+  <PropertyGroup Condition="'$(MSBuildRuntimeType)' == 'Full'">
+    <!-- Static Graph Restore doesn't yet support targets like uap10.0 framework -->
+    <RestoreUseStaticGraphEvaluation>False</RestoreUseStaticGraphEvaluation>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj
index f48a7173c1d..6ab4c9a34a6 100644
--- a/GazeInputTest/GazeInputTest.csproj
+++ b/GazeInputTest/GazeInputTest.csproj
@@ -133,9 +133,7 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj">
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index 358ff668538..e4ec71c55d8 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -43,23 +43,23 @@
 
   <!-- For Desktop Win32 apps' WinRT APIs support -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" />
   </ItemGroup>
 
   <!-- The .NET Core desktop apps also need the Registry NuGet package and 'System.Reflection.Emit' for generating COM class dynamically -->
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or $(TargetFramework.Contains('windows10.0'))">
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
-    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" />
+    <PackageReference Include="System.Reflection.Emit" />
+    <PackageReference Include="System.Drawing.Common" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'native'">
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="$(ExtrasUwpMetaPackageVersion)" PrivateAssets="All" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" PrivateAssets="All" />
   </ItemGroup>
 
   <!-- Native (C++) does not need 'System.ValueTuple' (plus it is incompatible with this package) -->
   <ItemGroup Condition="'$(TargetFramework)' != 'native'">
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="System.ValueTuple" />
   </ItemGroup>
 
   <!--
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 79e027cafff..7ec45d1bbd6 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -93,32 +93,16 @@
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Services.Store.Engagement">
-      <Version>10.1901.28001</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit">
-      <Version>7.1.2</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageReference Include="Microsoft.Services.Store.Engagement" />
+    <PackageReference Include="Microsoft.Toolkit" />
     <!-- TODO Reintroduce graph controls
-    <PackageReference Include="Microsoft.Toolkit.Graph.Controls">
-      <Version>7.0.0-preview2</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Graph.Controls" />
     -->
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.7.0</Version>
-    </PackageReference>
-    <PackageReference Include="Monaco.Editor">
-      <Version>0.7.0-alpha</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
-      <Version>2.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.UI.Xaml" />
+    <PackageReference Include="Monaco.Editor" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" />
+    <PackageReference Include="System.ValueTuple" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\BrushAssets\TileTexture.png" />
diff --git a/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj b/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj
index 11b35687b8d..f5ce0b6dc7b 100644
--- a/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj
+++ b/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj
@@ -93,9 +93,7 @@
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj b/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj
index 81dfa301b10..ff1a2a473be 100644
--- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
index 111e7a153c8..a4088ebf390 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ColorCode.UWP" Version="2.0.6" />
+    <PackageReference Include="ColorCode.UWP" />
   </ItemGroup>
 
   <Import Project="$(BuildToolsDirectory)Windows.Toolkit.UWP.Controls.targets" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
index e2a245b7046..819eab9282f 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    <PackageReference Include="Win2D.uwp" Version="1.25.0" />
+    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="Win2D.uwp" />
   </ItemGroup>
 
   <Import Project="$(BuildToolsDirectory)Windows.Toolkit.UWP.Controls.targets" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
index b3355b31554..43e44f0c92b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
@@ -47,8 +47,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    <PackageReference Include="Win2D.uwp" Version="1.25.0" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" />
+    <PackageReference Include="Win2D.uwp" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
index bdedf71aa1d..768b56d42aa 100644
--- a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
+++ b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
@@ -54,7 +54,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
+    <PackageReference Include="Microsoft.Toolkit" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
index 4c1de1f5720..65153077e87 100644
--- a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
+++ b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
+    <PackageReference Include="Microsoft.Toolkit" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
index 4a6de004eaf..74c4c8fda7a 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj
index e57abd520c8..5d81a9f69a7 100644
--- a/SmokeTests/SmokeTest.csproj
+++ b/SmokeTests/SmokeTest.csproj
@@ -105,15 +105,11 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.10</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
   </ItemGroup>
   <!-- Only the Layout package have a dependency on WinUI -->
   <ItemGroup Condition="$(CurrentProject) == 'UWPBaselineWinUI'  or $(CurrentProject) == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout'">
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.7.0</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.UI.Xaml" />
   </ItemGroup>
   <ItemGroup Condition="'$(CurrentProject)' != '' and '$(CurrentProject)' != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI' and '$(NuGetPackageVersion)' != 'To Fill In With Local Version Number'">
     <PackageReference Include="$(CurrentProject)" Version="$(NuGetPackageVersion)" />
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 1a300fe06e5..4723c352c24 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -157,24 +157,12 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit">
-      <Version>7.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Diagnostics">
-      <Version>7.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Mvvm">
-      <Version>7.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="MUXAppTestHelpers">
-      <Version>0.0.4</Version>
-    </PackageReference>
-    <PackageReference Include="System.Text.Json">
-      <Version>5.0.2</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageReference Include="Microsoft.Toolkit" />
+    <PackageReference Include="Microsoft.Toolkit.Diagnostics" />
+    <PackageReference Include="Microsoft.Toolkit.Mvvm" />
+    <PackageReference Include="MUXAppTestHelpers" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
   <ItemGroup>
     <None Include="UITests.App.pfx" />
diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
index 429adb007c5..c8c752b602a 100644
--- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
+++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
@@ -13,20 +13,20 @@
 
   <ItemGroup>
     <!-- MSTest -->
-    <PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.Toolkit" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <!-- Microsoft.UI.Xaml MSTest Extension -->
-    <PackageReference Include="MUXTestInfra.MSTest" Version="0.0.4" />
+    <PackageReference Include="MUXTestInfra.MSTest" />
     <!-- System packages -->
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
-    <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
+    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="System.Drawing.Primitives" />
+    <PackageReference Include="System.Diagnostics.Process" />
+    <PackageReference Include="System.Reflection.TypeExtensions" />
     <!-- Windows SDK packages -->
-    <PackageReference Include="Microsoft.Windows.Apps.Test" Version="1.0.181205002" />
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
+    <PackageReference Include="Microsoft.Windows.Apps.Test" />
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" />
   </ItemGroup>
 
   <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" Label="Shared" />
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index 70718b662e4..4dd2896bfa9 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -54,13 +54,13 @@
 
   <ItemGroup>
     <!-- System packages -->
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
+    <PackageReference Include="System.Text.Json" />
     <!-- Microsoft.UI.Xaml TAEF Extensions -->
-    <PackageReference Include="MUXTestInfra.TAEF" Version="0.0.4" />
-    <PackageReference Include="MUXCustomBuildTasks" Version="1.0.67" GeneratePathProperty="true" />
-    <PackageReference Include="TAEF.Redist.Wlk" Version="10.31.180822002" GeneratePathProperty="true" />
+    <PackageReference Include="MUXTestInfra.TAEF" />
+    <PackageReference Include="MUXCustomBuildTasks" GeneratePathProperty="true" />
+    <PackageReference Include="TAEF.Redist.Wlk" GeneratePathProperty="true" />
     <!-- Windows SDK package -->
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" />
   </ItemGroup>
 
   <Import Project="..\UITests.Tests.Shared\UITests.Tests.Shared.projitems" Label="Shared" />
diff --git a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
index 3a218e5ac9d..a6c001e1b13 100644
--- a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
+++ b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
@@ -9,9 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
   </ItemGroup>
 
   <Import Project="..\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems" Label="Shared" />
diff --git a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
index 63d6cfd5a4c..299ca2f86c1 100644
--- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
+++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj
@@ -105,22 +105,12 @@
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestAdapter">
-      <Version>2.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestFramework">
-      <Version>2.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Xml.XPath.XmlDocument">
-      <Version>4.3.0</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="System.ValueTuple" />
+    <PackageReference Include="System.Xml.XPath.XmlDocument" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
index 46a0d70cc48..6af216ba580 100644
--- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
+++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
@@ -105,21 +105,11 @@
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.10</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestAdapter">
-      <Version>2.1.0</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestFramework">
-      <Version>2.1.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Xml.ReaderWriter">
-      <Version>4.3.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Xml.XPath.XmlDocument">
-      <Version>4.3.0</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="System.Xml.ReaderWriter" />
+    <PackageReference Include="System.Xml.XPath.XmlDocument" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 3b1e2a0b316..8b88426f551 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -111,44 +111,18 @@
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection">
-      <Version>5.0.2</Version>
-    </PackageReference>
-    <PackageReference Include="FluentAssertions">
-      <Version>5.10.3</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit">
-      <Version>7.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Diagnostics">
-      <Version>7.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.7.0</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestAdapter">
-      <Version>2.2.5</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestFramework">
-      <Version>2.2.5</Version>
-    </PackageReference>
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.11.0" /> <!-- Had to do this for local release mode, think issue with updates to NuGet warnings, don't understand where duplicate is coming from... -->
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>10.0.3</Version>
-      <!-- DO NOT UPGRADE THIS PACKAGE FROM 10.0.3, this is used for upgrade testing between 6.1.1 and 7.0.0 for the Object Serializers -->
-    </PackageReference>
-    <PackageReference Include="System.Text.Json">
-      <Version>5.0.2</Version>
-    </PackageReference>
-    <PackageReference Include="System.Xml.XPath.XmlDocument">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="Win2D.uwp">
-      <Version>1.25.0</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageReference Include="Microsoft.UI.Xaml" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <!-- Needed for App data upgrade that uses Json Object Serializers -->
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="System.Xml.XPath.XmlDocument" />
+    <PackageReference Include="Win2D.uwp" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index e23eddd5a82..9e382d5de1f 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -148,16 +148,12 @@
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
-      <Version>6.1.2</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication" />
     <!-- Ignored for now, until it supports Xaml Islands
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="MSTest.TestAdapter" />
+    <PackageReference Include="MSTest.TestFramework" />
     -->
   </ItemGroup>
   <ItemGroup>
diff --git a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
index 39db0bb64ea..149f202733c 100644
--- a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
+++ b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.1.2" />
+    <PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/build/Windows.Toolkit.Common.targets b/build/Windows.Toolkit.Common.targets
index 28cd995b2dc..eb74df84231 100644
--- a/build/Windows.Toolkit.Common.targets
+++ b/build/Windows.Toolkit.Common.targets
@@ -27,4 +27,15 @@
     <AdditionalFiles Include="$(RepositoryDirectory)stylecop.json" Link="stylecop.json" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!--
+      HACK: Remove this once we update the Desktop Toolkit and publish new packages containing the following fix!
+
+      Mark the following package as implicit to workaround CPVM complaining about having 'Version' attribute defined.
+      This package reference comes from the 'Microsoft.WinRT.Win32.targets' file in the 'Microsoft.Toolkit.Win32.UI.SDK' package.
+      Update the version to latest, as the forwarder assemblies are now signed, which should help with the App certification process!
+    -->
+    <PackageReference Update="Microsoft.VCRTForwarders.140" Version="1.0.7" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/build/Windows.Toolkit.UWP.Controls.targets b/build/Windows.Toolkit.UWP.Controls.targets
index 57fcc888af4..f1bb8e164eb 100644
--- a/build/Windows.Toolkit.UWP.Controls.targets
+++ b/build/Windows.Toolkit.UWP.Controls.targets
@@ -5,7 +5,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.UI.Xaml" Version="2.7.0" />
+    <PackageReference Include="Microsoft.UI.Xaml" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/build/Windows.Toolkit.VisualStudio.Design.targets b/build/Windows.Toolkit.VisualStudio.Design.targets
index 1dec2c09418..795ad41cd3a 100644
--- a/build/Windows.Toolkit.VisualStudio.Design.targets
+++ b/build/Windows.Toolkit.VisualStudio.Design.targets
@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.DesignTools.Extensibility" Version="16.4.29519.181" ExcludeAssets="Runtime" />
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="$(TargetPlatformBaseVersion).$(TargetPlatformMinRevision).*" />
+    <PackageReference Include="Microsoft.VisualStudio.DesignTools.Extensibility" ExcludeAssets="Runtime" />
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/build/build.cake b/build/build.cake
index a2b1d5cf085..e1218365c72 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -2,9 +2,9 @@
 
 #addin nuget:?package=Cake.FileHelpers&version=4.0.1
 #addin nuget:?package=Cake.Powershell&version=1.0.1
-#addin nuget:?package=Cake.GitVersioning&version=3.4.220
+#addin nuget:?package=Cake.GitVersioning&version=3.4.231
 
-#tool nuget:?package=MSTest.TestAdapter&version=2.2.5
+#tool nuget:?package=MSTest.TestAdapter&version=2.2.6
 #tool nuget:?package=vswhere&version=2.8.4
 
 using System;
@@ -233,7 +233,7 @@ public string getMSTestAdapterPath(){
     if(nugetPaths.Count == 0){
         throw new Exception(
             "Cannot locate the MSTest test adapter. " +
-            "You might need to add '#tool nuget:?package=MSTest.TestAdapter&version=2.1.0' " +
+            "You might need to add '#tool nuget:?package=MSTest.TestAdapter&version=<latest_version>' " +
             "to the top of your build.cake file.");
     }