From 232d2df252560690e936f80455db99c352926671 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 10 Mar 2024 09:48:30 +0100 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#18916) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: dotnet-maestro[bot] Co-authored-by: Alexander Köplinger Co-authored-by: Viktor Hofer --- eng/Version.Details.xml | 144 +++++++++--------- eng/Versions.props | 52 +++---- .../repo-projects/Directory.Build.targets | 14 +- 3 files changed, 106 insertions(+), 104 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e5243489..d9611706a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,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 - d6b074b0ab8aeb928bb93d258161ed16f31f85f2 + b99e2c1a4f585d84b1772d1f190750af70c0bf31 - + https://github.com/dotnet/windowsdesktop - d6b074b0ab8aeb928bb93d258161ed16f31f85f2 + b99e2c1a4f585d84b1772d1f190750af70c0bf31 - + https://github.com/dotnet/windowsdesktop - d6b074b0ab8aeb928bb93d258161ed16f31f85f2 + b99e2c1a4f585d84b1772d1f190750af70c0bf31 - + https://github.com/dotnet/windowsdesktop - d6b074b0ab8aeb928bb93d258161ed16f31f85f2 + b99e2c1a4f585d84b1772d1f190750af70c0bf31 - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/aspnetcore - 449abac6f1ca12fa0ad557a872c219fcdfae09f3 + d9df235c2e6d41b65d8e860c5e209d9df8cbcae1 - + https://github.com/dotnet/sdk - 875ca080354cc902981af3a70d03f1246e794ad4 + 01dbe9e70a94ac6add230d4fa44ee2db93281e5d - + https://github.com/dotnet/sdk - 875ca080354cc902981af3a70d03f1246e794ad4 + 01dbe9e70a94ac6add230d4fa44ee2db93281e5d - + https://github.com/dotnet/sdk - 875ca080354cc902981af3a70d03f1246e794ad4 + 01dbe9e70a94ac6add230d4fa44ee2db93281e5d - + https://github.com/dotnet/sdk - 875ca080354cc902981af3a70d03f1246e794ad4 + 01dbe9e70a94ac6add230d4fa44ee2db93281e5d - + https://github.com/dotnet/sdk - 875ca080354cc902981af3a70d03f1246e794ad4 + 01dbe9e70a94ac6add230d4fa44ee2db93281e5d @@ -144,46 +144,46 @@ - + https://github.com/dotnet/winforms - 389c8da733c43105275cfc9f9bc482b144073880 + 5e635c56a80283b9ac444e7c9b1fee97eb748fc2 - + https://github.com/dotnet/wpf - a2c7547c602fe7dfbf8447a563b440d7449b6b6d + 4b071d5c6e72aa7c7874b6b8c435cc8ef9441621 - + https://github.com/dotnet/fsharp - 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 + 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/dotnet/fsharp - 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 + 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/microsoft/vstest - 39c7dd12c7ec24d0552513e84d95476f2077ca33 + 316167369cea59e0ad6ece2a39d94a3a6d49cf12 - + https://github.com/microsoft/vstest - 39c7dd12c7ec24d0552513e84d95476f2077ca33 + 316167369cea59e0ad6ece2a39d94a3a6d49cf12 - + https://github.com/dotnet/runtime - 8330db998659c4e6410aba370b37e4304a517a2b + da781b3aab1bc30793812bced4a6b64d2df31a9f - + https://github.com/dotnet/roslyn - d24b5bb8debd2e89df8db13c84694f2982cc41b1 + c7592906094bc8f16f7371d2fd59c5025d317b8a - + https://github.com/dotnet/roslyn - d24b5bb8debd2e89df8db13c84694f2982cc41b1 + c7592906094bc8f16f7371d2fd59c5025d317b8a @@ -196,23 +196,23 @@ 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - e49fa71580778b8d9c3352ea5ed15ef204f0389f + 309f2e302dff9e6ba8a2f48ddf28133d68ff7eae https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 94f048f4d194119ec20c8878790972fc3a83dc3b + a5f4de78fca42544771977f8e8e04c4aa83e1d02 - + https://github.com/dotnet/emsdk - 94f048f4d194119ec20c8878790972fc3a83dc3b + a5f4de78fca42544771977f8e8e04c4aa83e1d02 diff --git a/eng/Versions.props b/eng/Versions.props index e7c833b8e..d73b3f914 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.3.24155.2 + 9.0.0-preview.3.24157.2 - 9.0.0-preview.3.24156.2 + 9.0.0-preview.3.24158.1 @@ -72,49 +72,49 @@ - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 - 9.0.0-preview.3.24156.20 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 + 9.0.0-preview.3.24157.5 0.2.0 - 9.0.100-preview.3.24157.9 - 9.0.100-preview.3.24157.9 - 9.0.100-preview.3.24157.9 + 9.0.100-preview.3.24159.1 + 9.0.100-preview.3.24159.1 + 9.0.100-preview.3.24159.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24156.11 + 4.10.0-3.24157.12 - 9.0.0-preview.3.24156.25 + 9.0.0-preview.3.24157.12 - 9.0.0-preview.3.24156.25 - 9.0.0-preview.3.24156.25 - 9.0.0-preview.3.24156.25 - 9.0.0-preview.3.24156.25 - 9.0.0-preview.3.24156.25 + 9.0.0-preview.3.24157.12 + 9.0.0-preview.3.24157.12 + 9.0.0-preview.3.24157.12 + 9.0.0-preview.3.24157.12 + 9.0.0-preview.3.24157.12 2.1.0 - 9.0.0-preview.3.24156.27 - 9.0.0-preview.3.24156.27 - 9.0.0-preview.3.24156.27 - 9.0.0-preview.3.24156.27 + 9.0.0-preview.3.24158.1 + 9.0.0-preview.3.24158.1 + 9.0.0-preview.3.24158.1 + 9.0.0-preview.3.24158.1 @@ -126,7 +126,7 @@ - 6.10.0-preview.2.73 + 6.10.0-preview.2.76 @@ -245,7 +245,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24126-02 + 17.10.0-preview-24158-02 9.0.0-alpha.1.24058.10 9.0.0-preview.24057.2 @@ -261,7 +261,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.3.24155.2 + 9.0.0-preview.3.24156.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index f74f4d3ee..ea9f41223 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -93,12 +93,6 @@ <_CommonBuildSources Include="@(DependentRepoSourceName)" /> <_CommonBuildSources Include="$(ExtraSourcesNuGetSourceName)" Condition="'$(ExtraRestoreSourcePath)' != ''" /> - - - <_BuildSources Condition="'$(DotNetBuildSourceOnly)' == 'true'" - Include="$(PrebuiltNuGetSourceName);$(PreviouslySourceBuiltNuGetSourceName);$(ReferencePackagesNuGetSourceName)" /> - <_BuildSources Include="@(_CommonBuildSources)" /> -