From 352c48c0217a664f9190272ff69163f7295bded4 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Mon, 18 Dec 2023 16:23:13 -0600 Subject: [PATCH] Bump to .NET 8 GA package refs (#9535) * darc update-dependencies --id 199769 This should be the GA 8.0 build. * Add Tasks.Dataflow and Channels deps ``` darc add-dependency --name System.Threading.Channels --repo https://dev.azure.com/dnceng/internal/_git/dotnet-runtime --version 8.0.0 --commit 5535e31a712343a63f5d7d796cd874e563e5ac14 --type product darc add-dependency --name System.Threading.Channels --repo https://dev.azure.com/dnceng/internal/_git/dotnet-runtime --version 8.0.0 --commit 5535e31a712343a63f5d7d796cd874e563e5ac14 --type product ``` * Binding redirect updates to 8.0 versions * extend SourceBuildPrebuiltBaseline to new patterns --- eng/Packages.props | 1 + eng/SourceBuildPrebuiltBaseline.xml | 14 +++-- eng/Version.Details.xml | 62 +++++++++++--------- eng/Versions.props | 15 ++--- src/MSBuild/app.amd64.config | 36 ++++++------ src/MSBuild/app.config | 16 ++--- src/Tasks/System.Resources.Extensions.pkgdef | 2 +- 7 files changed, 80 insertions(+), 66 deletions(-) diff --git a/eng/Packages.props b/eng/Packages.props index ac8df77f629..b84d22149d7 100644 --- a/eng/Packages.props +++ b/eng/Packages.props @@ -28,6 +28,7 @@ + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 15a527720b7..de395d970df 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -7,11 +7,15 @@ - - - - - + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dcc55327fcf..68fb13bcf36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,54 +7,62 @@ - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 5b20af47d99620150c53eaf5db8636fdf730b126 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 diff --git a/eng/Versions.props b/eng/Versions.props index 74bcb7f9d65..708ff0cadb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ - 7.0.0 - 7.0.0 + 8.0.0 + 8.0.0 4.5.5 4.3.4 - 7.0.0 - 7.0.0 - 7.0.0 + 8.0.0 + 8.0.0 + 8.0.0 5.0.0 7.0.0 + 8.0.0 + 8.0.0 @@ -53,8 +55,7 @@ 4.9.0-3.23608.9 6.9.0-preview.1.50 6.0.0 - 7.0.3 - 7.0.0 + 8.0.0 - - + + @@ -109,18 +109,18 @@ - - + + - - + + - - + + @@ -129,23 +129,23 @@ - - + + - - + + - - + + - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index cb3e75d2510..a372f0c4760 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -41,7 +41,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -70,15 +70,15 @@ - + - + - + @@ -86,15 +86,15 @@ - + - + - + diff --git a/src/Tasks/System.Resources.Extensions.pkgdef b/src/Tasks/System.Resources.Extensions.pkgdef index 9315270511f..62579ad4643 100644 --- a/src/Tasks/System.Resources.Extensions.pkgdef +++ b/src/Tasks/System.Resources.Extensions.pkgdef @@ -4,4 +4,4 @@ "publicKeyToken"="cc7b13ffcd2ddd51" "culture"="neutral" "oldVersion"="0.0.0.0-99.9.9.9" -"newVersion"="7.0.0.0" +"newVersion"="8.0.0.0"