diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 960a504ffa0e5..4e366ddb46918 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -28,5 +28,11 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87cd9729f3897..d32a4f8b21804 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,14 +58,14 @@ 803d8598f98fb4efd94604b32627ee9407f246db - + https://github.com/dotnet/cecil - 7e4af02521473d89d6144b3da58fef253e498974 + e05101e694b7c86f03f767014fc203cec5dc7f18 - + https://github.com/dotnet/cecil - 7e4af02521473d89d6144b3da58fef253e498974 + e05101e694b7c86f03f767014fc203cec5dc7f18 @@ -79,15 +79,15 @@ - + https://github.com/dotnet/source-build-reference-packages - 9ae78a4e6412926d19ba97cfed159bf9de70b538 + 97ffbaec397634584a11218e5a29e82601764226 - + https://github.com/dotnet/source-build-externals - 311ef7fef52828f4a70a94d13e32c394fd3292ee + 26c52d02b67816269e647cc584f6b5db9a91970f @@ -174,57 +174,57 @@ https://github.com/dotnet/arcade 731d793be2d0a66bafc96b1a79dc96b4d1f0301b - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f https://github.com/dotnet/llvm-project @@ -282,43 +282,43 @@ https://github.com/dotnet/llvm-project 3358dfd351b424698f3f2cd67432dc62c333a64d - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + db32911d71075a81b50ad07bfcf10194212bda20 - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + db32911d71075a81b50ad07bfcf10194212bda20 - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + db32911d71075a81b50ad07bfcf10194212bda20 - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + db32911d71075a81b50ad07bfcf10194212bda20 - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + db32911d71075a81b50ad07bfcf10194212bda20 - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + db32911d71075a81b50ad07bfcf10194212bda20 - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + db32911d71075a81b50ad07bfcf10194212bda20 - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + db32911d71075a81b50ad07bfcf10194212bda20 - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + db32911d71075a81b50ad07bfcf10194212bda20 https://github.com/dotnet/xharness @@ -352,13 +352,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization c3acfd159662959ff09f3a0d7663023db48bb78a - + https://github.com/dotnet/hotreload-utils - 48812ad620b54916f684b7e7ff885de8ad675ebf + 97873b855f5817bedeb70a03ed066e6ec7686823 - + https://github.com/dotnet/runtime-assets - 0cab6ca16f49b666163d4e1c0e3c080faf5a4e05 + 2bea5264b7f62818ec8a4b7ff4a36906110f118f https://github.com/dotnet/roslyn @@ -386,14 +386,14 @@ cada394f99c521861c39e2a5334678e6aba1ac62 - + https://github.com/dotnet/sdk - 5e03abbcf74bdef38ca67f04fbd4982e333d1f58 + 29904b25a99c8984bacb86473df7d98735fb3207 - + https://github.com/dotnet/sdk - 5e03abbcf74bdef38ca67f04fbd4982e333d1f58 + 29904b25a99c8984bacb86473df7d98735fb3207 diff --git a/eng/Versions.props b/eng/Versions.props index 6f479587a01ac..9297f16778ea4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ 0.2.0 - 9.0.100-preview.7.24358.3 + 9.0.100-preview.7.24371.4 9.0.0-beta.24360.4 9.0.0-beta.24360.4 @@ -104,10 +104,10 @@ 6.0.0-preview.1.102 - 9.0.0-preview.7.24357.2 + 9.0.0-preview.7.24371.6 6.0.0 - 9.0.0-preview.7.24357.2 + 9.0.0-preview.7.24371.6 6.0.0 1.1.1 @@ -119,39 +119,39 @@ 8.0.0 5.0.0 4.5.5 - 9.0.0-preview.7.24357.2 - 9.0.0-preview.7.24357.2 + 9.0.0-preview.7.24371.6 + 9.0.0-preview.7.24371.6 6.0.0 5.0.0 5.0.0 5.0.0 7.0.0 - 9.0.0-preview.7.24357.2 + 9.0.0-preview.7.24371.6 6.0.0 7.0.0 4.5.4 4.5.0 - 9.0.0-preview.7.24357.2 + 9.0.0-preview.7.24371.6 8.0.0 8.0.0 8.0.0 8.0.0 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 - 9.0.0-beta.24358.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 + 9.0.0-beta.24365.1 1.0.0-prerelease.24223.3 1.0.0-prerelease.24223.3 @@ -184,7 +184,7 @@ 9.0.0-prerelease.24317.3 9.0.0-prerelease.24317.3 9.0.0-prerelease.24317.3 - 9.0.0-alpha.0.24351.1 + 9.0.0-alpha.0.24365.2 3.12.0 4.5.0 6.0.0 @@ -212,9 +212,9 @@ 8.0.0-preview-20230918.1 - 0.11.5-alpha.24324.1 + 0.11.5-alpha.24365.1 - 9.0.0-preview.7.24357.2 + 9.0.0-preview.7.24371.6 9.0.0-preview.7.24365.2 diff --git a/global.json b/global.json index 1ce506fa636f8..a6ce18c69dfe3 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24360.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "9.0.0-preview.7.24357.2" + "Microsoft.NET.Sdk.IL": "9.0.0-preview.7.24371.6" } } diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index 4b4486cdf4696..d5b163168d8f7 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -287,6 +287,12 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v } string outputDir = FindSubDirIgnoringCase(manifestVersionBandDir, name); + + // If we one sub entry, it's workload manifest version and we should install into it (aka workload sets) + string[] outputSubEntries = Directory.GetFileSystemEntries(outputDir); + if (outputSubEntries.Length == 1) + outputDir = outputSubEntries[0]; + var bandVersion = VersionBandForManifestPackages; // regex matching the version band, e.g. 6.0.100-preview.3.21202.5 => 6.0.100-preview.3 string packagePreleaseVersion = bandVersionRegex().Match(version).Groups[1].Value;