From 088210987f214d9f4af7dcbf534dbb6f0de84832 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 fd155c3258..49e59c0303 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 @@ -8,7 +8,7 @@ - + @@ -19,7 +19,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 b829389614..93890823b0 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 @@ -9,7 +9,8 @@ - + + @@ -17,7 +18,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 52fdaf0f0c..8686a5ecb1 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 @@ -9,7 +9,8 @@ - + + @@ -17,7 +18,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 ef9a191b6d..25a8718cf9 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 @@ -9,14 +9,16 @@ - + + - + + From 7024dbeb89339ae947ad559b437161d0a823ccff 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 1efadc901b..c8b7faef7f 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 c2404c55e14041c4d32aa35c701b854d0c961233 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 68ee30acd2..1b340f5eb4 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -22,6 +22,25 @@ Format: --> + + + + + + + + + + + + + + + + + + + @@ -58,7 +77,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 3ba01d18bdef0025e3d8200317654c9698d65a5a 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 1b340f5eb4..59c701344d 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -77,7 +77,7 @@ - + + + From 9a83c6db871c12bdae510176ef0059dca9838e6f 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 @@ - +