From 50640bd77c9ab2fc9d9ede69ec458cbfcc2befa3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 20 Oct 2023 14:21:55 +0000 Subject: [PATCH 1/6] Update Newtonsoft 13.0.1 referenced to 13.0.3 --- .../3.0.0/Microsoft.Extensions.DependencyModel.3.0.0.csproj | 4 ++-- .../src/nuget.packaging/6.2.4/NuGet.Packaging.6.2.4.csproj | 6 ++++-- .../src/nuget.packaging/6.6.1/NuGet.Packaging.6.6.1.csproj | 6 ++++-- .../src/nuget.packaging/6.7.0/NuGet.Packaging.6.7.0.csproj | 6 ++++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/referencePackages/src/microsoft.extensions.dependencymodel/3.0.0/Microsoft.Extensions.DependencyModel.3.0.0.csproj b/src/referencePackages/src/microsoft.extensions.dependencymodel/3.0.0/Microsoft.Extensions.DependencyModel.3.0.0.csproj index b92350a3b4..6e5c811f87 100644 --- a/src/referencePackages/src/microsoft.extensions.dependencymodel/3.0.0/Microsoft.Extensions.DependencyModel.3.0.0.csproj +++ b/src/referencePackages/src/microsoft.extensions.dependencymodel/3.0.0/Microsoft.Extensions.DependencyModel.3.0.0.csproj @@ -9,7 +9,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/src/referencePackages/src/nuget.packaging/6.2.4/NuGet.Packaging.6.2.4.csproj b/src/referencePackages/src/nuget.packaging/6.2.4/NuGet.Packaging.6.2.4.csproj index a60bbc6e59..934f41bece 100644 --- a/src/referencePackages/src/nuget.packaging/6.2.4/NuGet.Packaging.6.2.4.csproj +++ b/src/referencePackages/src/nuget.packaging/6.2.4/NuGet.Packaging.6.2.4.csproj @@ -10,7 +10,8 @@ - + + @@ -18,7 +19,8 @@ - + + diff --git a/src/referencePackages/src/nuget.packaging/6.6.1/NuGet.Packaging.6.6.1.csproj b/src/referencePackages/src/nuget.packaging/6.6.1/NuGet.Packaging.6.6.1.csproj index fb173d1807..41347c5462 100644 --- a/src/referencePackages/src/nuget.packaging/6.6.1/NuGet.Packaging.6.6.1.csproj +++ b/src/referencePackages/src/nuget.packaging/6.6.1/NuGet.Packaging.6.6.1.csproj @@ -10,7 +10,8 @@ - + + @@ -18,7 +19,8 @@ - + + diff --git a/src/referencePackages/src/nuget.packaging/6.7.0/NuGet.Packaging.6.7.0.csproj b/src/referencePackages/src/nuget.packaging/6.7.0/NuGet.Packaging.6.7.0.csproj index 2190b73190..992de754da 100644 --- a/src/referencePackages/src/nuget.packaging/6.7.0/NuGet.Packaging.6.7.0.csproj +++ b/src/referencePackages/src/nuget.packaging/6.7.0/NuGet.Packaging.6.7.0.csproj @@ -10,14 +10,16 @@ - + + - + + From 8b3f95146a8ce0426eef5bf7a2b7d8226dd79cdd Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 20 Oct 2023 14:33:33 +0000 Subject: [PATCH 2/6] Update SBE reference to latest --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad2518bb57..fc4ece7979 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/source-build-externals - 33edde07d61cf7606d76ada765335fb81f1cbb71 + 3dc05150cf234f76f6936dcb2853d31a0da1f60e From 36a5f5d2b1bc10a56b76f33125403545f90158f7 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 20 Oct 2023 15:55:30 +0000 Subject: [PATCH 3/6] Update nuspecs --- eng/Build.props | 23 +++++++++++++++++-- ...icrosoft.extensions.dependencymodel.nuspec | 4 ++-- .../6.2.4/nuget.packaging.nuspec | 6 +++-- .../6.6.1/nuget.packaging.nuspec | 6 +++-- .../6.7.0/nuget.packaging.nuspec | 6 +++-- 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index 948d7dff71..3939189577 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -24,6 +24,25 @@ Format: --> + + + + + + + + + + + + + + + + + + + @@ -52,7 +71,7 @@ - + - + @@ -25,7 +25,7 @@ - + diff --git a/src/referencePackages/src/nuget.packaging/6.2.4/nuget.packaging.nuspec b/src/referencePackages/src/nuget.packaging/6.2.4/nuget.packaging.nuspec index 9467eb7b92..6470b244e2 100644 --- a/src/referencePackages/src/nuget.packaging/6.2.4/nuget.packaging.nuspec +++ b/src/referencePackages/src/nuget.packaging/6.2.4/nuget.packaging.nuspec @@ -17,14 +17,16 @@ - + + - + + diff --git a/src/referencePackages/src/nuget.packaging/6.6.1/nuget.packaging.nuspec b/src/referencePackages/src/nuget.packaging/6.6.1/nuget.packaging.nuspec index 1109503647..ecb62b19f2 100644 --- a/src/referencePackages/src/nuget.packaging/6.6.1/nuget.packaging.nuspec +++ b/src/referencePackages/src/nuget.packaging/6.6.1/nuget.packaging.nuspec @@ -17,14 +17,16 @@ - + + - + + diff --git a/src/referencePackages/src/nuget.packaging/6.7.0/nuget.packaging.nuspec b/src/referencePackages/src/nuget.packaging/6.7.0/nuget.packaging.nuspec index 4fbde902e9..647f938cc1 100644 --- a/src/referencePackages/src/nuget.packaging/6.7.0/nuget.packaging.nuspec +++ b/src/referencePackages/src/nuget.packaging/6.7.0/nuget.packaging.nuspec @@ -17,13 +17,15 @@ - + + - + + From c53e6912628e53b76ffd6c54f21e13c1eccbb436 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 20 Oct 2023 15:56:42 +0000 Subject: [PATCH 4/6] Undo test change --- eng/Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index 3939189577..6457d536e6 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -71,7 +71,7 @@ - + + + From 55a4642a9616fffa367c17f6340738127ac501b2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 6 Nov 2023 08:45:05 -0600 Subject: [PATCH 6/6] Update eng/SourceBuildPrebuiltBaseline.xml Co-authored-by: Viktor Hofer --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 645bbdfd31..db996ebe83 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -9,7 +9,7 @@ - +