From 99979efaf6b401a819e65b09473010de06e3bbc8 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 4 Dec 2019 15:45:00 -0800 Subject: [PATCH 1/3] Update branding to 3.1.1 (#17335) * Update branding to 3.1.1 * Add * * Skip RefPack tests * Update baseline --- .azure/pipelines/ci.yml | 1 + eng/Baseline.Designer.props | 574 +++++++++--------- eng/Baseline.xml | 154 +++-- eng/Versions.props | 10 +- .../BaselineGenerator.csproj | 1 - src/Framework/test/TargetingPackTests.cs | 4 +- 6 files changed, 371 insertions(+), 373 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 651495cc9f..09c05b8757 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -9,6 +9,7 @@ trigger: include: - master - release/* + - internal/release/3.* # Run PR validation on all branches pr: diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 1e28129d00..b5c8196535 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.0.0 + 3.1.0 @@ -16,132 +16,132 @@ - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - - - - + + + + - + - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - - - + + + + - - - + + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - + + @@ -186,510 +186,510 @@ - 3.0.0 + 3.1.0 - - - - + + + + - - - - + + + + - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - - - + + + - - + + - 3.0.0 + 3.1.0 - - + + - - + + - 3.0.0 + 3.1.0 - - - - - + + + + + - - - - + + + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - - - + + + - - - + + + - - + + - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - + - + - 3.0.0 + 3.1.0 - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - + + + - - + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - + + + - - - + + + - 3.0.0 + 3.1.0 - - + + - - + + - 3.0.0 + 3.1.0 - - - + + + - - + + - 3.0.0 + 3.1.0 - - - + + + - - + + - 3.0.0 + 3.1.0 - - - - - + + + + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - - + + + + - 3.0.0 + 3.1.0 - - - - + + + + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - + + - - + + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - - - - + + + + + + - - - - - + + + + + - 3.0.0 + 3.1.0 - - - + + + - - - + + + - 3.0.0 + 3.1.0 - - + + - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - - - - + + + + + - 3.0.0 + 3.1.0 - + - + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - - - 3.0.0 + + + 3.1.0 - - - 3.0.0 + + + 3.1.0 - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - - - - + + + + - - - + + + - 3.0.0 + 3.1.0 - - - + + + - - + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 52cbb358f4..bdcbf3e91d 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,91 +1,89 @@  - - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 047f31a3e2..943d24efe0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,17 +8,17 @@ 3 1 - 0 - 3 + 1 + 0 - true + false release true false - rtm - RTM + servicing + Servicing 4 preview$(BlazorClientPreReleasePreviewNumber) diff --git a/eng/tools/BaselineGenerator/BaselineGenerator.csproj b/eng/tools/BaselineGenerator/BaselineGenerator.csproj index df9cc7220a..775e7523c8 100644 --- a/eng/tools/BaselineGenerator/BaselineGenerator.csproj +++ b/eng/tools/BaselineGenerator/BaselineGenerator.csproj @@ -3,7 +3,6 @@ Exe $(DefaultNetCoreTargetFramework) - -s https://api.nuget.org/v3/index.json $(MSBuildThisFileDirectory)../../ diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs index 8a2625b99d..ec8a646f48 100644 --- a/src/Framework/test/TargetingPackTests.cs +++ b/src/Framework/test/TargetingPackTests.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore _targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion")); } - [Fact] + [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")] public void AssembliesAreReferenceAssemblies() { IEnumerable dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories); @@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore }); } - [Fact] + [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")] public void PlatformManifestListsAllFiles() { var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt"); From 08348ed326341b03003c79c4c5fbdff76999da7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 01:21:59 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191126.10 (#17525) - Microsoft.EntityFrameworkCore.Tools - 3.1.1-servicing.19576.10 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.1-servicing.19576.10 - dotnet-ef - 3.1.1-servicing.19576.10 - Microsoft.EntityFrameworkCore - 3.1.1-servicing.19576.10 - Microsoft.EntityFrameworkCore.InMemory - 3.1.1-servicing.19576.10 - Microsoft.EntityFrameworkCore.Relational - 3.1.1-servicing.19576.10 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.1-servicing.19576.10 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.1.1-preview4.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.1-servicing.19576.9 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel - 3.1.1-servicing.19576.9 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.1.1-servicing.19576.5 (parent: Microsoft.EntityFrameworkCore) --- NuGet.config | 1 + eng/Version.Details.xml | 276 ++++++++++++++++++++-------------------- eng/Versions.props | 138 ++++++++++---------- 3 files changed, 208 insertions(+), 207 deletions(-) diff --git a/NuGet.config b/NuGet.config index ff2c367882..3cbe74036f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d58c63097f..7740355842 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,265 +29,265 @@ https://github.com/aspnet/AspNetCore-Tooling 4d6f2ea3abb46351be590e25d52ef2a5ab8fdc56 - + https://github.com/aspnet/EntityFrameworkCore - a852a65fe0e5a9b458ca4d7e4428e71deca70bf7 + 9b656e1add085152b185c5f7a933920f77573c5e - + https://github.com/aspnet/EntityFrameworkCore - a852a65fe0e5a9b458ca4d7e4428e71deca70bf7 + 9b656e1add085152b185c5f7a933920f77573c5e - + https://github.com/aspnet/EntityFrameworkCore - a852a65fe0e5a9b458ca4d7e4428e71deca70bf7 + 9b656e1add085152b185c5f7a933920f77573c5e - + https://github.com/aspnet/EntityFrameworkCore - a852a65fe0e5a9b458ca4d7e4428e71deca70bf7 + 9b656e1add085152b185c5f7a933920f77573c5e - + https://github.com/aspnet/EntityFrameworkCore - a852a65fe0e5a9b458ca4d7e4428e71deca70bf7 + 9b656e1add085152b185c5f7a933920f77573c5e - + https://github.com/aspnet/EntityFrameworkCore - a852a65fe0e5a9b458ca4d7e4428e71deca70bf7 + 9b656e1add085152b185c5f7a933920f77573c5e - + https://github.com/aspnet/EntityFrameworkCore - a852a65fe0e5a9b458ca4d7e4428e71deca70bf7 + 9b656e1add085152b185c5f7a933920f77573c5e - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b https://github.com/dotnet/corefx @@ -377,17 +377,17 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/core-setup - f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 + f3f2dd583fffa254015fc21ff0e45784b333256d - + https://github.com/dotnet/core-setup - f15b6f92ec4c09d6e53dac4a890a1ceebb9b8ef1 + f3f2dd583fffa254015fc21ff0e45784b333256d https://github.com/dotnet/core-setup @@ -409,9 +409,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b https://github.com/dotnet/arcade @@ -425,9 +425,9 @@ https://github.com/dotnet/arcade a42a124635ce1a218309ecb31ec59d559cacb886 - + https://github.com/aspnet/Extensions - 04bb33fefa1e681da5dd88ce9c0f50963443c646 + 92cf26b203486123be3c1ba03dc57acecd720e6b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 943d24efe0..acf792337d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ 3.4.0-beta4-19569-03 - 3.1.1-servicing.19575.1 + 3.1.1-servicing.19576.9 3.1.0 - 3.1.1-servicing.19575.1 + 3.1.1-servicing.19576.9 2.1.0 1.1.0 @@ -101,75 +101,75 @@ 3.1.0-preview4.19575.4 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 - 3.1.0-rtm.19575.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.5 3.1.0-rtm.19565.4 - 3.1.0-rtm.19575.5 - 3.1.0-preview4.19575.5 + 3.1.1-servicing.19576.5 + 3.1.1-preview4.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 - 3.1.1-servicing.19576.5 + 3.1.1-servicing.19576.10 + 3.1.1-servicing.19576.10 + 3.1.1-servicing.19576.10 + 3.1.1-servicing.19576.10 + 3.1.1-servicing.19576.10 + 3.1.1-servicing.19576.10 + 3.1.1-servicing.19576.10 3.1.1-servicing.19577.2 3.1.1-servicing.19577.2 From 1f114dff507ed81030bafbb32b1fdec191ae5414 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 5 Dec 2019 12:33:38 -0800 Subject: [PATCH 3/3] Download runtime from suffixed location in dotnetcli blob storage (#17592) --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + src/Installers/Windows/WindowsHostingBundle/Product.targets | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7740355842..af95629e3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -393,6 +393,10 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 + + https://github.com/dotnet/core-setup + f3f2dd583fffa254015fc21ff0e45784b333256d + https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index acf792337d..8bdf514784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,6 +70,7 @@ 3.4.0-beta4-19569-03 3.1.1-servicing.19576.9 + 3.1.1-servicing.19576.9 3.1.0 3.1.1-servicing.19576.9 2.1.0 diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index dd2b113f35..ea34ff172d 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -26,10 +26,10 @@ - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe