From b527765926f4602261109be19ffd0dbe2bfc0a41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Oct 2021 21:27:06 +0000 Subject: [PATCH 1/9] 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 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f667a9a8acd4fe..e8b688b81c6fa3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,45 +94,45 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 https://github.com/dotnet/llvm-project @@ -234,9 +234,9 @@ https://github.com/dotnet/hotreload-utils 802e79f0cf423249d54bfaafca2da4a272f4ca07 - + https://github.com/dotnet/runtime-assets - 4c95e6abda97d2067de0beee806f39570dab9779 + 2e8736f9754d7a824dffb746b116fba95400fde9 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index f98234ad7c87c2..aaef2e36690309 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.21515.1 + 6.0.0-beta.21515.1 + 6.0.0-beta.21515.1 + 6.0.0-beta.21515.1 + 6.0.0-beta.21515.1 + 6.0.0-beta.21515.1 + 6.0.0-beta.21515.1 + 6.0.0-beta.21515.1 + 6.0.0-beta.21515.1 + 6.0.0-beta.21515.1 + 6.0.0-beta.21515.1 1.0.0-prerelease.21416.5 1.0.0-prerelease.21416.5 From ae5876a3717a796b44e1f934e83b1a7564bace48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Oct 2021 00:03:54 +0000 Subject: [PATCH 2/9] 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 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8b688b81c6fa3..de94f09a0b52f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 3c0c263bdf428b44240d07015b8ff2152bddac00 + f389f732d8cdca8ee1e38a534cf10c8c3182ba39 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index aaef2e36690309..220168f128b59e 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.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 + 2.5.1-beta.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 + 6.0.0-beta.21515.3 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 2b059748e21713..2c52547a3ac076 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.21515.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21515.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21515.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21515.3", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" From 96ca2cf0c897b44569ffd69dadf5aae55dfc25c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Oct 2021 01:36:21 +0000 Subject: [PATCH 3/9] 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 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de94f09a0b52f8..28e695d4a36c90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - ae52e0c05f57b6608611cc5c1d3b27cc384f1ced + 023317c9e588a18c622387c718059609a6a502a2 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 220168f128b59e..a2378296d36c1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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 From d6cb00cf750467a0d46a2058f2e6be9ac192fbc6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Oct 2021 15:01:35 +0000 Subject: [PATCH 4/9] 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 --- NuGet.config | 5 +++++ eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7812fc325d56d4..ed0477209c17dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,11 @@ + + + + + - 6.0.0-rtm.21514.1 + 6.0.0 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda From a86328a700154683acc4900177dce44172bad48a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Oct 2021 15:41:12 +0000 Subject: [PATCH 5/9] 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 --- NuGet.config | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed0477209c17dc..f1cee656ec9d3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + + + + + + + + + + + + + + + + + + + + + + $(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..689dd3aaa19d69 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -25,7 +25,7 @@ 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; } @@ -48,6 +48,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 +90,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) { From 58337ce4a29860ea8dd741eb3b27af2b9c0f9fd8 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Mon, 18 Oct 2021 16:57:57 -0400 Subject: [PATCH 7/9] [wasm] Remove unused bits --- src/libraries/workloads-testing.targets | 3 --- src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/libraries/workloads-testing.targets b/src/libraries/workloads-testing.targets index b1e5dc233a6191..e72a8c64dd7267 100644 --- a/src/libraries/workloads-testing.targets +++ b/src/libraries/workloads-testing.targets @@ -87,7 +87,6 @@ WorkingDirectory="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App" /> - <_NuGetSourceForWorkloads Include="dotnet6" Value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> <_BuiltNuGets Include="$(LibrariesShippingPackagesDir)\*.nupkg" /> @@ -105,7 +104,6 @@ WorkloadId="@(WorkloadIdForTesting)" VersionBand="$(SdkBandVersion)" NuGetConfigFile="$(_NuGetConfigForWorkloadInstall)" - ExtraNuGetSources="@(_NuGetSourceForWorkloads)" SdkDir="$(SdkWithWorkloadForTestingPath)" /> @@ -118,7 +116,6 @@ WorkloadId="@(WorkloadIdForTesting)" VersionBand="$(SdkBandVersion)" NuGetConfigFile="$(_NuGetConfigForWorkloadInstall)" - ExtraNuGetSources="@(_NuGetSourceForWorkloads)" SdkDir="$(SdkWithNoWorkloadForTestingPath)" OnlyUpdateManifests="true"/> diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index 689dd3aaa19d69..7ed829db494978 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -32,8 +32,6 @@ public class InstallWorkloadFromArtifacts : Task public bool OnlyUpdateManifests{ get; set; } - public ITaskItem[] ExtraNuGetSources { get; set; } = Array.Empty(); - public override bool Execute() { if (!HasMetadata(WorkloadId, nameof(WorkloadId), "Version") || From d5ab9c368a8c9fe87777a5878816062474e59b8a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Oct 2021 12:33:56 +0000 Subject: [PATCH 8/9] 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 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d673e7adc0672..bf158b0b5befa0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,45 +94,45 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 https://github.com/dotnet/llvm-project @@ -234,9 +234,9 @@ https://github.com/dotnet/hotreload-utils 802e79f0cf423249d54bfaafca2da4a272f4ca07 - + https://github.com/dotnet/runtime-assets - 2e8736f9754d7a824dffb746b116fba95400fde9 + 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 205ec4d19f8a76..a212637ef6f9c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,17 +120,17 @@ 4.5.0 6.0.0-rc.1.21415.6 - 6.0.0-beta.21515.1 - 6.0.0-beta.21515.1 - 6.0.0-beta.21515.1 - 6.0.0-beta.21515.1 - 6.0.0-beta.21515.1 - 6.0.0-beta.21515.1 - 6.0.0-beta.21515.1 - 6.0.0-beta.21515.1 - 6.0.0-beta.21515.1 - 6.0.0-beta.21515.1 - 6.0.0-beta.21515.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 From e529f0a7767580a7064e28f224194092910a9507 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Oct 2021 00:22:17 +0000 Subject: [PATCH 9/9] 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 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d57c810d82dfc..ae6f3e6bd25844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - f389f732d8cdca8ee1e38a534cf10c8c3182ba39 + 85f3aa16d8797b5020f1fda11df1a958feb5f8df https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 093cdab1dbeba7..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.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.3 - 2.5.1-beta.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.3 - 6.0.0-beta.21515.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 + 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 diff --git a/global.json b/global.json index 2c52547a3ac076..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.21515.3", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21515.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21515.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21515.3", + "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"