From c86a857c3a0445af75aa10a26b151c0447d4ed7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Oct 2021 07:00:53 -0700 Subject: [PATCH] [release/6.0] Update dependencies from dotnet/icu dotnet/emsdk dotnet/runtime-assets dotnet/arcade (#60495) * Update dependencies from https://github.com/dotnet/runtime-assets build 20211015.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21514.1 -> To Version 6.0.0-beta.21515.1 * Update dependencies from https://github.com/dotnet/arcade build 20211015.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21514.2 -> To Version 6.0.0-beta.21515.3 * Update dependencies from https://github.com/dotnet/icu build 20211015.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-rtm.21513.2 -> To Version 6.0.0-rtm.21515.1 * Update dependencies from https://github.com/dotnet/emsdk build 20211018.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0-rtm.21514.1 -> To Version 6.0.0 * Update dependencies from https://github.com/dotnet/emsdk build 20211018.2 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0-rtm.21514.1 -> To Version 6.0.0 * [wasm] Fix workload install for tests, with 6.0.0 Move to using the generated nuget.config, which has the feeds added by darc. The target is a duplicate from `src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj`, and should be moved to a common location in future. Thanks to @lewing for the suggestion. * [wasm] Remove unused bits * Update dependencies from https://github.com/dotnet/runtime-assets build 20211018.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21514.1 -> To Version 6.0.0-beta.21518.1 * Update dependencies from https://github.com/dotnet/arcade build 20211019.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21514.2 -> To Version 6.0.0-beta.21519.3 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Ankit Jain Co-authored-by: Matt Mitchell --- NuGet.config | 3 + eng/Version.Details.xml | 128 +++++++++--------- eng/Versions.props | 56 ++++---- global.json | 8 +- src/libraries/workloads-testing.targets | 60 +++++++- .../InstallWorkloadFromArtifacts.cs | 33 ++--- 6 files changed, 160 insertions(+), 128 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc4acd08adbcae..39e27933660404 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d124e396de68d..ae6f3e6bd25844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/icu - ae52e0c05f57b6608611cc5c1d3b27cc384f1ced + 023317c9e588a18c622387c718059609a6a502a2 https://github.com/dotnet/msquic 98129287d56a5e0348c291ce4260e630b4aa510d - + https://github.com/dotnet/emsdk - 73c8cd3619efc79364fef5fa81989f9e0dd2147b + 7b2c3228bec174e2ef12bc189e9c176eafd24334 https://github.com/dotnet/wcf @@ -18,121 +18,121 @@ - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 https://github.com/dotnet/llvm-project @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -234,9 +234,9 @@ https://github.com/dotnet/hotreload-utils 802e79f0cf423249d54bfaafca2da4a272f4ca07 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index d7d2052d8f4975..e0d8678b4f2795 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,21 +55,21 @@ 1.0.0-rc.2.21511.46 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 2.5.1-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 - 6.0.0-beta.21514.2 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 2.5.1-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 + 6.0.0-beta.21519.3 6.0.0-preview.1.102 @@ -120,17 +120,17 @@ 4.5.0 6.0.0-rc.1.21415.6 - 6.0.0-beta.21514.1 - 6.0.0-beta.21514.1 - 6.0.0-beta.21514.1 - 6.0.0-beta.21514.1 - 6.0.0-beta.21514.1 - 6.0.0-beta.21514.1 - 6.0.0-beta.21514.1 - 6.0.0-beta.21514.1 - 6.0.0-beta.21514.1 - 6.0.0-beta.21514.1 - 6.0.0-beta.21514.1 + 6.0.0-beta.21518.1 + 6.0.0-beta.21518.1 + 6.0.0-beta.21518.1 + 6.0.0-beta.21518.1 + 6.0.0-beta.21518.1 + 6.0.0-beta.21518.1 + 6.0.0-beta.21518.1 + 6.0.0-beta.21518.1 + 6.0.0-beta.21518.1 + 6.0.0-beta.21518.1 + 6.0.0-beta.21518.1 1.0.0-prerelease.21416.5 1.0.0-prerelease.21416.5 @@ -170,7 +170,7 @@ 6.0.100-1.21459.1 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-rtm.21513.2 + 6.0.0-rtm.21515.1 6.0.0-preview.7.21417.1 @@ -183,7 +183,7 @@ 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1 - 6.0.0-rtm.21514.1 + 6.0.0 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda diff --git a/global.json b/global.json index 2b059748e21713..deaa2e9ebc8f42 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21514.2", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21514.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21514.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21514.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21519.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21519.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21519.3", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" diff --git a/src/libraries/workloads-testing.targets b/src/libraries/workloads-testing.targets index f84c0150999ca4..a361a0a4cccdec 100644 --- a/src/libraries/workloads-testing.targets +++ b/src/libraries/workloads-testing.targets @@ -1,6 +1,6 @@ - + <_NuGetConfigForWorkloadInstall>$(ArtifactsBinDir)workload-nuget.config <_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion) <_PackageVersion Condition="'$(_PackageVersion)' == ''">$(PackageVersion) @@ -67,7 +67,7 @@ - <_NuGetSourceForWorkloads Include="dotnet6" Value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> <_BuiltNuGets Include="$(LibrariesShippingPackagesDir)\*.nupkg" /> @@ -106,8 +105,7 @@ @@ -119,11 +117,59 @@ + + + + + + + + + + + + + + + + + + + + + + + $(RepoRoot)NuGet.config + + @(RestoreTestSource -> '<add key="%(Key)" value="%(Identity)" />', '%0A ') + + $([System.IO.File]::ReadAllText('$(TemplateNuGetConfigFile)').Replace( + '<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->', + '$(RestoreTestSourceConfigLines)')) + + + $([System.Text.RegularExpressions.Regex]::Replace( + '$(TestRestoreNuGetConfigContent)', + '<add key=".+" value="https://pkgs.dev.azure.com/dnceng/internal/.+" />', + '')) + + + + diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index 295ee92cdcf3fd..7ed829db494978 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -25,15 +25,13 @@ public class InstallWorkloadFromArtifacts : Task public string? VersionBand { get; set; } [Required, NotNull] - public string? LocalNuGetsPath { get; set; } + public string? NuGetConfigFile { get; set; } [Required, NotNull] public string? SdkDir { get; set; } public bool OnlyUpdateManifests{ get; set; } - public ITaskItem[] ExtraNuGetSources { get; set; } = Array.Empty(); - public override bool Execute() { if (!HasMetadata(WorkloadId, nameof(WorkloadId), "Version") || @@ -48,6 +46,12 @@ public override bool Execute() return false; } + if (!File.Exists(NuGetConfigFile)) + { + Log.LogError($"Cannot find NuGetConfigFile={NuGetConfigFile}"); + return false; + } + Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** Installing workload manifest {WorkloadId.ItemSpec} **{Environment.NewLine}"); string nugetConfigContents = GetNuGetConfig(); @@ -84,28 +88,7 @@ public override bool Execute() return !Log.HasLoggedErrors; } - private string GetNuGetConfig() - { - StringBuilder nugetConfigBuilder = new(); - nugetConfigBuilder.AppendLine($"{Environment.NewLine}"); - - nugetConfigBuilder.AppendLine($@""); - foreach (ITaskItem source in ExtraNuGetSources) - { - string key = source.ItemSpec; - string value = source.GetMetadata("Value"); - if (string.IsNullOrEmpty(value)) - { - Log.LogWarning($"ExtraNuGetSource {key} is missing Value metadata"); - continue; - } - - nugetConfigBuilder.AppendLine($@""); - } - - nugetConfigBuilder.AppendLine($"{Environment.NewLine}"); - return nugetConfigBuilder.ToString(); - } + private string GetNuGetConfig() => File.ReadAllText(NuGetConfigFile); private bool InstallWorkloadManifest(string name, string version, string nugetConfigContents, bool stopOnMissing) {