From 0ddcabe16effc74df527b8f73bdb8c521bc44de4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:58:32 +0000
Subject: [PATCH 1/6] Update dependencies from
 https://github.com/dotnet/source-build-externals build 20230829.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.23428.2 -> To Version 8.0.0-alpha.1.23429.1
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 051b5285a106..8a0bec0a7ccc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -189,9 +189,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>4122c63a13cfe40e97ac1f9ef01d8110a66943f4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23428.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23429.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>13370d763ada41a7eacae2b19ad1b2e35dd78ae6</Sha>
+      <Sha>0603839a51f5e18b89c60a3690aff5e81fa666ca</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-23228-03">
diff --git a/eng/Versions.props b/eng/Versions.props
index 018fd4a38b92..4fb54fee1168 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -162,7 +162,7 @@
     <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23419.1</MicrosoftDotNetBuildTasksTemplatingVersion>
     <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23419.1</MicrosoftDotNetRemoteExecutorVersion>
     <!-- Packages from dotnet/source-build-externals -->
-    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23428.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
+    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23429.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
     <!-- Packages from dotnet/source-build-reference-packages -->
     <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23424.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
     <!-- Packages from dotnet/symreader -->

From fcd802892390fd4e5f111c65cc69017483f5278d Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Tue, 29 Aug 2023 09:22:14 -0500
Subject: [PATCH 2/6] Update Newtonsoft.Json from 13.0.1 to 13.0.3

---
 eng/Baseline.Designer.props | 16 ++++++++--------
 eng/Versions.props          |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index c9d8dfddfc08..49d8afd8f814 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -31,7 +31,7 @@
     <BaselinePackageReference Include="Duende.IdentityServer.Storage" Version="[6.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[7.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Http" Version="[7.0.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.App.Ref-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Ref' ">
@@ -473,15 +473,15 @@
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' AND '$(TargetFramework)' == 'net462' ">
     <BaselinePackageReference Include="Microsoft.CSharp" Version="[4.7.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net7.0') ">
     <BaselinePackageReference Include="Microsoft.CSharp" Version="[4.7.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.CSharp" Version="[4.7.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Metadata-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Metadata' ">
@@ -500,7 +500,7 @@
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.NewtonsoftJson' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net7.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="[7.0.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
     <BaselinePackageReference Include="Newtonsoft.Json.Bson" Version="[1.0.2, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation-->
@@ -634,15 +634,15 @@
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND '$(TargetFramework)' == 'net462' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[7.0.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net7.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[7.0.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[7.0.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Specification.Tests-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Specification.Tests' ">
diff --git a/eng/Versions.props b/eng/Versions.props
index 4fb54fee1168..f202322545fa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -304,7 +304,7 @@
     <MonoCecilVersion>0.11.2</MonoCecilVersion>
     <MonoTextTemplatingVersion>2.2.1</MonoTextTemplatingVersion>
     <NewtonsoftJsonBsonVersion>1.0.2</NewtonsoftJsonBsonVersion>
-    <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
+    <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
     <NSwagApiDescriptionClientVersion>13.0.4</NSwagApiDescriptionClientVersion>
     <PhotinoNETVersion>1.1.6</PhotinoNETVersion>
     <MicrosoftPlaywrightVersion>1.28.0</MicrosoftPlaywrightVersion>

From 4330f93e8517aeeae730f1aabc2792821600be96 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Tue, 29 Aug 2023 09:54:17 -0500
Subject: [PATCH 3/6] Add Newtonsoft.Json ref in RepoTasks

---
 eng/tools/RepoTasks/RepoTasks.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index 5f9e4f60ae98..aa693e2131f6 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -15,6 +15,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- Explicitly reference the desired version of Newtonsoft.Json to avoid getting an older version
+         from the dependency on NuGet.Packaging which would cause a source-built prebuilt. -->
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
   </ItemGroup>

From 63f7a0aaaf8302f8dced429c39efcbd182591b4c Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Tue, 29 Aug 2023 10:19:10 -0500
Subject: [PATCH 4/6] Revert baseline change

---
 eng/Baseline.Designer.props | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 49d8afd8f814..c9d8dfddfc08 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -31,7 +31,7 @@
     <BaselinePackageReference Include="Duende.IdentityServer.Storage" Version="[6.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[7.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Http" Version="[7.0.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.App.Ref-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Ref' ">
@@ -473,15 +473,15 @@
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' AND '$(TargetFramework)' == 'net462' ">
     <BaselinePackageReference Include="Microsoft.CSharp" Version="[4.7.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net7.0') ">
     <BaselinePackageReference Include="Microsoft.CSharp" Version="[4.7.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.CSharp" Version="[4.7.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Metadata-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Metadata' ">
@@ -500,7 +500,7 @@
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.NewtonsoftJson' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net7.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="[7.0.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
     <BaselinePackageReference Include="Newtonsoft.Json.Bson" Version="[1.0.2, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation-->
@@ -634,15 +634,15 @@
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND '$(TargetFramework)' == 'net462' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[7.0.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net7.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[7.0.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[7.0.0, )" />
-    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.3, )" />
+    <BaselinePackageReference Include="Newtonsoft.Json" Version="[13.0.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Specification.Tests-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Specification.Tests' ">

From ed58a97bbce8afe013d112bf5cbc233abebf2b40 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Tue, 29 Aug 2023 10:25:45 -0500
Subject: [PATCH 5/6] Remove unused version property

---
 eng/Versions.props | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index f202322545fa..2506d9d55a4e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -161,8 +161,6 @@
     <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23419.1</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23419.1</MicrosoftDotNetBuildTasksTemplatingVersion>
     <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23419.1</MicrosoftDotNetRemoteExecutorVersion>
-    <!-- Packages from dotnet/source-build-externals -->
-    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23429.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
     <!-- Packages from dotnet/source-build-reference-packages -->
     <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23424.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
     <!-- Packages from dotnet/symreader -->

From a34f8f345d31120f87794c5ca8310f29fed53d30 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Tue, 29 Aug 2023 10:46:37 -0500
Subject: [PATCH 6/6] Revert "Remove unused version property"

This reverts commit ed58a97bbce8afe013d112bf5cbc233abebf2b40.
---
 eng/Versions.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index 2506d9d55a4e..f202322545fa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -161,6 +161,8 @@
     <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23419.1</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23419.1</MicrosoftDotNetBuildTasksTemplatingVersion>
     <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23419.1</MicrosoftDotNetRemoteExecutorVersion>
+    <!-- Packages from dotnet/source-build-externals -->
+    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23429.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
     <!-- Packages from dotnet/source-build-reference-packages -->
     <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23424.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
     <!-- Packages from dotnet/symreader -->