From dc6375b27f71525d4a47dd430d27bd966f63034b Mon Sep 17 00:00:00 2001
From: Keith Mahoney <kmahone@microsoft.com>
Date: Tue, 12 Jul 2022 13:32:26 -0700
Subject: [PATCH 1/2] Update all usage of Newtonsoft.Json to 13.0.1
---
.../Microsoft.UI.Xaml.FrameworkPackagePRI.csproj | 1 +
test/IXMPTestApp/MSTest/IXMPTestApp.csproj | 1 +
test/IXMPTestApp/TAEF/project.json | 3 ++-
test/MUXControls.Test/TAEF/MUXControls.Test.TAEF.csproj | 1 +
test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj | 1 +
test/MUXControlsTestApp/TAEF/project.json | 3 ++-
6 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj b/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj
index a124489f85..02272becce 100644
--- a/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj
+++ b/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj
@@ -50,6 +50,7 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.10</Version>
</PackageReference>
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
<Page Include="$(CompactXamlFile)">
diff --git a/test/IXMPTestApp/MSTest/IXMPTestApp.csproj b/test/IXMPTestApp/MSTest/IXMPTestApp.csproj
index b1a1e3f886..8b2c99603a 100644
--- a/test/IXMPTestApp/MSTest/IXMPTestApp.csproj
+++ b/test/IXMPTestApp/MSTest/IXMPTestApp.csproj
@@ -25,6 +25,7 @@
<Version>2.1.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
<SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
diff --git a/test/IXMPTestApp/TAEF/project.json b/test/IXMPTestApp/TAEF/project.json
index a29b77d94e..ad40b9b6af 100644
--- a/test/IXMPTestApp/TAEF/project.json
+++ b/test/IXMPTestApp/TAEF/project.json
@@ -3,7 +3,8 @@
"Microsoft.Net.Native.Compiler": "2.2.3",
"Microsoft.NETCore.UniversalWindowsPlatform": "6.2.8",
"MUXCustomBuildTasks": "1.0.74",
- "TAEF.Redist.Wlk": "10.31.180822002"
+ "TAEF.Redist.Wlk": "10.31.180822002",
+ "Newtonsoft.Json": "13.0.1"
},
"frameworks": {
"uap10.0.17763": {}
diff --git a/test/MUXControls.Test/TAEF/MUXControls.Test.TAEF.csproj b/test/MUXControls.Test/TAEF/MUXControls.Test.TAEF.csproj
index b32145ab8f..6434489bff 100644
--- a/test/MUXControls.Test/TAEF/MUXControls.Test.TAEF.csproj
+++ b/test/MUXControls.Test/TAEF/MUXControls.Test.TAEF.csproj
@@ -38,6 +38,7 @@
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="Microsoft.Windows.Apps.Test" Version="1.0.181205002" />
<PackageReference Include="TAEF.Redist.Wlk" Version="10.31.180822002" />
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<Import Project="..\MUXControls.Test.Shared.projitems" />
<ItemGroup>
diff --git a/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj b/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
index f90a6a5bc3..27c4e2625b 100644
--- a/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
+++ b/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
@@ -34,6 +34,7 @@
<Version>2.1.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
<SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
diff --git a/test/MUXControlsTestApp/TAEF/project.json b/test/MUXControlsTestApp/TAEF/project.json
index 50f7e13fce..bbbb822a76 100644
--- a/test/MUXControlsTestApp/TAEF/project.json
+++ b/test/MUXControlsTestApp/TAEF/project.json
@@ -6,7 +6,8 @@
"Microsoft.Web.WebView2": "1.0.1264.42",
"MUXCustomBuildTasks": "1.0.74",
"TAEF.Redist.Wlk": "10.31.180822002",
- "Win2D.uwp": "1.22.0"
+ "Win2D.uwp": "1.22.0",
+ "Newtonsoft.Json": "13.0.1"
},
"frameworks": {
"uap10.0.17763": {}
From 972222396fc1d3da9a4900fd977639e06419659e Mon Sep 17 00:00:00 2001
From: Keith Mahoney <kmahone@microsoft.com>
Date: Tue, 12 Jul 2022 14:14:21 -0700
Subject: [PATCH 2/2] remove from FrameworkPackagePRI.csproj
---
.../Microsoft.UI.Xaml.FrameworkPackagePRI.csproj | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj b/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj
index 02272becce..a124489f85 100644
--- a/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj
+++ b/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj
@@ -50,7 +50,6 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.10</Version>
</PackageReference>
- <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>
<Page Include="$(CompactXamlFile)">