From dbe6e6a6a74d137b9de1aa6006f4a34450688cb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 16:35:20 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#19594) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Viktor Hofer --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 168 +++++++++--------- eng/Versions.props | 56 +++--- global.json | 2 +- .../repo-projects/Directory.Build.targets | 5 + .../content/repo-projects/sdk.proj | 1 + src/redist/targets/GenerateLayout.targets | 4 +- 7 files changed, 123 insertions(+), 115 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 034bb9016..26d8b286c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24210.2", + "version": "1.1.0-beta.24229.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1af4a3878..9c9c6cfee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,41 +4,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - c730f1cc15c964ff65f1f5a6751cdd6c1fed1a46 + 6be92da62a4abca596025bd9f9e7440f753e97fe - + https://github.com/dotnet/windowsdesktop - c730f1cc15c964ff65f1f5a6751cdd6c1fed1a46 + 6be92da62a4abca596025bd9f9e7440f753e97fe - + https://github.com/dotnet/windowsdesktop - c730f1cc15c964ff65f1f5a6751cdd6c1fed1a46 + 6be92da62a4abca596025bd9f9e7440f753e97fe - + https://github.com/dotnet/windowsdesktop - c730f1cc15c964ff65f1f5a6751cdd6c1fed1a46 + 6be92da62a4abca596025bd9f9e7440f753e97fe - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 74d927967dcf9dc1801c310603d6dc843dc28ad6 - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 74d927967dcf9dc1801c310603d6dc843dc28ad6 - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 74d927967dcf9dc1801c310603d6dc843dc28ad6 - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 74d927967dcf9dc1801c310603d6dc843dc28ad6 - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 74d927967dcf9dc1801c310603d6dc843dc28ad6 @@ -46,70 +46,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 74d927967dcf9dc1801c310603d6dc843dc28ad6 - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 74d927967dcf9dc1801c310603d6dc843dc28ad6 - + https://github.com/dotnet/aspnetcore - f18510c2fbdfc11b8144ced4857b3d878fa70965 + c157c5c1962a66c4fe0212ed767f167bb9cdfb79 - + https://github.com/dotnet/aspnetcore - f18510c2fbdfc11b8144ced4857b3d878fa70965 + c157c5c1962a66c4fe0212ed767f167bb9cdfb79 - + https://github.com/dotnet/aspnetcore - f18510c2fbdfc11b8144ced4857b3d878fa70965 + c157c5c1962a66c4fe0212ed767f167bb9cdfb79 - + https://github.com/dotnet/aspnetcore - f18510c2fbdfc11b8144ced4857b3d878fa70965 + c157c5c1962a66c4fe0212ed767f167bb9cdfb79 - + https://github.com/dotnet/aspnetcore - f18510c2fbdfc11b8144ced4857b3d878fa70965 + c157c5c1962a66c4fe0212ed767f167bb9cdfb79 - + https://github.com/dotnet/aspnetcore - f18510c2fbdfc11b8144ced4857b3d878fa70965 + c157c5c1962a66c4fe0212ed767f167bb9cdfb79 - + https://github.com/dotnet/aspnetcore - f18510c2fbdfc11b8144ced4857b3d878fa70965 + c157c5c1962a66c4fe0212ed767f167bb9cdfb79 - + https://github.com/dotnet/aspnetcore - f18510c2fbdfc11b8144ced4857b3d878fa70965 + c157c5c1962a66c4fe0212ed767f167bb9cdfb79 - + https://github.com/dotnet/sdk - e2095416638437d2b084521306fa229abd819284 + 4f5ee41ea45e7861aa45056cf422b0edce876f00 - + https://github.com/dotnet/sdk - e2095416638437d2b084521306fa229abd819284 + 4f5ee41ea45e7861aa45056cf422b0edce876f00 - + https://github.com/dotnet/sdk - e2095416638437d2b084521306fa229abd819284 + 4f5ee41ea45e7861aa45056cf422b0edce876f00 - + https://github.com/dotnet/sdk - e2095416638437d2b084521306fa229abd819284 + 4f5ee41ea45e7861aa45056cf422b0edce876f00 - + https://github.com/dotnet/sdk - e2095416638437d2b084521306fa229abd819284 + 4f5ee41ea45e7861aa45056cf422b0edce876f00 @@ -132,33 +132,33 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 31ab6a2d0e3b19f17c4126c859564ccc3a0cae94 + f23bef195234bbbe7b96f38d056965269fbb3bc0 - + https://github.com/dotnet/test-templates - 31ab6a2d0e3b19f17c4126c859564ccc3a0cae94 + f23bef195234bbbe7b96f38d056965269fbb3bc0 - + https://github.com/dotnet/winforms - c0dad198e0c75e50ebefaea76a5bf42f4f0b25ba + c5967ff09814601cc8828668589ab66b946a4b16 - + https://github.com/dotnet/wpf - 04d8cc359f518cdb16ac7ffecf23f876fded0155 + 6f044de655b9d41eaade4203c99a14f04edf72c4 - + https://github.com/dotnet/fsharp - 9881e3b215a6b0ae64b83ffacac518314ca6a19d + 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 - + https://github.com/dotnet/fsharp - 9881e3b215a6b0ae64b83ffacac518314ca6a19d + 3ef1cb25ffb292b5c87f9604d1a09b032277bf76 @@ -171,43 +171,43 @@ 56d28849af08dc3143d019694aa92f186b89d2ac - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 74d927967dcf9dc1801c310603d6dc843dc28ad6 - + https://github.com/dotnet/roslyn - c5b98ae61ab894230786db2cde711ce4525a2597 + b9c44957977af21c20c4addf8b7b788112285003 - + https://github.com/dotnet/roslyn - c5b98ae61ab894230786db2cde711ce4525a2597 + b9c44957977af21c20c4addf8b7b788112285003 - + https://github.com/dotnet/msbuild - 9cdb3615adb4115f92b390de2f258fac5f320909 + d542f3a80101883083b95fff0b67666b63002751 - + https://github.com/dotnet/msbuild - 9cdb3615adb4115f92b390de2f258fac5f320909 + d542f3a80101883083b95fff0b67666b63002751 - + https://github.com/nuget/nuget.client - 252bbee32a839623dc9af267f950d21cde5e9497 + f6615e7a7177dd820b74b007c5f6b691ceedada3 - + https://github.com/dotnet/emsdk - 19c9523f5c2dd091b49959700723af795d6ad2b4 + 9d28301f6a5f512db14f242f7403a4bfbcbcc8a4 - + https://github.com/dotnet/emsdk - 19c9523f5c2dd091b49959700723af795d6ad2b4 + 9d28301f6a5f512db14f242f7403a4bfbcbcc8a4 @@ -250,13 +250,13 @@ https://github.com/dotnet/arcade be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade-services - 9ec07c3673acf5602234c244d9465bca48f49969 + 22f983b0e99191ed08c6434d554fc1eab040a2ba - + https://github.com/dotnet/arcade-services - 9ec07c3673acf5602234c244d9465bca48f49969 + 22f983b0e99191ed08c6434d554fc1eab040a2ba https://github.com/dotnet/arcade @@ -294,14 +294,14 @@ aren't shipping, or those extensions packages depend on aspnetcore packages that won't ship. However, given the cost of maintaining this coherency path is high. This being toolset means that aspire is responsible for its own coherency. --> - + https://github.com/dotnet/aspire - 9d6b4ff780da64c972637368d6e1f58afef9535f + 0514ea9e12ece4dd764824ce925ae0eae6fcbd86 - + https://github.com/dotnet/aspire - 9d6b4ff780da64c972637368d6e1f58afef9535f + 0514ea9e12ece4dd764824ce925ae0eae6fcbd86 diff --git a/eng/Versions.props b/eng/Versions.props index c70c66934..bbfa406a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,15 +43,15 @@ - 1.1.0-beta.24210.2 + 1.1.0-beta.24229.1 - 9.0.0-preview.4.24218.1 + 9.0.0-preview.5.24228.1 - 9.0.0-preview.4.24219.1 + 9.0.0-preview.5.24229.1 @@ -59,7 +59,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rc.24222.1 + 1.1.0-rc.24229.2 @@ -67,49 +67,49 @@ - 9.0.0-preview.4.24223.1 - 9.0.0-preview.4.24223.1 - 9.0.0-preview.4.24223.1 - 9.0.0-preview.4.24223.1 - 9.0.0-preview.4.24223.1 - 9.0.0-preview.4.24223.1 - 9.0.0-preview.4.24223.1 + 9.0.0-preview.5.24225.4 + 9.0.0-preview.5.24225.4 + 9.0.0-preview.5.24225.4 + 9.0.0-preview.5.24225.4 + 9.0.0-preview.5.24225.4 + 9.0.0-preview.5.24225.4 + 9.0.0-preview.5.24225.4 0.2.0 - 9.0.100-preview.4.24223.23 - 9.0.100-preview.4.24223.23 - 9.0.100-preview.4.24223.23 + 9.0.100-preview.5.24230.2 + 9.0.100-preview.5.24230.2 + 9.0.100-preview.5.24230.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24223.5 + 4.11.0-2.24229.6 - 9.0.0-preview.4.24223.11 + 9.0.0-preview.4.24225.8 - 9.0.0-preview.4.24223.11 - 9.0.0-preview.4.24223.11 - 9.0.0-preview.4.24223.11 - 9.0.0-preview.4.24223.11 - 9.0.0-preview.4.24223.11 + 9.0.0-preview.4.24225.8 + 9.0.0-preview.4.24225.8 + 9.0.0-preview.4.24225.8 + 9.0.0-preview.4.24225.8 + 9.0.0-preview.4.24225.8 2.1.0 - 9.0.0-preview.4.24220.1 - 9.0.0-preview.4.24220.1 - 9.0.0-preview.4.24220.1 - 9.0.0-preview.4.24220.1 + 9.0.0-preview.5.24229.3 + 9.0.0-preview.5.24229.3 + 9.0.0-preview.5.24229.3 + 9.0.0-preview.5.24229.3 @@ -120,7 +120,7 @@ - 6.11.0-preview.1.28 + 6.11.0-preview.1.32 @@ -216,7 +216,7 @@ 9.0.100-preview.1 - 9.0.0-preview.4.24218.6 + 9.0.0-preview.4.24229.9 9.0.100-preview.1 9.0.0-preview.1.9973 34.99.0-preview.1.151 @@ -225,7 +225,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.4.24215.3 + 9.0.0-preview.4.24222.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/global.json b/global.json index ea0847439..39f10d56e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.3.24204.13", + "dotnet": "9.0.100-preview.5.24225.4", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 8e4e9e2cd..54b694996 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -56,6 +56,11 @@ RemoveMetadata="MSBuildSourceProjectFile;MSBuildSourceTargetName;OriginalItemSpec" /> + + + + + diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index f6579a28b..f70c992d3 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -3,6 +3,7 @@ true + $(BuildArgs) -nativeToolsOnMachine $(BuildArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk $(BuildArgs) /p:PortableRid=$(PortableRid) $(BuildArgs) /p:TargetRid=$(TargetRid) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 0615d9eb6..c18f42d78 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -1,4 +1,4 @@ - + $(BaseOutputPath)$(Configuration)\dotnet\ @@ -31,6 +31,8 @@ https://dotnetcli.blob.core.windows.net/dotnet/ $(OfficialBaseURL) + + $([System.Text.RegularExpressions.Regex]::Replace('$(PublicBaseURL)', '%28file:\/{1,}%29%28.+%29', 'file:///%242')) $(HostRid) $(OSName)-$(Architecture)