diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a0061b06..e742fad33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 2de3de4d26d207246c571ac1e6f5b7d70904204c + f1de6ee836ad96b92317646815bcb66793b98a7b - + https://github.com/dotnet/sdk - 2de3de4d26d207246c571ac1e6f5b7d70904204c + f1de6ee836ad96b92317646815bcb66793b98a7b - + https://github.com/dotnet/sdk - 2de3de4d26d207246c571ac1e6f5b7d70904204c + f1de6ee836ad96b92317646815bcb66793b98a7b - + https://github.com/dotnet/sdk - 2de3de4d26d207246c571ac1e6f5b7d70904204c + f1de6ee836ad96b92317646815bcb66793b98a7b @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 53f907e84e36a56e68e76fcc3aa5c12540363345 + ae1718567f2aab20df7ca07368b9f51d1c376a10 - + https://github.com/dotnet/fsharp - 53f907e84e36a56e68e76fcc3aa5c12540363345 + ae1718567f2aab20df7ca07368b9f51d1c376a10 - + https://github.com/microsoft/vstest - dbdb1f6f9007a288c904aa1f13485a3e57080fb6 + bedc83105652ba5638dfc1ec629f3402af65acd0 @@ -144,19 +144,19 @@ linker - + https://github.com/dotnet/roslyn - ea0b6351c129c7decd9bf76f4388239509e28e0d + 716366a3830293571eaaad9b1b2b3929b5216f42 - + https://github.com/dotnet/msbuild - ee6f71d15eea77c970815d9105ab9520876c5042 + 9c3057b5af56ef92ffde7d1b37dea8ddee74d8b1 - + https://github.com/nuget/nuget.client - dfe13cc99d13de74f41e9cff35600a2c8958aac1 + 31f2a1cb6fe3dababe67cdb84e9d6ddb9e3ace04 diff --git a/eng/Versions.props b/eng/Versions.props index fee3ddc5b..7900fc5f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.22580.54 - 7.0.200-preview.22580.54 - 7.0.200-preview.22580.54 + 7.0.200-preview.22612.1 + 7.0.200-preview.22612.1 + 7.0.200-preview.22612.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221130-01 + 17.5.0-preview-20221209-03 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch deleted file mode 100644 index 76a1abde5..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 21 Nov 2022 22:32:04 +0000 -Subject: [PATCH] Add package version properties for source-build - -Backport: https://github.com/NuGet/Home/issues/12261 ---- - Directory.Packages.props | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 8afa7dd31..0c4eaecf5 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -9,11 +9,13 @@ - 17.2.0-preview-2-32304-091 - 16.153.0 - -- 17.3.1 -+ 17.3.1 - - 16.8.0 - - 16.11.0 -+ 3.0.0 -+ 4.5.0 - - - -@@ -56,7 +58,7 @@ - - - -- -+ - - - -@@ -66,7 +68,7 @@ - - - -- -+ - - - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch new file mode 100644 index 000000000..0bcfa0de5 --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Mon, 12 Dec 2022 19:30:59 +0000 +Subject: [PATCH] Define PackageVersion props to address prebuilts + +--- + Directory.Packages.props | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index e4b41a45f..245ffcc99 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -16,6 +16,8 @@ + 16.11.0 + + ++ 6.0.0 ++ 6.0.0 + 3.0.0 + 4.5.0 + +@@ -38,8 +40,8 @@ + + + +- +- ++ ++ + + +