From 882fe2afa0b659f4c42b642e125dd4aee46fb8e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 04:17:13 +0000 Subject: [PATCH 01/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5052) * Update dependencies from https://github.com/dotnet/toolset build 20191001.18 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19501.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19501.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.20 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19501.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19501.12 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a4c1b851..6f6c33c0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - a7bdde3404b9080615fe7f8a4e7ef9d27aaa03bf + eeb1a7330a806bf9bcfdee9b22d83f7c31cc5120 https://github.com/dotnet/sdk 3819a21a612cd8bc15b6f6c4e361d18490469577 - + https://github.com/dotnet/cli - 0b104bba96794c0fe14044afb62cf4b290eed2dc + 49dee3a490016e618fc45f6b9d3f667531be4143 diff --git a/eng/Versions.props b/eng/Versions.props index 52f54ee47..59ce97259 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19501.8 + 3.0.101-servicing.19501.20 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19501.1 + 3.0.101-servicing.19501.12 0.2.0 From cbc334e4370938fc4d85ec862d97d0e9487699e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 11:05:55 +0000 Subject: [PATCH 02/38] Update dependencies from https://github.com/dotnet/core-setup build 20191002.01 (#5061) - Microsoft.NETCore.App.Ref - 3.0.1-servicing-19502-01 - Microsoft.NETCore.App - 3.0.1-servicing-19502-01 - NETStandard.Library.Ref - 2.1.0-servicing-19502-01 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.1-servicing-19502-01 - Microsoft.NETCore.DotNetHostResolver - 3.0.1-servicing-19502-01 - Microsoft.NETCore.DotNetAppHost - 3.0.1-servicing-19502-01 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1-servicing-19502-01 - Microsoft.WindowsDesktop.App - 3.0.1-servicing-19502-01 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.0.1-servicing.19501.4 (parent: Microsoft.NetCore.App) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-servicing.19480.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.1-servicing.19480.1 (parent: Microsoft.WindowsDesktop.App) --- NuGet.config | 3 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 32 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index a4c1bdf0e..947b1b278 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f6c33c0f..df69699cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,42 +2,42 @@ - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/corefx - 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea + 54d63c3e283e0c3937a35ab4e99f391c84ff119e https://github.com/aspnet/AspNetCore @@ -80,13 +80,13 @@ 49dee3a490016e618fc45f6b9d3f667531be4143 - + https://github.com/dotnet/winforms - 1a89b41114eb292f835ed7038fd3cba3a02896f7 + af088e57775b7b9f28322511bc5be8ddb356b8a8 - + https://github.com/dotnet/wpf - 3e99215204ccf7ae18e7c654ebdd77c91b7140e2 + d4121027999cb01b941481c774b42a2193775b93 diff --git a/eng/Versions.props b/eng/Versions.props index 59ce97259..c8c454ab3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-rc2.19462.10 + 4.8.0-servicing.19480.1 - 3.0.0 + 3.0.1-servicing.19480.1 @@ -44,22 +44,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0 - 3.0.0-rc2-19463-05 + 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-01 $(MicrosoftNETCoreAppPackageVersion) - 3.0.0 - 3.0.0 + 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-01 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.0.0 + 3.0.1-servicing-19502-01 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 2.1.0 + 2.1.0-servicing-19502-01 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0 - 3.0.0-rc2-19463-05 + 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-01 $(MicrosoftWindowsDesktopAppPackageVersion) From c49870c18a69b48428dd1343f6391cf03fbbb09f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 13:46:41 +0000 Subject: [PATCH 03/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5062) * Update dependencies from https://github.com/dotnet/toolset build 20191002.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19502.5 * Update dependencies from https://github.com/dotnet/toolset build 20191002.7 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19502.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19502.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df69699cc..7751280a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - eeb1a7330a806bf9bcfdee9b22d83f7c31cc5120 + 78da18674ad084d58311d36b5354925a8bef62fc https://github.com/dotnet/sdk 3819a21a612cd8bc15b6f6c4e361d18490469577 - + https://github.com/dotnet/cli - 49dee3a490016e618fc45f6b9d3f667531be4143 + 11f4a837a9d746af3b7d72767ab06c5a64c772f9 diff --git a/eng/Versions.props b/eng/Versions.props index c8c454ab3..7e3b9393b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19501.20 + 3.0.101-servicing.19502.7 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19501.12 + 3.0.101-servicing.19502.3 0.2.0 From 03042aa67466be19add0b0d402909d8e0c54c029 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 22:25:42 +0000 Subject: [PATCH 04/38] Update dependencies from https://github.com/dotnet/core-setup build 20191002.09 (#5075) - Microsoft.NETCore.App.Ref - 3.0.1-servicing-19502-09 - Microsoft.NETCore.App - 3.0.1-servicing-19502-09 - NETStandard.Library.Ref - 2.1.0-servicing-19502-09 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.1-servicing-19502-09 - Microsoft.NETCore.DotNetHostResolver - 3.0.1-servicing-19502-09 - Microsoft.NETCore.DotNetAppHost - 3.0.1-servicing-19502-09 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1-servicing-19502-09 - Microsoft.WindowsDesktop.App - 3.0.1-servicing-19502-09 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7751280a6..ce4ad11a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,37 +2,37 @@ - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + 0bdbe6b3a7caf32a4f594196effe56a941980d7b - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + 0bdbe6b3a7caf32a4f594196effe56a941980d7b - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + 0bdbe6b3a7caf32a4f594196effe56a941980d7b - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + 0bdbe6b3a7caf32a4f594196effe56a941980d7b - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + 0bdbe6b3a7caf32a4f594196effe56a941980d7b - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + 0bdbe6b3a7caf32a4f594196effe56a941980d7b - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + 0bdbe6b3a7caf32a4f594196effe56a941980d7b - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + 0bdbe6b3a7caf32a4f594196effe56a941980d7b diff --git a/eng/Versions.props b/eng/Versions.props index 7e3b9393b..77ef9ee62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,22 +44,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-09 + 3.0.1-servicing-19502-09 $(MicrosoftNETCoreAppPackageVersion) - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-09 + 3.0.1-servicing-19502-09 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-09 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 2.1.0-servicing-19502-01 + 2.1.0-servicing-19502-09 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-09 + 3.0.1-servicing-19502-09 $(MicrosoftWindowsDesktopAppPackageVersion) From 3f257d4df754d31e7cf7238471049415237b0bf9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 00:00:10 +0000 Subject: [PATCH 05/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5077) * Update dependencies from https://github.com/dotnet/toolset build 20191002.13 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19502.13 * Update dependencies from https://github.com/dotnet/toolset build 20191002.15 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19502.15 --- 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 ce4ad11a7..7642113a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,9 +67,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 78da18674ad084d58311d36b5354925a8bef62fc + 3e09572b0fa7f6baa1874d11d208773fcc7f11c6 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 77ef9ee62..662e4bfbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19502.7 + 3.0.101-servicing.19502.15 From 9749981e6f7c01d059ef36792eb76c1cb2907237 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 16:42:55 +0000 Subject: [PATCH 06/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5079) * Update dependencies from https://github.com/dotnet/toolset build 20191002.16 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19502.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19502.8 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191003.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19503.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19502.8 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191003.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19503.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19503.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7642113a2..274e3efb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 3e09572b0fa7f6baa1874d11d208773fcc7f11c6 + d62b7c37ab654e5019131ec3c0418d0a23639a31 https://github.com/dotnet/sdk 3819a21a612cd8bc15b6f6c4e361d18490469577 - + https://github.com/dotnet/cli - 11f4a837a9d746af3b7d72767ab06c5a64c772f9 + 850536d605a5a84ee573760b755608ab596146de diff --git a/eng/Versions.props b/eng/Versions.props index 662e4bfbd..ca242e0e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19502.15 + 3.0.101-servicing.19503.4 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19502.3 + 3.0.101-servicing.19503.1 0.2.0 From 439c617a55f16d9f585987637954461462e8b439 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 00:26:17 +0000 Subject: [PATCH 07/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5094) * Update dependencies from https://github.com/dotnet/toolset build 20191003.9 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19503.9 * Update dependencies from https://github.com/dotnet/toolset build 20191003.10 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19503.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 274e3efb5..83f6f921b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - d62b7c37ab654e5019131ec3c0418d0a23639a31 + bd52157c0d2b3a13879680e8a86766bfc973380f https://github.com/dotnet/sdk 3819a21a612cd8bc15b6f6c4e361d18490469577 - + https://github.com/dotnet/cli - 850536d605a5a84ee573760b755608ab596146de + 2bb5a58198c6d96aae157ea3a119867b57cd839d diff --git a/eng/Versions.props b/eng/Versions.props index ca242e0e9..26046907a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19503.4 + 3.0.101-servicing.19503.10 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19503.1 + 3.0.101-servicing.19503.4 0.2.0 From 0f52aed34c765c54fbb7affad075313ae2390e2f Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 3 Oct 2019 10:33:20 -0700 Subject: [PATCH 08/38] Prepare for 3.0.1xx servicing We were bumping targeting pack, framework-dependent default runtime version, and self-contained default (latest) runtime version in unison. This only works for previews where these versions are all the same always. Now that we're servicing 3.0, we: 1. Pin targeting packs to 3.0.0 2. Fix default framework-dependent runtime version at 3.0.0 This change also: * Removes dependencies on legacy/internal netcoreapp packages. We now use Microsoft.NETCore.App.Internal version exclusively to calculate the blob storage path for core-setup. * Uses PackageDownload for all templates, including latest. PackageReference had been used for latest only because it hid another bug with the netcoreapp reference of redist.csproj that is fixed here. That reference is now a FrameworkReference as it should be. * Removes a bunch of shenanigans from GenerateBundledVersions.props that were causing issues with above. One casualty of that is that we hard code the RID lists for runtime pack, which I don't think is too bad, and actually will make it easier to merge in source build patches. * Cleans up how runtime and targeting pack versions are referenced throughout, removing incorrect assumptions about them being the same. * Incorporates a prior closed PR to use suffixed version for blob storage, even when assets coming from blob storage are stabilized. It needed changes to merge with this. Note: * A similar theoretical servicing issue exists for the versions of apphost, hostfxr, shared host, which are still assumed to be the same as the runtime version in several places. If we choose to service those independently, more work is required. * There will be a 3.0.1 ASP.NET targeting pack, and so we will have to unpin that once it is ready. This change establishes the baseline of all targeting packs being pinnned, and they can be unpinned in the (hopefully rare) cases where they need to be serviced. --- eng/Version.Details.xml | 54 ++++---- eng/Versions.props | 48 ++++--- eng/configure-toolset.ps1 | 4 + eng/configure-toolset.sh | 3 + ...tLinuxNativeInstallerDependencyVersions.cs | 43 ++++++ src/redist/redist.csproj | 9 +- src/redist/targets/Branding.targets | 8 +- src/redist/targets/BuildCoreSdkTasks.targets | 1 + src/redist/targets/BundledTemplates.targets | 16 ++- src/redist/targets/Crossgen.targets | 16 +-- .../targets/GenerateBundledVersions.targets | 122 +++++++----------- src/redist/targets/GenerateDebs.targets | 24 ++-- src/redist/targets/GenerateLayout.targets | 96 +++++++------- src/redist/targets/GenerateMSIs.targets | 6 +- src/redist/targets/GeneratePKG.targets | 8 +- src/redist/targets/GenerateRPMs.targets | 20 ++- ...xNativeInstallerDependencyVersions.targets | 57 ++++---- .../packaging/deb/dotnet-debian_config.json | 4 +- .../targets/packaging/rpm/dotnet-config.json | 4 +- 19 files changed, 289 insertions(+), 254 deletions(-) create mode 100644 eng/configure-toolset.ps1 create mode 100644 eng/configure-toolset.sh create mode 100644 src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 274e3efb5..1087b48b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,45 +1,47 @@ - - + + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 93abb6b3a675b44ee35698d9640a42779b18e004 - + + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 93abb6b3a675b44ee35698d9640a42779b18e004 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 93abb6b3a675b44ee35698d9640a42779b18e004 - + + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 7d57652f33493fa022125b7f63aad0d70c52d810 - - + https://github.com/dotnet/corefx 54d63c3e283e0c3937a35ab4e99f391c84ff119e - + + https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a @@ -67,24 +69,24 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - d62b7c37ab654e5019131ec3c0418d0a23639a31 + 78da18674ad084d58311d36b5354925a8bef62fc https://github.com/dotnet/sdk 3819a21a612cd8bc15b6f6c4e361d18490469577 - + https://github.com/dotnet/cli - 850536d605a5a84ee573760b755608ab596146de + 11f4a837a9d746af3b7d72767ab06c5a64c772f9 - + https://github.com/dotnet/winforms af088e57775b7b9f28322511bc5be8ddb356b8a8 - + https://github.com/dotnet/wpf d4121027999cb01b941481c774b42a2193775b93 diff --git a/eng/Versions.props b/eng/Versions.props index ca242e0e9..32bb8cc4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19503.4 + 3.0.101-servicing.19502.7 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19503.1 + 3.0.101-servicing.19502.3 0.2.0 @@ -44,23 +44,31 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.1-servicing-19502-09 - 3.0.1-servicing-19502-09 - $(MicrosoftNETCoreAppPackageVersion) - 3.0.1-servicing-19502-09 - 3.0.1-servicing-19502-09 - $(MicrosoftNETCoreDotNetHostResolverPackageVersion) - $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.0.1-servicing-19502-09 - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 2.1.0-servicing-19502-09 - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) - $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.1-servicing-19502-09 - 3.0.1-servicing-19502-09 - $(MicrosoftWindowsDesktopAppPackageVersion) + + 3.0.1-servicing.19501.4 + + + + 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-01 + 3.0.0 + 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-01 + 3.0.0 + 2.1.0 + + + + + $(MicrosoftNETCoreAppHostwinx64PackageVersion) + $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion) + $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) + + + $(MicrosoftNETCoreAppRuntimePackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -70,7 +78,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 - $(AspNetCoreVersion) + $(MicrosoftAspNetCoreAppRuntimePackageVersion) 1.6.0 1.0.2-beta4 diff --git a/eng/configure-toolset.ps1 b/eng/configure-toolset.ps1 new file mode 100644 index 000000000..87375243e --- /dev/null +++ b/eng/configure-toolset.ps1 @@ -0,0 +1,4 @@ +# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes + +$script:useInstalledDotNetCli = $false + diff --git a/eng/configure-toolset.sh b/eng/configure-toolset.sh new file mode 100644 index 000000000..d890b1b02 --- /dev/null +++ b/eng/configure-toolset.sh @@ -0,0 +1,3 @@ +# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes + +useInstalledDotNetCli="false" \ No newline at end of file diff --git a/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs b/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs new file mode 100644 index 000000000..195ac196b --- /dev/null +++ b/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using Newtonsoft.Json.Linq; + +namespace Microsoft.DotNet.Cli.Build +{ + public class GetLinuxNativeInstallerDependencyVersions : Task + { + [Required] + public string PackageVersion { get; set; } + + [Output] + public string MajorMinorVersion { get; private set; } + + [Output] + public string MajorMinorPatchVersion { get; private set; } + + [Output] + public string VersionWithTilde { get; private set; } + + public override bool Execute() + { + string[] dotSplit = PackageVersion.Split('.'); + MajorMinorVersion = dotSplit[0] + "." + dotSplit[1]; + + string[] prereleaseSplit = PackageVersion.Split(new[] { '-' }, count: 2); + MajorMinorPatchVersion = prereleaseSplit[0]; + VersionWithTilde = MajorMinorPatchVersion; + + if (prereleaseSplit.Length > 1) + { + VersionWithTilde += "~" + prereleaseSplit[1]; + } + + return true; + } + } +} diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index e9f84e078..8792e3898 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -3,14 +3,13 @@ $(CoreSdkTargetFramework) true false - true - - + diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index 6045307e6..d87ba8f96 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -4,12 +4,12 @@ cli Microsoft .NET Core SDK $(CliBrandingVersion) .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimePackageVersion) Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion) Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion) - Microsoft .NET AppHost Pack $(MicrosoftNETCoreDotNetAppHostPackageVersion) - Microsoft .NET Core Host $(MicrosoftNETCoreDotNetAppHostPackageVersion) - Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreDotNetAppHostPackageVersion) + Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion) + Microsoft .NET Core Host $(SharedHostVersion) + Microsoft .NET Core Host FX Resolver $(HostFxrVersion) Microsoft.NETCore.App $(SharedFrameworkName) Microsoft .NET Core 3.0 Templates diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets index fb6aa70bb..7ffb389a9 100644 --- a/src/redist/targets/BuildCoreSdkTasks.targets +++ b/src/redist/targets/BuildCoreSdkTasks.targets @@ -38,5 +38,6 @@ + diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 1407022c5..0bc21a0b1 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -91,13 +91,21 @@ + - + + @@ -105,14 +113,10 @@ - - - - - diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 3f9abbe7b..47adeabea 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -4,17 +4,17 @@ DependsOnTargets="SetSdkBrandingInfo"> - runtime.$(SharedFrameworkRid).microsoft.netcore.app + microsoft.netcore.app.runtime.$(SharedFrameworkRid) <_crossDir Condition="'$(Architecture)' == 'arm64'">/x64_arm64 <_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">/x86_arm <_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'linux'">/x64_arm - $(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension) + $(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension) $(SharedFrameworkRid) x64_arm64 x86_arm x64_arm - $(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension) - $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension) + $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion) * x86 @@ -24,7 +24,7 @@ PackageToRestore=$(RuntimeNETCoreAppPackageName); - PackageVersionToRestore=$(MicrosoftNETCoreAppPackageVersion); + PackageVersionToRestore=$(MicrosoftNETCoreAppRuntimePackageVersion); TargetFramework=$(TargetFramework) @@ -89,12 +89,6 @@ - - - - true diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b440f78e1..996017818 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -3,72 +3,41 @@ - + Microsoft.NETCoreSdk.BundledVersions.props - - - <_NETStandardLibraryPackageVersions Include="@(PackageDefinitions->'%(Version)')" - Condition="%(PackageDefinitions.Name) == 'NetStandard.Library'" /> - <_NETCorePlatformsPackageVersions Include="@(PackageDefinitions->'%(Version)')" - Condition="%(PackageDefinitions.Name) == 'Microsoft.NETCore.Platforms'" /> - - - - - - <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - <_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct()) - <_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct()) + <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion) + <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) + <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) - true + <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DropSuffix)' != 'true' ">true + <_NETCoreSdkBeingBuiltIsPreview Condition=" '$(DropSuffix)' == 'true' ">false - - - - PackageToRestore=Microsoft.NETCore.App.Internal; - PackageVersionToRestore=$(MicrosoftNETCoreAppInternalPackageVersion); - TargetFramework=$(TargetFramework) - - - - - PackageToRestore=Microsoft.WindowsDesktop.App; - PackageVersionToRestore=$(MicrosoftWindowsDesktopPackageVersion); - TargetFramework=$(TargetFramework) - - - + - - - - - - - - - - - + linux-arm64; + " /> + + - @@ -65,12 +63,12 @@ $(DownloadsFolder)$(DownloadedHostFxrInstallerFileName) dotnet-host $(DownloadsFolder)$(DownloadedSharedHostInstallerFileName) - aspnetcore-runtime-$(AspNetCoreVersion) + aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion) $(AspNetCoreSharedFxDebianPackageFileName.ToLower()) aspnetcore-runtime-$(AspNetCoreMajorMinorVersion) $(AspNetCoreSharedFxDebianPackageName.ToLower()) $(DownloadsFolder)$(DownloadedAspNetCoreSharedFxInstallerFileName) - aspnetcore-targeting-pack-$(AspNetCoreVersion) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion) $(AspNetTargetingPackDebianPackageFileName.ToLower()) aspnetcore-targeting-pack-$(AspNetCoreMajorMinorVersion) $(AspNetTargetingPackDebianPackageName.ToLower()) @@ -159,15 +157,20 @@ $(SdkBrandName) - $(MicrosoftNETCoreAppPackageVersionWithTilde) + $(MicrosoftNETCoreAppRuntimePackageVersionWithTilde) + + + $(MicrosoftNETCoreAppRefPackageVersionWithTilde) $(NetStandardTargetingPackPackageVersionWithTilde) - $(AspNetCoreVersionWithTilde) + $(AspNetCoreRuntimeVersionWithTilde) + + + $(AspNetCoreRefVersionWithTilde) - $(SdkVersion) @@ -191,7 +194,8 @@ GenerateDebsInner"/> - - - - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftNETCoreAppInternalPackageVersion) + + + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 - + $(RedistLayoutPath)sdk\$(SdkVersion)\ @@ -49,12 +54,12 @@ dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime-deps-$(SharedHostVersion)-$(RuntimeDepsInstallerFileRid)$(InstallerExtension) - windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1]) @@ -62,21 +67,21 @@ $(CoreSetupRid) $(ProductMonikerRid) linux-$(Architecture) - dotnet-runtime-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) linux-x64 $(AspNetCoreSharedFxInstallerRid) x64 - aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib - aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension) - aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension) - aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) - windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) + aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) + windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) aspnetcore_base_runtime.version @@ -86,7 +91,7 @@ $(CoreSetupBlobRootUrl)Runtime/ $(CoreSetupBlobRootUrl)aspnetcore/Runtime/ $(CoreSetupRootUrl) - $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimePackageVersion) $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) @@ -97,7 +102,7 @@ - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimePackageVersion) $(CombinedFrameworkHostCompressedFileName) $(CoreSetupBlobAccessTokenParam) @@ -105,7 +110,7 @@ Microsoft.NETCore.App.Ref - $(NetCoreAppTargetingPackVersion) + $(MicrosoftNETCoreAppRefPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) @@ -119,77 +124,77 @@ Microsoft.AspNetCore.App.Ref - $(AspNetTargetingPackVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) Microsoft.NETCore.App.Host.$(SharedFrameworkRid) - $(NetCoreAppHostPackVersion) + $(MicrosoftNETCoreAppHostPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) Microsoft.NETCore.App.Host.$(AlternateAppHostRid) - $(NetCoreAppHostPackVersion) + $(MicrosoftNETCoreAppHostPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedRuntimeDepsInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedSharedFrameworkInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(SharedHostVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedSharedHostInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(HostFxrVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedHostFxrInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(NetCoreAppTargetingPackVersion) + $(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion) $(DownloadedNetCoreAppTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(CoreSetupRootUrl)$(NETStandardTargetingPackBlobVersion) $(DownloadedNetStandardTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedNetCoreAppHostPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion) + $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackBlobVersion) $(DownloadedWindowsDesktopTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) @@ -204,7 +209,7 @@ - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(AspNetCoreSharedFxArchiveFileName) $(CoreSetupBlobAccessTokenParam) @@ -214,7 +219,7 @@ https://github.com/aspnet/AspNetCore/issues/8806 --> - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion) $(AspNetTargetingPackArchiveFileName) $(CoreSetupBlobAccessTokenParam) @@ -222,21 +227,22 @@ - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) + $(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion) + $(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion) $(DownloadedAspNetTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(DownloadedAspNetCoreSharedFxInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion) $(AspNetCoreSharedFxBaseRuntimeVersionFileName) $(CoreSetupBlobAccessTokenParam) @@ -251,20 +257,20 @@ Microsoft.WindowsDesktop.App.Ref - $(WindowsDesktopTargetingPackVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) - $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) + $(WinFormsAndWpfSharedFxRootUrl)$(CoreSetupBlobVersion) $(WinFormsAndWpfSharedFxArchiveFileName) $(CoreSetupBlobAccessTokenParam) - $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) + $(WinFormsAndWpfSharedFxRootUrl)$(CoreSetupBlobVersion) $(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName) $(CoreSetupBlobAccessTokenParam) @@ -356,7 +362,7 @@ "version": ".*" - "version": "$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)" + "version": "$(MicrosoftNETCoreAppRuntimePackageVersion)" @@ -377,7 +383,7 @@ - Microsoft.NETCore.App.Host.$(SharedFrameworkRid) + Microsoft.NETCore.App.Host.$(SharedFrameworkRid) $(IntermediateOutputPath)AppHostRestore\ $(SdkOutputDirectory)AppHostTemplate @@ -388,8 +394,8 @@ - PackageToRestore=$(NETCoreDotNetAppHostPackageName); - PackageVersionToRestore=$(MicrosoftNETCoreDotNetAppHostPackageVersion); + PackageToRestore=$(NETCoreAppHostPackageName); + PackageVersionToRestore=$(MicrosoftNETCoreAppHostPackageVersion); TargetFramework=$(TargetFramework); RestorePackagesPath=$(AppHostRestorePath); RuntimeIdentifier=$(Rid) @@ -414,7 +420,7 @@ + Text="Failed to determine the $(NETCoreAppHostPackageName) executable in @(AllFileOfRestoredAppHostPackage)" /> diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets index 6c88d2edb..1234883a7 100644 --- a/src/redist/targets/GeneratePKG.targets +++ b/src/redist/targets/GeneratePKG.targets @@ -7,8 +7,8 @@ com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.x64 com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.x64 com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppPackageVersion).component.osx.x64 - com.microsoft.dotnet.pack.targeting.$(NetCoreAppTargetingPackVersion).component.osx.x64 - com.microsoft.dotnet.pack.apphost.$(NetCoreAppHostPackVersion).component.osx.x64 + com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppRefPackageVersion).component.osx.x64 + com.microsoft.dotnet.pack.apphost.$(MicrosoftNETCoreAppHostPackageVersion).component.osx.x64 com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.x64 com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64 com.microsoft.dotnet.dev.$(SdkVersion).osx.x64 @@ -94,10 +94,10 @@ $(SdkVersion) - $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) - $(AspNetCoreVersion) + $(MicrosoftAspNetCoreAppRuntimePackageVersion) diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 3f5a07e08..bc8250c62 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -78,13 +78,19 @@ - $(MicrosoftNETCoreAppMajorMinorPatchVersion) + $(MicrosoftNETCoreAppRuntimeMajorMinorPatchVersion) + + + $(MicrosoftNETCoreAppRefMajorMinorPatchVersion) $(NetStandardTargetingPackMajorMinorPatchVersion) - $(AspNetCoreMajorMinorPatchVersion) + $(AspNetCoreRuntimeMajorMinorPatchVersion) + + + $(AspNetCoreRefMajorMinorPatchVersion) $(SharedFxRpmPackageName) @@ -199,20 +205,20 @@ $(MicrosoftNETCoreAppMajorMinorVersion) - $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) dotnet-runtime-$(SharedFxRpmPackageVersion) $(SharedFxRpmPackageName.ToLower()) dotnet-runtime-$(SharedFxRpmPackageFileVersion) $(SharedFxRpmPackageFileName.ToLower()) dotnet-targeting-pack-$(SharedFxRpmPackageVersion) $(NetCoreAppTargetingPackRpmPackageName.ToLower()) - dotnet-targeting-pack-$(SharedFxRpmPackageFileVersion) + dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion) $(NetCoreAppTargetingPackRpmPackageFileName.ToLower()) dotnet-apphost-pack-$(SharedFxRpmPackageVersion) $(NetCoreAppHostPackRpmPackageName.ToLower()) dotnet-apphost-pack-$(SharedFxRpmPackageFileVersion) $(NetCoreAppHostPackRpmPackageFileName.ToLower()) - netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion.Split('.')[0]).$(NETStandardLibraryRefPackageVersion.Split('.')[1]) + netstandard-targeting-pack-$(NetStandardTargetingPackMajorMinorVersion) $(NetStandardTargetingPackRpmPackageName.ToLower()) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion) $(NetStandardTargetingPackRpmPackageFileName.ToLower()) @@ -223,11 +229,11 @@ dotnet-host aspnetcore-runtime-$(AspNetCoreMajorMinorVersion) $(AspNetCoreSharedFxRpmPackageName.ToLower()) - aspnetcore-runtime-$(AspNetCoreVersion) + aspnetcore-runtime-$(MicrosoftAspNetCoreRuntimePackageVersion) $(AspNetCoreSharedFxRpmPackageFileName.ToLower()) aspnetcore-targeting-pack-$(AspNetCoreMajorMinorVersion) $(AspNetTargetingPackRpmPackageName.ToLower()) - aspnetcore-targeting-pack-$(AspNetCoreVersion) + aspnetcore-targeting-pack-$(MicrosoftAspNetCoreRefPackageVersion) $(AspNetTargetingPackRpmPackageFileName.ToLower()) $(ScriptsDir)/$(AfterInstallHostScriptName) $(RpmLayoutScripts)/$(AfterInstallHostScriptName) diff --git a/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets b/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets index 324bcdc37..82482b22a 100644 --- a/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets +++ b/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets @@ -1,43 +1,34 @@ - - $([MSBuild]::Add($(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.IndexOf('.')), 1)) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.IndexOf('.', $(MicrosoftNETCoreAppPatchSeparatorIndex))) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.Substring(0, $(MicrosoftNETCoreAppPatchSeparatorIndex))) + + + + + - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.IndexOf('-')) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.Substring(0, $(MicrosoftNETCoreAppVersionPreReleaseSeparator))) - $([MSBuild]::Add($(MicrosoftNETCoreAppVersionPreReleaseSeparator), 1)) - $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion.Substring($(MicrosoftNETCoreAppVersionPreReleaseSeparatorStartIndex))) - $(MicrosoftNETCoreAppMajorMinorPatchVersion) - $(MicrosoftNETCoreAppMajorMinorPatchVersion)~$(MicrosoftNETCoreVersionSuffix) + + + - $(NETStandardLibraryRefPackageVersion.IndexOf('-')) - $(NETStandardLibraryRefPackageVersion) - $(NETStandardLibraryRefPackageVersion.Substring(0, $(NetStandardTargetingPackVersionPreReleaseSeparator))) - $([MSBuild]::Add($(NetStandardTargetingPackVersionPreReleaseSeparator), 1)) - $(NETStandardLibraryRefPackageVersion.Substring($(NetStandardTargetingPackVersionPreReleaseSeparatorStartIndex))) - $(NetStandardTargetingPackMajorMinorPatchVersion) - $(NetStandardTargetingPackMajorMinorPatchVersion)~$(NetStandardTargetingPackVersionSuffix) + + + + + - $([MSBuild]::Add($(AspNetCoreVersion.IndexOf('.')), 1)) - $(AspNetCoreVersion.IndexOf('.', $(AspNetCoreVersionPatchSeparatorIndex))) - $(AspNetCoreVersion.Substring(0, $(AspNetCoreVersionPatchSeparatorIndex))) + + + - $(AspNetCoreVersion.IndexOf('-')) - $(AspNetCoreVersion) - $(AspNetCoreVersion.Substring(0, $(AspNetCoreVersionPreReleaseSeparator))) - $([MSBuild]::Add($(AspNetCoreVersionPreReleaseSeparator), 1)) - $(AspNetCoreVersion.Substring($(AspNetCoreVersionPreReleaseSeparatorStartIndex))) - $(AspNetCoreMajorMinorPatchVersion) - $(AspNetCoreMajorMinorPatchVersion)~$(AspNetCoreVersionSuffix) + + + - $([MSBuild]::Add($(HostFxrVersion.IndexOf('.')), 1)) - $(HostFxrVersion.IndexOf('.', $(HostFxrVersionPatchSeparatorIndex))) - $(HostFxrVersion.Substring(0, $(HostFxrVersionPatchSeparatorIndex))) - - + + + + + diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json index 35a0f433f..bb4432fe8 100644 --- a/src/redist/targets/packaging/deb/dotnet-debian_config.json +++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json @@ -30,10 +30,10 @@ "debian_dependencies":{ "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%, - "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, + "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_VERSION%" }, "%NETCORE_APPHOST_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" }, "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" }, - "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" } + "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_VERSION%" } } } diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index fd090e2d8..c7fb4d267 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -28,7 +28,7 @@ }, { "package_name": "%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_NAME%", - "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%" + "package_version": "%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_VERSION%" }, { "package_name": "%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%", @@ -44,7 +44,7 @@ }, { "package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%", - "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" + "package_version": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_VERSION%" } ], "directories": [ From 1a42271c693243952f583bb9306a4996087f712b Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 3 Oct 2019 12:41:42 -0700 Subject: [PATCH 09/38] Update dependencies from .NET Core 3 Release --- NuGet.config | 2 +- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++++----------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index 947b1b278..7317a32a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1087b48b6..00e3359ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,30 +6,30 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 @@ -45,41 +45,41 @@ https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + a3fd9237f6f104081db1ae3e9727d0f88029bda6 - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + a3fd9237f6f104081db1ae3e9727d0f88029bda6 - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + a3fd9237f6f104081db1ae3e9727d0f88029bda6 - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + a3fd9237f6f104081db1ae3e9727d0f88029bda6 - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + a3fd9237f6f104081db1ae3e9727d0f88029bda6 https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 78da18674ad084d58311d36b5354925a8bef62fc + d62b7c37ab654e5019131ec3c0418d0a23639a31 https://github.com/dotnet/sdk 3819a21a612cd8bc15b6f6c4e361d18490469577 - + https://github.com/dotnet/cli - 11f4a837a9d746af3b7d72767ab06c5a64c772f9 + 850536d605a5a84ee573760b755608ab596146de diff --git a/eng/Versions.props b/eng/Versions.props index 32bb8cc4e..1542e1260 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19502.7 + 3.0.101-servicing.19503.4 @@ -24,16 +24,16 @@ - 3.0.0 + 3.0.1-servicing.19502.3 3.0.0 - 3.0.0-rc2.19465.2 - 3.0.0-rc2.19465.2 - 3.0.0-rc2.19465.2 - 3.0.0-rc2.19465.2 + 3.0.1-servicing.19502.3 + 3.0.1-servicing.19502.3 + 3.0.1-servicing.19502.3 + 3.0.1-servicing.19502.3 - 3.0.101-servicing.19502.3 + 3.0.101-servicing.19503.1 0.2.0 @@ -49,12 +49,12 @@ - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 + 3.0.1-servicing-19502-23 + 3.0.1 + 3.0.1 3.0.0 - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 + 3.0.1 + 3.0.1 3.0.0 2.1.0 From 7e7edccc7ce35623ca600cb1cd633df6e99753c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 16:05:00 +0000 Subject: [PATCH 10/38] Update dependencies from https://github.com/dotnet/toolset build 20191003.12 (#5099) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19503.12 --- 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 e0c3fb6d3..ec3e1aa31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - bd52157c0d2b3a13879680e8a86766bfc973380f + 9e5a25d7168a2247c812ee6d6ae2917cb42b34b6 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 15797f706..2532c79fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19503.10 + 3.0.101-servicing.19503.12 From 10d79303457e0329524fe2749fc81357e8744544 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 02:11:08 +0000 Subject: [PATCH 11/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5112) * Update dependencies from https://github.com/dotnet/toolset build 20191004.23 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19504.23 * Update dependencies from https://github.com/dotnet/toolset build 20191004.29 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19504.29 --- NuGet.config | 2 ++ eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7317a32a4..3481c8874 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec3e1aa31..c703c2780 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 9e5a25d7168a2247c812ee6d6ae2917cb42b34b6 + 287f79cb5c3eb45fe0445252f8471a13636f66da https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2532c79fa..26c756c88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19503.12 + 3.0.101-servicing.19504.29 From 54ee737e0366f4f759b84a0e11474b971f92b33c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 14:10:34 +0000 Subject: [PATCH 12/38] Update dependencies from https://github.com/dotnet/core-setup build 20191006.06 (#5156) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.DotNetHostResolver - 3.0.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.App.Host.win-x64 - 3.0.1 - Microsoft.NETCore.App.Internal - 3.0.1-servicing-19506-06 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Internal) --- NuGet.config | 3 ++- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3481c8874..08e5a032b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,9 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c703c2780..fa2ef1fba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,37 +8,37 @@ https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + f8bfa4242fb299c1d1a635c069dbfec7870a023b https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + f8bfa4242fb299c1d1a635c069dbfec7870a023b https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + f8bfa4242fb299c1d1a635c069dbfec7870a023b https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + f8bfa4242fb299c1d1a635c069dbfec7870a023b https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + f8bfa4242fb299c1d1a635c069dbfec7870a023b https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 54d63c3e283e0c3937a35ab4e99f391c84ff119e + 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea diff --git a/eng/Versions.props b/eng/Versions.props index 26c756c88..7f60f8ee3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,11 +45,11 @@ - 3.0.1-servicing.19501.4 + 3.0.0 - 3.0.1-servicing-19502-23 + 3.0.1-servicing-19506-06 3.0.1 3.0.1 3.0.0 From 43f1bfc74085c347139a7240378558cb03128ff9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 14:15:33 +0000 Subject: [PATCH 13/38] Update dependencies from https://github.com/dotnet/toolset build 20191006.18 (#5158) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19506.18 --- 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 fa2ef1fba..1b2550cd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 287f79cb5c3eb45fe0445252f8471a13636f66da + 279a5eefb1cbd35d4ae6d15f87d7dbe85494912f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7f60f8ee3..4a9f0f3d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19504.29 + 3.0.101-servicing.19506.18 From 902ae5f8e329783b1be79a7036d9d484eca3a40d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 7 Oct 2019 13:11:06 -0700 Subject: [PATCH 14/38] [release/3.0.1xx] Publish SDK bits to a suffixed location (#5078) * Publish SDK bits to a suffixed location Also, when DropSuffix==true, copy all files that contain the stable sdk version to a file containing the non-stable file name --- eng/Publishing.props | 46 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index ed7bbcd19..6626f263b 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -58,26 +58,62 @@ BeforeTargets="Publish" DependsOnTargets="SetSdkVersionInfo" Condition=" '$(PublishSdkAssetsAndChecksumsToBlob)' == 'true' "> + + + + + $(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(SdkVersion)' ,'$(FullNuGetVersion)')) + + + $(ArtifactsShippingPackagesDir)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('$(SdkVersion)' ,'$(FullNuGetVersion)')) + + + + + + + + + + + - $(BlobStoragePartialRelativePath)/$(SdkVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/')) + $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) - $(BlobStoragePartialRelativePath)/$(SdkVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/')) + $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) NonShipping=true - $(BlobStoragePartialRelativePath)/$(SdkVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/')) + $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) + + + $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) + NonShipping=true + + + + $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) + NonShipping=true + Date: Mon, 7 Oct 2019 22:28:57 +0000 Subject: [PATCH 15/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5160) * Update dependencies from https://github.com/dotnet/toolset build 20191007.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19507.3 * Update dependencies from https://github.com/dotnet/toolset build 20191007.20 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19507.20 --- 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 1b2550cd6..235e2d617 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 279a5eefb1cbd35d4ae6d15f87d7dbe85494912f + 5ca4f7fa1be45a1c339293e238d38267667bffe9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 4a9f0f3d3..d50533ed8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19506.18 + 3.0.101-servicing.19507.20 From bf84eb972786d3d7f74304a6b76903ded0fbb748 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2019 07:15:42 +0000 Subject: [PATCH 16/38] Update dependencies from https://github.com/aspnet/AspNetCore build 20191007.30 (#5169) - dotnet-user-secrets - 3.0.1-servicing.19507.30 - dotnet-watch - 3.0.1-servicing.19507.30 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1-servicing.19507.30 - dotnet-dev-certs - 3.0.1-servicing.19507.30 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19507.30 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 235e2d617..65ee3f40f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,25 +45,25 @@ https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - a3fd9237f6f104081db1ae3e9727d0f88029bda6 + 354d859d50f252526be5a6264434d1765df86450 - + https://github.com/aspnet/AspNetCore - a3fd9237f6f104081db1ae3e9727d0f88029bda6 + 354d859d50f252526be5a6264434d1765df86450 - + https://github.com/aspnet/AspNetCore - a3fd9237f6f104081db1ae3e9727d0f88029bda6 + 354d859d50f252526be5a6264434d1765df86450 - + https://github.com/aspnet/AspNetCore - a3fd9237f6f104081db1ae3e9727d0f88029bda6 + 354d859d50f252526be5a6264434d1765df86450 - + https://github.com/aspnet/AspNetCore - a3fd9237f6f104081db1ae3e9727d0f88029bda6 + 354d859d50f252526be5a6264434d1765df86450 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index d50533ed8..c76ea3dde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.1-servicing.19502.3 + 3.0.1-servicing.19507.30 3.0.0 - 3.0.1-servicing.19502.3 - 3.0.1-servicing.19502.3 - 3.0.1-servicing.19502.3 - 3.0.1-servicing.19502.3 + 3.0.1-servicing.19507.30 + 3.0.1-servicing.19507.30 + 3.0.1-servicing.19507.30 + 3.0.1-servicing.19507.30 From f08e8bc516c2d598c8b0fba247bf8eac5e329a91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2019 09:02:53 +0000 Subject: [PATCH 17/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5168) * Update dependencies from https://github.com/dotnet/toolset build 20191007.22 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19507.22 * Update dependencies from https://github.com/dotnet/toolset build 20191008.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19508.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 65ee3f40f..a2eefe2ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 5ca4f7fa1be45a1c339293e238d38267667bffe9 + 6a8609fc2c10ee908977238e5c6bc48b926491da https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c76ea3dde..b6a086755 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19507.20 + 3.0.101-servicing.19508.1 From d467590baeab9e1d2a9889c62ab255154d359eb8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2019 01:00:37 +0000 Subject: [PATCH 18/38] Update dependencies from https://github.com/aspnet/AspNetCore build 20191009.5 (#5187) - dotnet-user-secrets - 3.0.1-servicing.19509.5 - dotnet-watch - 3.0.1-servicing.19509.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1-servicing.19509.5 - dotnet-dev-certs - 3.0.1-servicing.19509.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19509.5 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2eefe2ec..d686ba5bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,25 +45,25 @@ https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - 354d859d50f252526be5a6264434d1765df86450 + c0a7f04370054e3625f93350237596046fa9534b - + https://github.com/aspnet/AspNetCore - 354d859d50f252526be5a6264434d1765df86450 + c0a7f04370054e3625f93350237596046fa9534b - + https://github.com/aspnet/AspNetCore - 354d859d50f252526be5a6264434d1765df86450 + c0a7f04370054e3625f93350237596046fa9534b - + https://github.com/aspnet/AspNetCore - 354d859d50f252526be5a6264434d1765df86450 + c0a7f04370054e3625f93350237596046fa9534b - + https://github.com/aspnet/AspNetCore - 354d859d50f252526be5a6264434d1765df86450 + c0a7f04370054e3625f93350237596046fa9534b https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index b6a086755..bb7f4bd8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.1-servicing.19507.30 + 3.0.1-servicing.19509.5 3.0.0 - 3.0.1-servicing.19507.30 - 3.0.1-servicing.19507.30 - 3.0.1-servicing.19507.30 - 3.0.1-servicing.19507.30 + 3.0.1-servicing.19509.5 + 3.0.1-servicing.19509.5 + 3.0.1-servicing.19509.5 + 3.0.1-servicing.19509.5 From eca83bd9b1ada6787cb9c125434c6e35707a6bdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2019 21:01:06 +0000 Subject: [PATCH 19/38] Update dependencies from https://github.com/dotnet/core-setup build 20191010.08 (#5194) - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.App.Host.win-x64 - 3.0.1 - Microsoft.NETCore.App.Internal - 3.0.1-servicing-19510-08 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.DotNetHostResolver - 3.0.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 08e5a032b..3a5f25c60 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d686ba5bc..0b2c9905e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,28 +8,28 @@ https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf https://github.com/dotnet/core-setup - f8bfa4242fb299c1d1a635c069dbfec7870a023b + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf diff --git a/eng/Versions.props b/eng/Versions.props index bb7f4bd8c..574922c59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,7 +49,7 @@ - 3.0.1-servicing-19506-06 + 3.0.1-servicing-19510-08 3.0.1 3.0.1 3.0.0 From 35d2ba41af4ef5080473a8038a6a66556a7e02c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2019 22:45:50 +0000 Subject: [PATCH 20/38] Update dependencies from https://github.com/dotnet/core-setup build 20191010.13 (#5195) - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.App.Host.win-x64 - 3.0.1 - Microsoft.NETCore.App.Internal - 3.0.1-servicing-19510-13 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.DotNetHostResolver - 3.0.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a5f25c60..0b4a333c5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b2c9905e..a18e22298 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,28 +8,28 @@ https://github.com/dotnet/core-setup - 903ca49e3ffddc551e12d2f94d7cca95f9a340bf + ee7dbc9e064bf59f822c5310b89e0e996ccc0d58 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 903ca49e3ffddc551e12d2f94d7cca95f9a340bf + ee7dbc9e064bf59f822c5310b89e0e996ccc0d58 https://github.com/dotnet/core-setup - 903ca49e3ffddc551e12d2f94d7cca95f9a340bf + ee7dbc9e064bf59f822c5310b89e0e996ccc0d58 https://github.com/dotnet/core-setup - 903ca49e3ffddc551e12d2f94d7cca95f9a340bf + ee7dbc9e064bf59f822c5310b89e0e996ccc0d58 https://github.com/dotnet/core-setup - 903ca49e3ffddc551e12d2f94d7cca95f9a340bf + ee7dbc9e064bf59f822c5310b89e0e996ccc0d58 diff --git a/eng/Versions.props b/eng/Versions.props index 574922c59..73d3acbde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,7 +49,7 @@ - 3.0.1-servicing-19510-08 + 3.0.1-servicing-19510-13 3.0.1 3.0.1 3.0.0 From 91de21e0a641a133d9941257517bac0a5358cf3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2019 23:27:34 +0000 Subject: [PATCH 21/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5189) * Update dependencies from https://github.com/dotnet/toolset build 20191010.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19510.1 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19509.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191010.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19510.4 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19509.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191010.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19510.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19509.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a18e22298..9356570d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,13 +69,13 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 6a8609fc2c10ee908977238e5c6bc48b926491da + 7787ccf9e8ec10aaa2a379dce3d593f280c39910 - + https://github.com/dotnet/sdk - 3819a21a612cd8bc15b6f6c4e361d18490469577 + 6af203a52b82e8c2d7fc4a6872827961fc4c7903 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 73d3acbde..4d4706665 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19508.1 + 3.0.101-servicing.19510.5 @@ -40,7 +40,7 @@ - 3.0.101-servicing.19477.3 + 3.0.101-servicing.19509.1 $(MicrosoftNETSdkPackageVersion) From aa17a066ac3c19c6923c480214441d4538bedeb7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 00:15:42 +0000 Subject: [PATCH 22/38] Update dependencies from https://github.com/dotnet/toolset build 20191010.6 (#5196) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19510.6 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19510.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9356570d9..11ed1a5f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,13 +69,13 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 7787ccf9e8ec10aaa2a379dce3d593f280c39910 + 459e81f3838abe4cc705852c8e23d78a51600975 - + https://github.com/dotnet/sdk - 6af203a52b82e8c2d7fc4a6872827961fc4c7903 + 8b51d481cdb816369e375fe9a36d47a83a3d92a9 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 4d4706665..d26573aa9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19510.5 + 3.0.101-servicing.19510.6 @@ -40,7 +40,7 @@ - 3.0.101-servicing.19509.1 + 3.0.101-servicing.19510.1 $(MicrosoftNETSdkPackageVersion) From 284936c7c07f56b5e27a3d583933b567c5b81010 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 00:55:46 +0000 Subject: [PATCH 23/38] Update dependencies from https://github.com/aspnet/AspNetCore build 20191010.7 (#5198) - dotnet-user-secrets - 3.0.1-servicing.19510.7 - dotnet-watch - 3.0.1-servicing.19510.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1-servicing.19510.7 - dotnet-dev-certs - 3.0.1-servicing.19510.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19510.7 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11ed1a5f4..3cac9e7b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,25 +45,25 @@ https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - c0a7f04370054e3625f93350237596046fa9534b + 8c39137944717cc4118efe9ee251e86cd16083cd - + https://github.com/aspnet/AspNetCore - c0a7f04370054e3625f93350237596046fa9534b + 8c39137944717cc4118efe9ee251e86cd16083cd - + https://github.com/aspnet/AspNetCore - c0a7f04370054e3625f93350237596046fa9534b + 8c39137944717cc4118efe9ee251e86cd16083cd - + https://github.com/aspnet/AspNetCore - c0a7f04370054e3625f93350237596046fa9534b + 8c39137944717cc4118efe9ee251e86cd16083cd - + https://github.com/aspnet/AspNetCore - c0a7f04370054e3625f93350237596046fa9534b + 8c39137944717cc4118efe9ee251e86cd16083cd https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index d26573aa9..c8e5a5444 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.1-servicing.19509.5 + 3.0.1-servicing.19510.7 3.0.0 - 3.0.1-servicing.19509.5 - 3.0.1-servicing.19509.5 - 3.0.1-servicing.19509.5 - 3.0.1-servicing.19509.5 + 3.0.1-servicing.19510.7 + 3.0.1-servicing.19510.7 + 3.0.1-servicing.19510.7 + 3.0.1-servicing.19510.7 From 719f57cc08af4a56b904a86938b4e17515660506 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 03:26:53 +0000 Subject: [PATCH 24/38] Update dependencies from https://github.com/dotnet/toolset build 20191010.7 (#5201) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19510.7 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cac9e7b7..01f8966e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,13 +69,13 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 459e81f3838abe4cc705852c8e23d78a51600975 + af0f8002c0cf0871e1bea982dfdc6fb8da026e9c - + https://github.com/dotnet/sdk - 8b51d481cdb816369e375fe9a36d47a83a3d92a9 + dc6f52268517e279bc001aec4520585d9b040e41 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index c8e5a5444..a269cef08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19510.6 + 3.0.101-servicing.19510.7 @@ -40,7 +40,7 @@ - 3.0.101-servicing.19510.1 + 3.0.101-servicing.19510.7 $(MicrosoftNETSdkPackageVersion) From 87102f9b2cbeada9034212299c5d981e9a2bac49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 06:26:11 +0000 Subject: [PATCH 25/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5204) * Update dependencies from https://github.com/dotnet/toolset build 20191010.8 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19510.8 * Update dependencies from https://github.com/dotnet/toolset build 20191010.10 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19510.10 --- 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 01f8966e7..89ddd3891 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - af0f8002c0cf0871e1bea982dfdc6fb8da026e9c + 526e288c7a7fdb0982896ff17958c19fbd700cb1 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a269cef08..2acb4aaad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19510.7 + 3.0.101-servicing.19510.10 From c9eb9e8850e1d4a51b9568691999f6a5034275fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 18:01:03 +0000 Subject: [PATCH 26/38] Update dependencies from https://github.com/dotnet/core-setup build 20191011.02 (#5210) - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.App.Host.win-x64 - 3.0.1 - Microsoft.NETCore.App.Internal - 3.0.1-servicing-19511-02 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.DotNetHostResolver - 3.0.1 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.1-servicing.19510.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b4a333c5..1a6c8fd07 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,8 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89ddd3891..a1a3bbddf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,28 +8,28 @@ https://github.com/dotnet/core-setup - ee7dbc9e064bf59f822c5310b89e0e996ccc0d58 + 19942e71998242599a0b6d4496066eaa38588af5 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - ee7dbc9e064bf59f822c5310b89e0e996ccc0d58 + 19942e71998242599a0b6d4496066eaa38588af5 https://github.com/dotnet/core-setup - ee7dbc9e064bf59f822c5310b89e0e996ccc0d58 + 19942e71998242599a0b6d4496066eaa38588af5 https://github.com/dotnet/core-setup - ee7dbc9e064bf59f822c5310b89e0e996ccc0d58 + 19942e71998242599a0b6d4496066eaa38588af5 https://github.com/dotnet/core-setup - ee7dbc9e064bf59f822c5310b89e0e996ccc0d58 + 19942e71998242599a0b6d4496066eaa38588af5 @@ -86,9 +86,9 @@ https://github.com/dotnet/winforms af088e57775b7b9f28322511bc5be8ddb356b8a8 - + https://github.com/dotnet/wpf - d4121027999cb01b941481c774b42a2193775b93 + a4f24b6a7849ad33e29a50bd1d607f424953013b diff --git a/eng/Versions.props b/eng/Versions.props index 2acb4aaad..ce80efc34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.1-servicing.19480.1 + 3.0.1-servicing.19510.3 @@ -49,7 +49,7 @@ - 3.0.1-servicing-19510-13 + 3.0.1-servicing-19511-02 3.0.1 3.0.1 3.0.0 From 80738a98d1368dbb7bcb178affd1807fed9878fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 19:56:39 +0000 Subject: [PATCH 27/38] Update dependencies from https://github.com/dotnet/toolset build 20191011.3 (#5211) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19511.3 --- 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 a1a3bbddf..d35eeaf30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 526e288c7a7fdb0982896ff17958c19fbd700cb1 + 2d1d297e8c22663f06c6bdee30d0e2cf86d8d336 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ce80efc34..e557fb17a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19510.10 + 3.0.101-servicing.19511.3 From 7ec0d041d64e0f36d59144ae9c45d298ba0e42ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2019 15:16:50 +0000 Subject: [PATCH 28/38] Update dependencies from https://github.com/aspnet/AspNetCore build 20191010.13 (#5202) - dotnet-user-secrets - 3.0.1-servicing.19510.13 - dotnet-watch - 3.0.1-servicing.19510.13 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1-servicing.19510.13 - dotnet-dev-certs - 3.0.1-servicing.19510.13 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.1-servicing.19510.13 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d35eeaf30..c8a67e4e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -45,25 +45,25 @@ https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - 8c39137944717cc4118efe9ee251e86cd16083cd + 4d30facbaf0054b97310facded459157cb617955 - + https://github.com/aspnet/AspNetCore - 8c39137944717cc4118efe9ee251e86cd16083cd + 4d30facbaf0054b97310facded459157cb617955 - + https://github.com/aspnet/AspNetCore - 8c39137944717cc4118efe9ee251e86cd16083cd + 4d30facbaf0054b97310facded459157cb617955 - + https://github.com/aspnet/AspNetCore - 8c39137944717cc4118efe9ee251e86cd16083cd + 4d30facbaf0054b97310facded459157cb617955 - + https://github.com/aspnet/AspNetCore - 8c39137944717cc4118efe9ee251e86cd16083cd + 4d30facbaf0054b97310facded459157cb617955 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index e557fb17a..7d4e4c671 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.1-servicing.19510.7 + 3.0.1-servicing.19510.13 3.0.0 - 3.0.1-servicing.19510.7 - 3.0.1-servicing.19510.7 - 3.0.1-servicing.19510.7 - 3.0.1-servicing.19510.7 + 3.0.1-servicing.19510.13 + 3.0.1-servicing.19510.13 + 3.0.1-servicing.19510.13 + 3.0.1-servicing.19510.13 From 0a17d2519f6951cc1fdfc5d2792ca4aacc7219b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2019 16:10:38 +0000 Subject: [PATCH 29/38] Update dependencies from https://github.com/dotnet/toolset build 20191012.2 (#5219) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19512.2 --- 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 c8a67e4e8..879eb82f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 2d1d297e8c22663f06c6bdee30d0e2cf86d8d336 + ec938fd8609305683c5af0ded1afbc1343814334 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7d4e4c671..83730e9f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19511.3 + 3.0.101-servicing.19512.2 From a304af5d8710348ed100e42b3dc912ffc72db15a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 18:56:18 +0000 Subject: [PATCH 30/38] Update dependencies from https://github.com/dotnet/toolset build 20191016.8 (#5246) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19516.8 --- 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 879eb82f2..5ee3337bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - ec938fd8609305683c5af0ded1afbc1343814334 + 6ef2cec7fc06d11309ccb418732de9ac7d3b0f6e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 83730e9f3..f8714108d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19512.2 + 3.0.101-servicing.19516.8 From 9d2e5f51b0822e35105adc4d193d0f066cac26f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 01:59:36 +0000 Subject: [PATCH 31/38] [release/3.0.1xx] Update dependencies from dotnet/core-setup (#5245) * Update dependencies from https://github.com/dotnet/core-setup build 20191016.03 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.App.Host.win-x64 - 3.0.1 - Microsoft.NETCore.App.Internal - 3.0.1-servicing-19516-03 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.DotNetHostResolver - 3.0.1 * Update dependencies from https://github.com/dotnet/core-setup build 20191016.12 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.App.Host.win-x64 - 3.0.1 - Microsoft.NETCore.App.Internal - 3.0.1-servicing-19516-12 - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 - Microsoft.NETCore.DotNetHostResolver - 3.0.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a6c8fd07..b88b1688e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ee3337bb..baad41659 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,28 +8,28 @@ https://github.com/dotnet/core-setup - 19942e71998242599a0b6d4496066eaa38588af5 + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 19942e71998242599a0b6d4496066eaa38588af5 + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/core-setup - 19942e71998242599a0b6d4496066eaa38588af5 + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/core-setup - 19942e71998242599a0b6d4496066eaa38588af5 + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/core-setup - 19942e71998242599a0b6d4496066eaa38588af5 + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 diff --git a/eng/Versions.props b/eng/Versions.props index f8714108d..dc2089c06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,7 +49,7 @@ - 3.0.1-servicing-19511-02 + 3.0.1-servicing-19516-12 3.0.1 3.0.1 3.0.0 From e5f00dab05fac0033c370f00ae02020e25b8cbc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 02:45:29 +0000 Subject: [PATCH 32/38] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5251) * Update dependencies from https://github.com/dotnet/toolset build 20191016.18 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19516.18 * Update dependencies from https://github.com/dotnet/toolset build 20191016.19 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19516.19 --- 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 baad41659..6639e301c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,9 +69,9 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 6ef2cec7fc06d11309ccb418732de9ac7d3b0f6e + d8faf9fc85664195c2cecf6c4fbe8d919f99b1f0 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index dc2089c06..3284d8621 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19516.8 + 3.0.101-servicing.19516.19 From 000f311b85b8fcf96ee3176683e05e956d480702 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 18 Oct 2019 17:12:15 -0700 Subject: [PATCH 33/38] Fix merge issues --- Directory.Build.props | 2 +- eng/Versions.props | 6 +++++- global.json | 2 +- src/redist/targets/BundledTemplates.targets | 17 ++++++++++------ src/redist/targets/GenerateLayout.targets | 22 ++++++++++----------- 5 files changed, 29 insertions(+), 20 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 57495f27c..fe43161d7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,7 +13,7 @@ true true - netcoreapp3.0 + netcoreapp3.1 NU5125;NU5105;NU1701 diff --git a/eng/Versions.props b/eng/Versions.props index b007c784c..ee731a97a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,7 +55,11 @@ 3.1.100-preview1.19506.1 $(MicrosoftNETSdkPackageVersion) - + + + 3.1.0-preview2.19514.6 + + 3.1.0-preview2.19516.1 3.1.0-preview2.19516.1 diff --git a/global.json b/global.json index 0ae3965f1..b9160312f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.0.100" + "dotnet": "3.1.100-preview1-014459" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3" diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 89cc2d2f0..f98cef149 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -128,12 +128,6 @@ [$(MicrosoftDotNetCommonItemTemplates30PackageVersion)]; " /> - - + + + + $(CoreSetupBlobVersion) $(CoreSetupBlobVersion) - $(CoreSetupBlobVersion) + $(CoreSetupBlobVersion) 3.0.0 @@ -62,9 +62,9 @@ windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(MicrosoftNETCoreAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension) - dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_arm$(InstallerExtension) - dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension) + dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension) + dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_arm$(InstallerExtension) + dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension) windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1]) @@ -74,7 +74,7 @@ $(ProductMonikerRid) linux-$(Architecture) dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) linux-x64 @@ -86,7 +86,7 @@ aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(InstallerExtension) + aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension) aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) @@ -153,14 +153,14 @@ Microsoft.NETCore.App.Host.$(ArmAppHostRid) - $(NetCoreAppHostPackVersion) + $(MicrosoftNETCoreAppHostPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) Microsoft.NETCore.App.Host.$(Arm64AppHostRid) - $(NetCoreAppHostPackVersion) + $(MicrosoftNETCoreAppHostPackageVersion) $(TargetFramework) packs/%(PackageName)/%(PackageVersion) @@ -217,21 +217,21 @@ - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedAlternateNetCoreAppHostPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedArmNetCoreAppHostPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(CoreSetupRootUrl)$(CoreSetupBlobVersion) $(DownloadedArm64NetCoreAppHostPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) From d7f5510ad0f193d4a7a33f6c7457a19601661669 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 18 Oct 2019 17:16:32 -0700 Subject: [PATCH 34/38] Update dependencies from .NET Core 3.1 Dev --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++---------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dae5ca0d..4927bf516 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,66 +1,66 @@ - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup - f8aac40612d167c5beff554f569897177e786d3a + 3daa0867abd7693bc654d9b02cdfe957428b36f1 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - d6156966c01a8a45a069fecdc68c162f94d9d58d + c4d092f0430a104fa633f1503a1c207b4518f05d - + https://github.com/aspnet/AspNetCore - 84be18b1048236ad163d737b442a4ccf3b10d997 + 19718f6011b9d0124e805af61584fda934a6f982 - + https://github.com/aspnet/AspNetCore - 84be18b1048236ad163d737b442a4ccf3b10d997 + 19718f6011b9d0124e805af61584fda934a6f982 - + https://github.com/aspnet/AspNetCore - 84be18b1048236ad163d737b442a4ccf3b10d997 + 19718f6011b9d0124e805af61584fda934a6f982 - + https://github.com/aspnet/AspNetCore - 84be18b1048236ad163d737b442a4ccf3b10d997 + 19718f6011b9d0124e805af61584fda934a6f982 - + https://github.com/aspnet/AspNetCore - 84be18b1048236ad163d737b442a4ccf3b10d997 + 19718f6011b9d0124e805af61584fda934a6f982 - + https://github.com/aspnet/AspNetCore - 84be18b1048236ad163d737b442a4ccf3b10d997 + 19718f6011b9d0124e805af61584fda934a6f982 https://github.com/dotnet/test-templates @@ -70,26 +70,26 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 1dc7bd5eeaebc0176f07957d59ae3a2dcb1632d7 + b374aa7b01e245cc30da6e6865135c47e1fac851 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 5363e0119503e08b40eea53ff85b02839a86fa44 + 9a07fad357adc090db1c71b42176bd79098b3466 - + https://github.com/dotnet/winforms - 3886eb2dc8384f5490e289a321707ddc454ec45e + ef0fdeda487deb05f2864f11e97f047ed8620e9c - + https://github.com/dotnet/wpf - 8c5494aa7298e8182ccb4639eb52b002458d0158 + cde0da6f9dc9837b93d59d5efac1f0dcc95eb5fb diff --git a/eng/Versions.props b/eng/Versions.props index ee731a97a..d4988c8a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,15 +12,15 @@ preview - 3.1.100-preview2.19517.9 + 3.1.100-preview2.19518.7 - 4.8.1-preview1.19515.8 + 4.8.1-preview1.19517.7 - 3.1.0-preview2.19515.8 + 3.1.0-preview2.19517.1 @@ -36,16 +36,16 @@ - 3.1.0-preview1.19508.20 - 3.1.0-preview1.19508.20 - 3.1.0-preview1.19508.20 - 3.1.0-preview1.19508.20 - 3.1.0-preview1.19508.20 - 3.1.0-preview1.19508.20 + 3.1.0-preview2.19518.3 + 3.1.0-preview2.19518.3 + 3.1.0-preview2.19518.3 + 3.1.0-preview2.19518.3 + 3.1.0-preview2.19518.3 + 3.1.0-preview2.19518.3 - 3.1.100-preview2.19517.1 + 3.1.100-preview2.19518.2 0.2.0 @@ -57,17 +57,17 @@ - 3.1.0-preview2.19514.6 + 3.1.0-preview2.19516.15 - 3.1.0-preview2.19516.1 - 3.1.0-preview2.19516.1 + 3.1.0-preview2.19517.10 + 3.1.0-preview2.19517.10 3.1.0-preview2.19516.1 - 3.1.0-preview2.19516.1 - 3.1.0-preview2.19516.1 - 3.1.0-preview2.19516.1 - 3.1.0-preview2.19516.1 + 3.1.0-preview2.19517.10 + 3.1.0-preview2.19517.10 + 3.1.0-preview2.19517.10 + 3.1.0-preview2.19517.10 2.1.0 From 05ad10ffba2034f33f36ab8bf15d65f9a84231ab Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 18 Oct 2019 18:11:18 -0700 Subject: [PATCH 35/38] Fix build --- eng/Version.Details.xml | 11 ++++++----- eng/Versions.props | 2 +- src/redist/targets/BundledTemplates.targets | 1 + src/redist/targets/GenerateLayout.targets | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4927bf516..699792a2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,7 +17,11 @@ https://github.com/dotnet/core-setup 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + + https://github.com/dotnet/core-setup + 3daa0867abd7693bc654d9b02cdfe957428b36f1 + + https://github.com/dotnet/core-setup 3daa0867abd7693bc654d9b02cdfe957428b36f1 @@ -25,10 +29,7 @@ https://github.com/dotnet/core-setup 3daa0867abd7693bc654d9b02cdfe957428b36f1 - - https://github.com/dotnet/core-setup - 3daa0867abd7693bc654d9b02cdfe957428b36f1 - + https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index d4988c8a6..1fad89461 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ 3.1.0-preview2.19517.10 3.1.0-preview2.19517.10 - 3.1.0-preview2.19516.1 + 3.1.0-preview2.19517.10 3.1.0-preview2.19517.10 3.1.0-preview2.19517.10 3.1.0-preview2.19517.10 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index f98cef149..02c0a1a2c 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -126,6 +126,7 @@ Version="[$(MicrosoftDotNetCommonItemTemplates21PackageVersion)]; [$(MicrosoftDotNetCommonItemTemplates22PackageVersion)]; [$(MicrosoftDotNetCommonItemTemplates30PackageVersion)]; + [$(MicrosoftDotNetCommonItemTemplates31PackageVersion)]; " /> $(CoreSetupBlobVersion) - $(CoreSetupBlobVersion) + $(AspNetCoreBlobVersion) $(CoreSetupBlobVersion) 3.0.0 From 5d6a2e61ba680db27716a79a09c772e71b75d429 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 22 Oct 2019 13:14:33 -0700 Subject: [PATCH 36/38] Fix bundled versions --- .../targets/GenerateBundledVersions.targets | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 0712d23d3..32eac3228 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -14,13 +14,12 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NETCoreApp30PackageVersion>3.0.0 - <_NETCoreApp30TargetingPackVersion>$(_NETCoreApp30PackageVersion) - <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion) - <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) - - <_MicrosoftAspNetCoreApp30PackageVersion>3.0.0 - <_AspNet30TargetingPackVersion>$(_MicrosoftAspNetCoreApp30PackageVersion) + <_NETCoreApp30PRuntimePackVersion>3.0.0 + <_NETCoreApp30TargetingPackVersion>3.0.0 + <_WindowsDesktop30RuntimePackVersion>$(_NETCoreApp30PRuntimePackVersion) + <_WindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) + <_AspNet30RuntimePackVersion>3.0.0 + <_AspNet30TargetingPackVersion>3.0.0 <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) @@ -31,7 +30,7 @@ - - + + + linux-arm64; + " /> - - + @@ -35,33 +35,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - c4d092f0430a104fa633f1503a1c207b4518f05d + b187a7f11b42476863c791b4ffe94e1bd8c093be - + https://github.com/aspnet/AspNetCore - 19718f6011b9d0124e805af61584fda934a6f982 + 1ea47f119b25bd0c4c475ef444abf591d4b890f9 - + https://github.com/aspnet/AspNetCore - 19718f6011b9d0124e805af61584fda934a6f982 + 1ea47f119b25bd0c4c475ef444abf591d4b890f9 - + https://github.com/aspnet/AspNetCore - 19718f6011b9d0124e805af61584fda934a6f982 + 1ea47f119b25bd0c4c475ef444abf591d4b890f9 - + https://github.com/aspnet/AspNetCore - 19718f6011b9d0124e805af61584fda934a6f982 + 1ea47f119b25bd0c4c475ef444abf591d4b890f9 - + https://github.com/aspnet/AspNetCore - 19718f6011b9d0124e805af61584fda934a6f982 + 1ea47f119b25bd0c4c475ef444abf591d4b890f9 - + https://github.com/aspnet/AspNetCore - 19718f6011b9d0124e805af61584fda934a6f982 + 1ea47f119b25bd0c4c475ef444abf591d4b890f9 https://github.com/dotnet/test-templates @@ -71,17 +71,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - b374aa7b01e245cc30da6e6865135c47e1fac851 + 7ee46ac2d77afe2347837f60ff74183a33af44ee https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 9a07fad357adc090db1c71b42176bd79098b3466 + c2aef013a10ac60b9349c9a895b06eb7a9ee0172 diff --git a/eng/Versions.props b/eng/Versions.props index 1fad89461..44721b328 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19518.7 + 3.1.100-preview2.19522.5 @@ -36,16 +36,16 @@ - 3.1.0-preview2.19518.3 - 3.1.0-preview2.19518.3 - 3.1.0-preview2.19518.3 - 3.1.0-preview2.19518.3 - 3.1.0-preview2.19518.3 - 3.1.0-preview2.19518.3 + 3.1.0-preview2.19522.3 + 3.1.0-preview2.19522.3 + 3.1.0-preview2.19522.3 + 3.1.0-preview2.19522.3 + 3.1.0-preview2.19522.3 + 3.1.0-preview2.19522.3 - 3.1.100-preview2.19518.2 + 3.1.100-preview2.19522.1 0.2.0 @@ -57,17 +57,17 @@ - 3.1.0-preview2.19516.15 + 3.1.0-preview2.19521.18 - 3.1.0-preview2.19517.10 - 3.1.0-preview2.19517.10 - 3.1.0-preview2.19517.10 - 3.1.0-preview2.19517.10 - 3.1.0-preview2.19517.10 - 3.1.0-preview2.19517.10 - 3.1.0-preview2.19517.10 + 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.1 + 3.1.0-preview2.19522.1 2.1.0 From 56fc6e2d778945151c8a66f1bc1ff72e37de17dd Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 22 Oct 2019 17:45:06 -0700 Subject: [PATCH 38/38] Pass timeout along --- eng/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/build.yml b/eng/build.yml index 82e02fabc..944d1e0ce 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -21,6 +21,7 @@ phases: - template: /eng/common/templates/job/job.yml parameters: name: ${{ parameters.agentOs }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true enablePublishBuildArtifacts: true