From 252416a21a04b2848a4beff7e21aef5121c8e527 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 16 Jan 2020 13:13:19 -0800 Subject: [PATCH 01/50] Remove -gg in harvest --- src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 | 2 +- .../targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 index d19137f5c..3920119b3 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 @@ -31,7 +31,7 @@ function RunHeat # use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time. $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment ` - -sreg -gg ` + -sreg -ag ` -var var.DotnetSrc ` -cg InstallFiles ` -srd ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 index a987c584c..7947d20a4 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 @@ -25,7 +25,7 @@ function RunHeat Write-Information "Running heat.." $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment ` - -sreg -gg ` + -sreg -ag ` -var var.DotnetSrc ` -cg InstallFiles ` -srd ` From 38a1c438b7886f211df81852ced46c459c858736 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 18:49:34 +0000 Subject: [PATCH 02/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6217) * Update dependencies from https://github.com/dotnet/toolset build 20200121.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20071.4 * Update dependencies from https://github.com/dotnet/toolset build 20200122.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20072.4 * Reverting templating change in nuget.config Co-authored-by: Sarah Oslund --- 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 eccab1282..8792f1009 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 8561f20ba07357d7f75742c9a2583ffb3535dd57 + 723171aeee1fa97c45d9ca532b53203c4fa116f4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6e868cc81..83b295fdb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20065.6 + 3.1.200-preview.20072.4 From 147128e3652aa23d63ce440b253adc9b7043341e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 19:31:21 +0000 Subject: [PATCH 03/50] [release/3.1.2xx] Update dependencies from dotnet/core-setup (#6231) * Update dependencies from https://github.com/dotnet/core-setup build 20200120.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.App.Host.win-x64 - 3.1.2 - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20070.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.2 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-servicing.20069.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.2-servicing.20069.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Add 3.1.2 template feed Co-authored-by: Matt Mitchell --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4ce02c028..5efcd05c8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,8 @@ - - + @@ -22,6 +21,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8792f1009..781bd864b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,23 +3,23 @@ https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb - + https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb https://github.com/dotnet/core-setup - 916b5cba268e1e1e803243004f4276cf40b2dda8 + 966115a91565d43cd545c1b8acd83eda2a0cb4cb @@ -86,13 +86,13 @@ cbf29e13514ba9d3be54eff7ccfe4b9df93e581b - + https://github.com/dotnet/winforms - 9483a88b7764a74d71cbd449de6c56c1d5e0af21 + b3a34e6695615d67a167fdbc436fce1e885f986e - + https://github.com/dotnet/wpf - 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 + b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 diff --git a/eng/Versions.props b/eng/Versions.props index 83b295fdb..a4a07c399 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-servicing.19605.5 + 4.8.1-servicing.20069.13 - 3.1.2-servicing.20066.4 + 3.1.2-servicing.20069.7 @@ -61,7 +61,7 @@ - 3.1.2-servicing.20067.4 + 3.1.2-servicing.20070.1 3.1.2 3.1.2 3.1.0 From 357ad71b284a58a7b2d04a67ac3643463d124510 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2020 00:03:48 +0000 Subject: [PATCH 04/50] [release/3.1.1xx] Update dependencies from dotnet/wcf (#6228) * Update dependencies from https://github.com/dotnet/wcf build 20200122.1 - System.ServiceModel.Primitives - 4.7.0-rtm.20072.1 * Reverting change in templating feed Co-authored-by: Sarah Oslund --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4ce02c028..75aa23db4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e37b0a242..7746355d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -96,9 +96,9 @@ - + https://github.com/dotnet/wcf - eb417fdeb06faeada140a92e26e86c266574476a + 406acaa61fb99736eed7384af5170eb6eac321c5 From 0806ef1bd1a1c5fbac9dd0c3ed093813bab4c7ca Mon Sep 17 00:00:00 2001 From: William Li Date: Sat, 25 Jan 2020 11:17:32 -0800 Subject: [PATCH 05/50] Use Task to calculate template versions No behaivor change --- Microsoft.DotNet.Cli.sln | 7 ++ .../CalculateTemplateVersions.cs | 84 +++++++++++++++++++ src/redist/targets/BuildCoreSdkTasks.targets | 1 + src/redist/targets/BundledTemplates.targets | 67 +++++++-------- .../CalculateTemplateVerionsTests.cs | 27 ++++++ .../core-sdk-tasks.Tests.csproj | 14 ++++ 6 files changed, 162 insertions(+), 38 deletions(-) create mode 100644 src/core-sdk-tasks/CalculateTemplateVersions.cs create mode 100644 test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs create mode 100644 test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index a5f56ff79..22d771abd 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Sdk.Intern EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\SdkTests.csproj", "{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{658EF9BE-452C-4D31-AA24-B9E2235799A8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,6 +57,10 @@ Global {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.ActiveCfg = Release|Any CPU {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.Build.0 = Release|Any CPU + {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -66,6 +72,7 @@ Global {78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} + {658EF9BE-452C-4D31-AA24-B9E2235799A8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5} diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs new file mode 100644 index 000000000..7d02618d3 --- /dev/null +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -0,0 +1,84 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; + +namespace Microsoft.DotNet.Cli.Build +{ + public class CalculateTemplateVersions : Task + { + [Required] + public string AspNetCorePackageVersionTemplate { get; set; } + + [Required] + public string GitCommitCount { get; set; } + + [Required] + public string VersionSuffix { get; set; } + + [Output] + public string BundledTemplateMSIVersion { get; set; } + + [Output] + public string BundledTemplateInstallPath { get; set; } + + [Output] + public string BundledTemplateMajorMinorVersion { get; set; } + + public override bool Execute() + { + var result = Calculate(AspNetCorePackageVersionTemplate, GitCommitCount, VersionSuffix); + BundledTemplateMSIVersion = result.BundledTemplateMsiVersion; + BundledTemplateInstallPath = result.BundledTemplateInstallPath; + BundledTemplateMajorMinorVersion = result.BundledTemplateMajorMinorVersion; + + return true; + } + + public static + (string BundledTemplateMsiVersion, + string BundledTemplateInstallPath, + string BundledTemplateMajorMinorVersion) Calculate(string aspNetCorePackageVersionTemplate, + string gitCommitCount, string versionSuffix) + { + (bool isStableVersion, string aspNetCoreVersionMajorMinorPatchVersion) = + GetAspNetCoreVersionMajorMinorPatchVersion(aspNetCorePackageVersionTemplate); + + var bundledTemplateMsiVersion = $"{aspNetCoreVersionMajorMinorPatchVersion}.{gitCommitCount}"; + + string bundledTemplateInstallPath = isStableVersion + ? aspNetCoreVersionMajorMinorPatchVersion + : $"{aspNetCoreVersionMajorMinorPatchVersion}-{versionSuffix}"; + + var parsedAspNetCoreVersionMajorMinorPatchVersion = + System.Version.Parse(aspNetCoreVersionMajorMinorPatchVersion); + var bundledTemplateMajorMinorVersion = + $"{parsedAspNetCoreVersionMajorMinorPatchVersion.Major}.{parsedAspNetCoreVersionMajorMinorPatchVersion.Minor}"; + + return ( + bundledTemplateMsiVersion, + bundledTemplateInstallPath, + bundledTemplateMajorMinorVersion); + } + + private static (bool isStableVersion, string aspNetCoreVersionMajorMinorPatchVersion) + GetAspNetCoreVersionMajorMinorPatchVersion(string aspNetCorePackageVersionTemplate) + { + var indexOfAspNetCoreVersionPreReleaseSeparator = aspNetCorePackageVersionTemplate.IndexOf('-'); + string aspNetCoreVersionMajorMinorPatchVersion; + if (indexOfAspNetCoreVersionPreReleaseSeparator != -1) + { + aspNetCoreVersionMajorMinorPatchVersion = + aspNetCorePackageVersionTemplate.Substring(0, indexOfAspNetCoreVersionPreReleaseSeparator); + } + else + { + aspNetCoreVersionMajorMinorPatchVersion = aspNetCorePackageVersionTemplate; + } + + return (indexOfAspNetCoreVersionPreReleaseSeparator == -1, aspNetCoreVersionMajorMinorPatchVersion); + } + } +} diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets index 7ffb389a9..d876cb37f 100644 --- a/src/redist/targets/BuildCoreSdkTasks.targets +++ b/src/redist/targets/BuildCoreSdkTasks.targets @@ -19,6 +19,7 @@ Properties="ArtifactsDir=$(ArtifactsDir)tasks\"/> + diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index c24479389..709da201f 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -1,47 +1,38 @@ - - $(AspNetCorePackageVersionFor31Templates.IndexOf('-')) - $(AspNetCorePackageVersionFor31Templates) - $(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator))) - $(AspNetCore31VersionMajorMinorPatchVersion).$(GitCommitCount) - $(AspNetCore31VersionMajorMinorPatchVersion) - $(BundledTemplates31InstallPath)-$(VersionSuffix) - $([MSBuild]::Add($(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.')), 1)) - $(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.', $(Templates31VersionPatchSeparatorIndex))) - $(AspNetCore31VersionMajorMinorPatchVersion.Substring(0, $(Templates31VersionPatchSeparatorIndex))) - $(AspNetCorePackageVersionFor30Templates.IndexOf('-')) - $(AspNetCorePackageVersionFor30Templates) - $(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator))) - $(AspNetCore30VersionMajorMinorPatchVersion).$(GitCommitCount) - $(AspNetCore30VersionMajorMinorPatchVersion) - $(BundledTemplates30InstallPath)-$(VersionSuffix) - $([MSBuild]::Add($(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.')), 1)) - $(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.', $(Templates30VersionPatchSeparatorIndex))) - $(AspNetCore30VersionMajorMinorPatchVersion.Substring(0, $(Templates30VersionPatchSeparatorIndex))) + + + + + - $(AspNetCorePackageVersionFor22Templates.IndexOf('-')) - $(AspNetCorePackageVersionFor22Templates) - $(AspNetCorePackageVersionFor22Templates.Substring(0, $(AspNetCore22VersionPreReleaseSeparator))) - $(AspNetCore22VersionMajorMinorPatchVersion).$(GitCommitCount) - $(AspNetCore22VersionMajorMinorPatchVersion) - $(BundledTemplates22InstallPath)-$(VersionSuffix) - $([MSBuild]::Add($(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.')), 1)) - $(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.', $(Templates22VersionPatchSeparatorIndex))) - $(AspNetCore22VersionMajorMinorPatchVersion.Substring(0, $(Templates22VersionPatchSeparatorIndex))) + + + + + - $(AspNetCorePackageVersionFor21Templates.IndexOf('-')) - $(AspNetCorePackageVersionFor21Templates) - $(AspNetCorePackageVersionFor21Templates.Substring(0, $(AspNetCore21VersionPreReleaseSeparator))) - $(AspNetCore21VersionMajorMinorPatchVersion).$(GitCommitCount) - $(AspNetCore21VersionMajorMinorPatchVersion) - $(BundledTemplates21InstallPath)-$(VersionSuffix) - $([MSBuild]::Add($(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.')), 1)) - $(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.', $(Templates21VersionPatchSeparatorIndex))) - $(AspNetCore21VersionMajorMinorPatchVersion.Substring(0, $(Templates21VersionPatchSeparatorIndex))) - + + + + + + + + + + + diff --git a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs new file mode 100644 index 000000000..6f5ca3919 --- /dev/null +++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs @@ -0,0 +1,27 @@ +using FluentAssertions; +using Xunit; +using Microsoft.DotNet.Cli.Build; + +namespace EndToEnd +{ + public class CalculateTemplateVerionsTests + { + [Fact] + public void ItCanCalculateTemplateVersionsInStableBuilds() + { + var result = CalculateTemplateVersions.Calculate("3.1.0", "014885", "dev"); + result.BundledTemplateInstallPath.Should().Be("3.1.0"); + result.BundledTemplateMsiVersion.Should().Be("3.1.0.014885"); + result.BundledTemplateMajorMinorVersion.Should().Be("3.1"); + } + + [Fact] + public void ItCanCalculateTemplateVersionsInNonStableBuilds() + { + var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "014885", "dev"); + result.BundledTemplateInstallPath.Should().Be("5.0.0-dev"); + result.BundledTemplateMsiVersion.Should().Be("5.0.0.014885"); + result.BundledTemplateMajorMinorVersion.Should().Be("5.0"); + } + } +} diff --git a/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj b/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj new file mode 100644 index 000000000..47b6ce517 --- /dev/null +++ b/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj @@ -0,0 +1,14 @@ + + + $(CoreSdkTargetFramework);net472 + $(CoreSdkTargetFramework) + + + + + + + + + + \ No newline at end of file From 38ff5b6af1a0148afdcba7103e5bcdf6e3a5b2d8 Mon Sep 17 00:00:00 2001 From: William Li Date: Sat, 25 Jan 2020 17:15:10 -0800 Subject: [PATCH 06/50] Use nuget version to better reduce code --- .../CalculateTemplateVersions.cs | 41 +++++-------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs index 7d02618d3..478eeebb4 100644 --- a/src/core-sdk-tasks/CalculateTemplateVersions.cs +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -2,8 +2,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using System.Text.RegularExpressions; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; +using NuGet.Versioning; namespace Microsoft.DotNet.Cli.Build { @@ -43,42 +45,19 @@ namespace Microsoft.DotNet.Cli.Build string BundledTemplateMajorMinorVersion) Calculate(string aspNetCorePackageVersionTemplate, string gitCommitCount, string versionSuffix) { - (bool isStableVersion, string aspNetCoreVersionMajorMinorPatchVersion) = - GetAspNetCoreVersionMajorMinorPatchVersion(aspNetCorePackageVersionTemplate); + var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate); - var bundledTemplateMsiVersion = $"{aspNetCoreVersionMajorMinorPatchVersion}.{gitCommitCount}"; + var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor, + aspNetCoreTemplate.Patch); - string bundledTemplateInstallPath = isStableVersion - ? aspNetCoreVersionMajorMinorPatchVersion - : $"{aspNetCoreVersionMajorMinorPatchVersion}-{versionSuffix}"; - - var parsedAspNetCoreVersionMajorMinorPatchVersion = - System.Version.Parse(aspNetCoreVersionMajorMinorPatchVersion); - var bundledTemplateMajorMinorVersion = - $"{parsedAspNetCoreVersionMajorMinorPatchVersion.Major}.{parsedAspNetCoreVersionMajorMinorPatchVersion.Minor}"; + string bundledTemplateInstallPath = aspNetCoreTemplate.IsPrerelease + ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{versionSuffix}" + : $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}"; return ( - bundledTemplateMsiVersion, + $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}.{gitCommitCount}", bundledTemplateInstallPath, - bundledTemplateMajorMinorVersion); - } - - private static (bool isStableVersion, string aspNetCoreVersionMajorMinorPatchVersion) - GetAspNetCoreVersionMajorMinorPatchVersion(string aspNetCorePackageVersionTemplate) - { - var indexOfAspNetCoreVersionPreReleaseSeparator = aspNetCorePackageVersionTemplate.IndexOf('-'); - string aspNetCoreVersionMajorMinorPatchVersion; - if (indexOfAspNetCoreVersionPreReleaseSeparator != -1) - { - aspNetCoreVersionMajorMinorPatchVersion = - aspNetCorePackageVersionTemplate.Substring(0, indexOfAspNetCoreVersionPreReleaseSeparator); - } - else - { - aspNetCoreVersionMajorMinorPatchVersion = aspNetCorePackageVersionTemplate; - } - - return (indexOfAspNetCoreVersionPreReleaseSeparator == -1, aspNetCoreVersionMajorMinorPatchVersion); + $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}"); } } } From 8b9a67d117d8e8c7b9c0c6c0e3e655449839ae3d Mon Sep 17 00:00:00 2001 From: William Li Date: Sat, 25 Jan 2020 17:32:35 -0800 Subject: [PATCH 07/50] Finish ComponentID reset --- src/core-sdk-tasks/CalculateTemplateVersions.cs | 7 ++++++- .../CalculateTemplateVerionsTests.cs | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs index 478eeebb4..abbc987fe 100644 --- a/src/core-sdk-tasks/CalculateTemplateVersions.cs +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -29,6 +29,8 @@ namespace Microsoft.DotNet.Cli.Build [Output] public string BundledTemplateMajorMinorVersion { get; set; } + private const int _patchVersionResetOffset = 1; + public override bool Execute() { var result = Calculate(AspNetCorePackageVersionTemplate, GitCommitCount, VersionSuffix); @@ -47,8 +49,11 @@ namespace Microsoft.DotNet.Cli.Build { var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate); + // due to historical bug https://github.com/dotnet/core-sdk/issues/6243 + // we need to increase patch version by one in order to "reset" existing install ComponentId + // more in the above bug's detail var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor, - aspNetCoreTemplate.Patch); + aspNetCoreTemplate.Patch + _patchVersionResetOffset); string bundledTemplateInstallPath = aspNetCoreTemplate.IsPrerelease ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{versionSuffix}" diff --git a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs index 6f5ca3919..041337b45 100644 --- a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs +++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs @@ -4,14 +4,15 @@ using Microsoft.DotNet.Cli.Build; namespace EndToEnd { - public class CalculateTemplateVerionsTests + public class CalculateTemplateVersionsTests { [Fact] public void ItCanCalculateTemplateVersionsInStableBuilds() { var result = CalculateTemplateVersions.Calculate("3.1.0", "014885", "dev"); - result.BundledTemplateInstallPath.Should().Be("3.1.0"); - result.BundledTemplateMsiVersion.Should().Be("3.1.0.014885"); + result.BundledTemplateInstallPath.Should().Be("3.1.1", + "the patch is 1 higher than aspnetTemplateVersion due to https://github.com/dotnet/core-sdk/issues/6243"); + result.BundledTemplateMsiVersion.Should().Be("3.1.1.014885"); result.BundledTemplateMajorMinorVersion.Should().Be("3.1"); } @@ -19,8 +20,8 @@ namespace EndToEnd public void ItCanCalculateTemplateVersionsInNonStableBuilds() { var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "014885", "dev"); - result.BundledTemplateInstallPath.Should().Be("5.0.0-dev"); - result.BundledTemplateMsiVersion.Should().Be("5.0.0.014885"); + result.BundledTemplateInstallPath.Should().Be("5.0.1-dev"); + result.BundledTemplateMsiVersion.Should().Be("5.0.1.014885"); result.BundledTemplateMajorMinorVersion.Should().Be("5.0"); } } From 90b13626ab6dc0e8f56378f64cd074a89cc5f656 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 28 Jan 2020 10:49:14 -0800 Subject: [PATCH 08/50] Cap major 5 --- .../CalculateTemplateVersions.cs | 26 +++++++++---- .../CalculateTemplateVerionsTests.cs | 39 ++++++++++++++----- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs index abbc987fe..55d58fd40 100644 --- a/src/core-sdk-tasks/CalculateTemplateVersions.cs +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -1,8 +1,6 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Text.RegularExpressions; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using NuGet.Versioning; @@ -49,11 +47,7 @@ namespace Microsoft.DotNet.Cli.Build { var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate); - // due to historical bug https://github.com/dotnet/core-sdk/issues/6243 - // we need to increase patch version by one in order to "reset" existing install ComponentId - // more in the above bug's detail - var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor, - aspNetCoreTemplate.Patch + _patchVersionResetOffset); + NuGetVersion baseMajorMinorPatch = GetBaseMajorMinorPatch(aspNetCoreTemplate); string bundledTemplateInstallPath = aspNetCoreTemplate.IsPrerelease ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{versionSuffix}" @@ -64,5 +58,23 @@ namespace Microsoft.DotNet.Cli.Build bundledTemplateInstallPath, $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}"); } + + private static NuGetVersion GetBaseMajorMinorPatch(NuGetVersion aspNetCoreTemplate) + { + // due to historical bug https://github.com/dotnet/core-sdk/issues/6243 + // we need to increase patch version by one in order to "reset" existing install ComponentId + // more in the above bug's detail. + // There is no non-deterministic existing ComponentId under Major version 5. + // so only apply the patch bump when below 5 + + int basePatch = + aspNetCoreTemplate.Major < 5 + ? aspNetCoreTemplate.Patch + _patchVersionResetOffset + : aspNetCoreTemplate.Patch; + + var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor, + basePatch); + return baseMajorMinorPatch; + } } } diff --git a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs index 041337b45..8f25cc34e 100644 --- a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs +++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs @@ -7,22 +7,43 @@ namespace EndToEnd public class CalculateTemplateVersionsTests { [Fact] - public void ItCanCalculateTemplateVersionsInStableBuilds() + public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInStableBuilds() { var result = CalculateTemplateVersions.Calculate("3.1.0", "014885", "dev"); - result.BundledTemplateInstallPath.Should().Be("3.1.1", - "the patch is 1 higher than aspnetTemplateVersion due to https://github.com/dotnet/core-sdk/issues/6243"); - result.BundledTemplateMsiVersion.Should().Be("3.1.1.014885"); - result.BundledTemplateMajorMinorVersion.Should().Be("3.1"); + + result.Should() + .Be(("3.1.1.014885", "3.1.1", "3.1"), + "the patch is 1 higher than aspnetTemplateVersion " + + "due to https://github.com/dotnet/core-sdk/issues/6243"); } [Fact] - public void ItCanCalculateTemplateVersionsInNonStableBuilds() + public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInNonStableBuilds() + { + var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6", "014885", "dev"); + + result.Should() + .Be(("3.0.1.014885", "3.0.1-dev", "3.0")); + } + + [Fact] + public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInStableBuilds() + { + var result = CalculateTemplateVersions.Calculate("5.1.0", "014885", "dev"); + + result.Should() + .Be(("5.1.0.014885", "5.1.0", "5.1"), + "the patch align with AspNetCoreTemplateMajorVersion again, " + + "since there is no non-deterministic existing ComponentId under Major version 5."); + } + + [Fact] + public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInNonStableBuilds() { var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "014885", "dev"); - result.BundledTemplateInstallPath.Should().Be("5.0.1-dev"); - result.BundledTemplateMsiVersion.Should().Be("5.0.1.014885"); - result.BundledTemplateMajorMinorVersion.Should().Be("5.0"); + + result.Should() + .Be(("5.0.0.014885", "5.0.0-dev", "5.0")); } } } From 24ffef06599e50fecdebfcb1410bcb703bead05b Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 16 Jan 2020 13:13:19 -0800 Subject: [PATCH 09/50] Remove -gg in harvest --- src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 | 2 +- .../targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 index d19137f5c..3920119b3 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 @@ -31,7 +31,7 @@ function RunHeat # use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time. $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment ` - -sreg -gg ` + -sreg -ag ` -var var.DotnetSrc ` -cg InstallFiles ` -srd ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 index a987c584c..7947d20a4 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 @@ -25,7 +25,7 @@ function RunHeat Write-Information "Running heat.." $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment ` - -sreg -gg ` + -sreg -ag ` -var var.DotnetSrc ` -cg InstallFiles ` -srd ` From b76a641e4fb54308101fcda03f49753c6ca10915 Mon Sep 17 00:00:00 2001 From: William Li Date: Sat, 25 Jan 2020 11:17:32 -0800 Subject: [PATCH 10/50] Use Task to calculate template versions No behaivor change --- Microsoft.DotNet.Cli.sln | 7 ++ .../CalculateTemplateVersions.cs | 84 +++++++++++++++++++ src/redist/targets/BuildCoreSdkTasks.targets | 1 + src/redist/targets/BundledTemplates.targets | 67 +++++++-------- .../CalculateTemplateVerionsTests.cs | 27 ++++++ .../core-sdk-tasks.Tests.csproj | 14 ++++ 6 files changed, 162 insertions(+), 38 deletions(-) create mode 100644 src/core-sdk-tasks/CalculateTemplateVersions.cs create mode 100644 test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs create mode 100644 test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index a5f56ff79..22d771abd 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Sdk.Intern EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\SdkTests.csproj", "{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{658EF9BE-452C-4D31-AA24-B9E2235799A8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -55,6 +57,10 @@ Global {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.ActiveCfg = Release|Any CPU {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.Build.0 = Release|Any CPU + {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {658EF9BE-452C-4D31-AA24-B9E2235799A8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -66,6 +72,7 @@ Global {78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} + {658EF9BE-452C-4D31-AA24-B9E2235799A8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5} diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs new file mode 100644 index 000000000..7d02618d3 --- /dev/null +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -0,0 +1,84 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; + +namespace Microsoft.DotNet.Cli.Build +{ + public class CalculateTemplateVersions : Task + { + [Required] + public string AspNetCorePackageVersionTemplate { get; set; } + + [Required] + public string GitCommitCount { get; set; } + + [Required] + public string VersionSuffix { get; set; } + + [Output] + public string BundledTemplateMSIVersion { get; set; } + + [Output] + public string BundledTemplateInstallPath { get; set; } + + [Output] + public string BundledTemplateMajorMinorVersion { get; set; } + + public override bool Execute() + { + var result = Calculate(AspNetCorePackageVersionTemplate, GitCommitCount, VersionSuffix); + BundledTemplateMSIVersion = result.BundledTemplateMsiVersion; + BundledTemplateInstallPath = result.BundledTemplateInstallPath; + BundledTemplateMajorMinorVersion = result.BundledTemplateMajorMinorVersion; + + return true; + } + + public static + (string BundledTemplateMsiVersion, + string BundledTemplateInstallPath, + string BundledTemplateMajorMinorVersion) Calculate(string aspNetCorePackageVersionTemplate, + string gitCommitCount, string versionSuffix) + { + (bool isStableVersion, string aspNetCoreVersionMajorMinorPatchVersion) = + GetAspNetCoreVersionMajorMinorPatchVersion(aspNetCorePackageVersionTemplate); + + var bundledTemplateMsiVersion = $"{aspNetCoreVersionMajorMinorPatchVersion}.{gitCommitCount}"; + + string bundledTemplateInstallPath = isStableVersion + ? aspNetCoreVersionMajorMinorPatchVersion + : $"{aspNetCoreVersionMajorMinorPatchVersion}-{versionSuffix}"; + + var parsedAspNetCoreVersionMajorMinorPatchVersion = + System.Version.Parse(aspNetCoreVersionMajorMinorPatchVersion); + var bundledTemplateMajorMinorVersion = + $"{parsedAspNetCoreVersionMajorMinorPatchVersion.Major}.{parsedAspNetCoreVersionMajorMinorPatchVersion.Minor}"; + + return ( + bundledTemplateMsiVersion, + bundledTemplateInstallPath, + bundledTemplateMajorMinorVersion); + } + + private static (bool isStableVersion, string aspNetCoreVersionMajorMinorPatchVersion) + GetAspNetCoreVersionMajorMinorPatchVersion(string aspNetCorePackageVersionTemplate) + { + var indexOfAspNetCoreVersionPreReleaseSeparator = aspNetCorePackageVersionTemplate.IndexOf('-'); + string aspNetCoreVersionMajorMinorPatchVersion; + if (indexOfAspNetCoreVersionPreReleaseSeparator != -1) + { + aspNetCoreVersionMajorMinorPatchVersion = + aspNetCorePackageVersionTemplate.Substring(0, indexOfAspNetCoreVersionPreReleaseSeparator); + } + else + { + aspNetCoreVersionMajorMinorPatchVersion = aspNetCorePackageVersionTemplate; + } + + return (indexOfAspNetCoreVersionPreReleaseSeparator == -1, aspNetCoreVersionMajorMinorPatchVersion); + } + } +} diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets index 7ffb389a9..d876cb37f 100644 --- a/src/redist/targets/BuildCoreSdkTasks.targets +++ b/src/redist/targets/BuildCoreSdkTasks.targets @@ -19,6 +19,7 @@ Properties="ArtifactsDir=$(ArtifactsDir)tasks\"/> + diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index c24479389..709da201f 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -1,47 +1,38 @@ - - $(AspNetCorePackageVersionFor31Templates.IndexOf('-')) - $(AspNetCorePackageVersionFor31Templates) - $(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator))) - $(AspNetCore31VersionMajorMinorPatchVersion).$(GitCommitCount) - $(AspNetCore31VersionMajorMinorPatchVersion) - $(BundledTemplates31InstallPath)-$(VersionSuffix) - $([MSBuild]::Add($(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.')), 1)) - $(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.', $(Templates31VersionPatchSeparatorIndex))) - $(AspNetCore31VersionMajorMinorPatchVersion.Substring(0, $(Templates31VersionPatchSeparatorIndex))) - $(AspNetCorePackageVersionFor30Templates.IndexOf('-')) - $(AspNetCorePackageVersionFor30Templates) - $(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator))) - $(AspNetCore30VersionMajorMinorPatchVersion).$(GitCommitCount) - $(AspNetCore30VersionMajorMinorPatchVersion) - $(BundledTemplates30InstallPath)-$(VersionSuffix) - $([MSBuild]::Add($(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.')), 1)) - $(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.', $(Templates30VersionPatchSeparatorIndex))) - $(AspNetCore30VersionMajorMinorPatchVersion.Substring(0, $(Templates30VersionPatchSeparatorIndex))) + + + + + - $(AspNetCorePackageVersionFor22Templates.IndexOf('-')) - $(AspNetCorePackageVersionFor22Templates) - $(AspNetCorePackageVersionFor22Templates.Substring(0, $(AspNetCore22VersionPreReleaseSeparator))) - $(AspNetCore22VersionMajorMinorPatchVersion).$(GitCommitCount) - $(AspNetCore22VersionMajorMinorPatchVersion) - $(BundledTemplates22InstallPath)-$(VersionSuffix) - $([MSBuild]::Add($(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.')), 1)) - $(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.', $(Templates22VersionPatchSeparatorIndex))) - $(AspNetCore22VersionMajorMinorPatchVersion.Substring(0, $(Templates22VersionPatchSeparatorIndex))) + + + + + - $(AspNetCorePackageVersionFor21Templates.IndexOf('-')) - $(AspNetCorePackageVersionFor21Templates) - $(AspNetCorePackageVersionFor21Templates.Substring(0, $(AspNetCore21VersionPreReleaseSeparator))) - $(AspNetCore21VersionMajorMinorPatchVersion).$(GitCommitCount) - $(AspNetCore21VersionMajorMinorPatchVersion) - $(BundledTemplates21InstallPath)-$(VersionSuffix) - $([MSBuild]::Add($(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.')), 1)) - $(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.', $(Templates21VersionPatchSeparatorIndex))) - $(AspNetCore21VersionMajorMinorPatchVersion.Substring(0, $(Templates21VersionPatchSeparatorIndex))) - + + + + + + + + + + + diff --git a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs new file mode 100644 index 000000000..6f5ca3919 --- /dev/null +++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs @@ -0,0 +1,27 @@ +using FluentAssertions; +using Xunit; +using Microsoft.DotNet.Cli.Build; + +namespace EndToEnd +{ + public class CalculateTemplateVerionsTests + { + [Fact] + public void ItCanCalculateTemplateVersionsInStableBuilds() + { + var result = CalculateTemplateVersions.Calculate("3.1.0", "014885", "dev"); + result.BundledTemplateInstallPath.Should().Be("3.1.0"); + result.BundledTemplateMsiVersion.Should().Be("3.1.0.014885"); + result.BundledTemplateMajorMinorVersion.Should().Be("3.1"); + } + + [Fact] + public void ItCanCalculateTemplateVersionsInNonStableBuilds() + { + var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "014885", "dev"); + result.BundledTemplateInstallPath.Should().Be("5.0.0-dev"); + result.BundledTemplateMsiVersion.Should().Be("5.0.0.014885"); + result.BundledTemplateMajorMinorVersion.Should().Be("5.0"); + } + } +} diff --git a/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj b/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj new file mode 100644 index 000000000..47b6ce517 --- /dev/null +++ b/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj @@ -0,0 +1,14 @@ + + + $(CoreSdkTargetFramework);net472 + $(CoreSdkTargetFramework) + + + + + + + + + + \ No newline at end of file From fdda58e6ffd7040a86fa9e1f04a18acd21c46208 Mon Sep 17 00:00:00 2001 From: William Li Date: Sat, 25 Jan 2020 17:15:10 -0800 Subject: [PATCH 11/50] Use nuget version to better reduce code --- .../CalculateTemplateVersions.cs | 41 +++++-------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs index 7d02618d3..478eeebb4 100644 --- a/src/core-sdk-tasks/CalculateTemplateVersions.cs +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -2,8 +2,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; +using System.Text.RegularExpressions; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; +using NuGet.Versioning; namespace Microsoft.DotNet.Cli.Build { @@ -43,42 +45,19 @@ namespace Microsoft.DotNet.Cli.Build string BundledTemplateMajorMinorVersion) Calculate(string aspNetCorePackageVersionTemplate, string gitCommitCount, string versionSuffix) { - (bool isStableVersion, string aspNetCoreVersionMajorMinorPatchVersion) = - GetAspNetCoreVersionMajorMinorPatchVersion(aspNetCorePackageVersionTemplate); + var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate); - var bundledTemplateMsiVersion = $"{aspNetCoreVersionMajorMinorPatchVersion}.{gitCommitCount}"; + var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor, + aspNetCoreTemplate.Patch); - string bundledTemplateInstallPath = isStableVersion - ? aspNetCoreVersionMajorMinorPatchVersion - : $"{aspNetCoreVersionMajorMinorPatchVersion}-{versionSuffix}"; - - var parsedAspNetCoreVersionMajorMinorPatchVersion = - System.Version.Parse(aspNetCoreVersionMajorMinorPatchVersion); - var bundledTemplateMajorMinorVersion = - $"{parsedAspNetCoreVersionMajorMinorPatchVersion.Major}.{parsedAspNetCoreVersionMajorMinorPatchVersion.Minor}"; + string bundledTemplateInstallPath = aspNetCoreTemplate.IsPrerelease + ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{versionSuffix}" + : $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}"; return ( - bundledTemplateMsiVersion, + $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}.{gitCommitCount}", bundledTemplateInstallPath, - bundledTemplateMajorMinorVersion); - } - - private static (bool isStableVersion, string aspNetCoreVersionMajorMinorPatchVersion) - GetAspNetCoreVersionMajorMinorPatchVersion(string aspNetCorePackageVersionTemplate) - { - var indexOfAspNetCoreVersionPreReleaseSeparator = aspNetCorePackageVersionTemplate.IndexOf('-'); - string aspNetCoreVersionMajorMinorPatchVersion; - if (indexOfAspNetCoreVersionPreReleaseSeparator != -1) - { - aspNetCoreVersionMajorMinorPatchVersion = - aspNetCorePackageVersionTemplate.Substring(0, indexOfAspNetCoreVersionPreReleaseSeparator); - } - else - { - aspNetCoreVersionMajorMinorPatchVersion = aspNetCorePackageVersionTemplate; - } - - return (indexOfAspNetCoreVersionPreReleaseSeparator == -1, aspNetCoreVersionMajorMinorPatchVersion); + $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}"); } } } From df09f073942ecac1aa39f89c0bf66c35a31e60aa Mon Sep 17 00:00:00 2001 From: William Li Date: Sat, 25 Jan 2020 17:32:35 -0800 Subject: [PATCH 12/50] Finish ComponentID reset --- src/core-sdk-tasks/CalculateTemplateVersions.cs | 7 ++++++- .../CalculateTemplateVerionsTests.cs | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs index 478eeebb4..abbc987fe 100644 --- a/src/core-sdk-tasks/CalculateTemplateVersions.cs +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -29,6 +29,8 @@ namespace Microsoft.DotNet.Cli.Build [Output] public string BundledTemplateMajorMinorVersion { get; set; } + private const int _patchVersionResetOffset = 1; + public override bool Execute() { var result = Calculate(AspNetCorePackageVersionTemplate, GitCommitCount, VersionSuffix); @@ -47,8 +49,11 @@ namespace Microsoft.DotNet.Cli.Build { var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate); + // due to historical bug https://github.com/dotnet/core-sdk/issues/6243 + // we need to increase patch version by one in order to "reset" existing install ComponentId + // more in the above bug's detail var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor, - aspNetCoreTemplate.Patch); + aspNetCoreTemplate.Patch + _patchVersionResetOffset); string bundledTemplateInstallPath = aspNetCoreTemplate.IsPrerelease ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{versionSuffix}" diff --git a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs index 6f5ca3919..041337b45 100644 --- a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs +++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs @@ -4,14 +4,15 @@ using Microsoft.DotNet.Cli.Build; namespace EndToEnd { - public class CalculateTemplateVerionsTests + public class CalculateTemplateVersionsTests { [Fact] public void ItCanCalculateTemplateVersionsInStableBuilds() { var result = CalculateTemplateVersions.Calculate("3.1.0", "014885", "dev"); - result.BundledTemplateInstallPath.Should().Be("3.1.0"); - result.BundledTemplateMsiVersion.Should().Be("3.1.0.014885"); + result.BundledTemplateInstallPath.Should().Be("3.1.1", + "the patch is 1 higher than aspnetTemplateVersion due to https://github.com/dotnet/core-sdk/issues/6243"); + result.BundledTemplateMsiVersion.Should().Be("3.1.1.014885"); result.BundledTemplateMajorMinorVersion.Should().Be("3.1"); } @@ -19,8 +20,8 @@ namespace EndToEnd public void ItCanCalculateTemplateVersionsInNonStableBuilds() { var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "014885", "dev"); - result.BundledTemplateInstallPath.Should().Be("5.0.0-dev"); - result.BundledTemplateMsiVersion.Should().Be("5.0.0.014885"); + result.BundledTemplateInstallPath.Should().Be("5.0.1-dev"); + result.BundledTemplateMsiVersion.Should().Be("5.0.1.014885"); result.BundledTemplateMajorMinorVersion.Should().Be("5.0"); } } From 3e8b475e2f91bea9550f1fc199c326e1669e4328 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 28 Jan 2020 10:49:14 -0800 Subject: [PATCH 13/50] Cap major 5 --- .../CalculateTemplateVersions.cs | 26 +++++++++---- .../CalculateTemplateVerionsTests.cs | 39 ++++++++++++++----- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs index abbc987fe..55d58fd40 100644 --- a/src/core-sdk-tasks/CalculateTemplateVersions.cs +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -1,8 +1,6 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Text.RegularExpressions; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using NuGet.Versioning; @@ -49,11 +47,7 @@ namespace Microsoft.DotNet.Cli.Build { var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate); - // due to historical bug https://github.com/dotnet/core-sdk/issues/6243 - // we need to increase patch version by one in order to "reset" existing install ComponentId - // more in the above bug's detail - var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor, - aspNetCoreTemplate.Patch + _patchVersionResetOffset); + NuGetVersion baseMajorMinorPatch = GetBaseMajorMinorPatch(aspNetCoreTemplate); string bundledTemplateInstallPath = aspNetCoreTemplate.IsPrerelease ? $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}-{versionSuffix}" @@ -64,5 +58,23 @@ namespace Microsoft.DotNet.Cli.Build bundledTemplateInstallPath, $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}"); } + + private static NuGetVersion GetBaseMajorMinorPatch(NuGetVersion aspNetCoreTemplate) + { + // due to historical bug https://github.com/dotnet/core-sdk/issues/6243 + // we need to increase patch version by one in order to "reset" existing install ComponentId + // more in the above bug's detail. + // There is no non-deterministic existing ComponentId under Major version 5. + // so only apply the patch bump when below 5 + + int basePatch = + aspNetCoreTemplate.Major < 5 + ? aspNetCoreTemplate.Patch + _patchVersionResetOffset + : aspNetCoreTemplate.Patch; + + var baseMajorMinorPatch = new NuGetVersion(aspNetCoreTemplate.Major, aspNetCoreTemplate.Minor, + basePatch); + return baseMajorMinorPatch; + } } } diff --git a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs index 041337b45..8f25cc34e 100644 --- a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs +++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs @@ -7,22 +7,43 @@ namespace EndToEnd public class CalculateTemplateVersionsTests { [Fact] - public void ItCanCalculateTemplateVersionsInStableBuilds() + public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInStableBuilds() { var result = CalculateTemplateVersions.Calculate("3.1.0", "014885", "dev"); - result.BundledTemplateInstallPath.Should().Be("3.1.1", - "the patch is 1 higher than aspnetTemplateVersion due to https://github.com/dotnet/core-sdk/issues/6243"); - result.BundledTemplateMsiVersion.Should().Be("3.1.1.014885"); - result.BundledTemplateMajorMinorVersion.Should().Be("3.1"); + + result.Should() + .Be(("3.1.1.014885", "3.1.1", "3.1"), + "the patch is 1 higher than aspnetTemplateVersion " + + "due to https://github.com/dotnet/core-sdk/issues/6243"); } [Fact] - public void ItCanCalculateTemplateVersionsInNonStableBuilds() + public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInNonStableBuilds() + { + var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6", "014885", "dev"); + + result.Should() + .Be(("3.0.1.014885", "3.0.1-dev", "3.0")); + } + + [Fact] + public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInStableBuilds() + { + var result = CalculateTemplateVersions.Calculate("5.1.0", "014885", "dev"); + + result.Should() + .Be(("5.1.0.014885", "5.1.0", "5.1"), + "the patch align with AspNetCoreTemplateMajorVersion again, " + + "since there is no non-deterministic existing ComponentId under Major version 5."); + } + + [Fact] + public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInNonStableBuilds() { var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "014885", "dev"); - result.BundledTemplateInstallPath.Should().Be("5.0.1-dev"); - result.BundledTemplateMsiVersion.Should().Be("5.0.1.014885"); - result.BundledTemplateMajorMinorVersion.Should().Be("5.0"); + + result.Should() + .Be(("5.0.0.014885", "5.0.0-dev", "5.0")); } } } From 7d6455dc2c5687a9d321c52582fa72a628e659b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2020 21:50:10 +0000 Subject: [PATCH 14/50] Update dependencies from https://github.com/dotnet/toolset build 20200128.5 (#6249) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20078.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20072.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 781bd864b..bf503c0a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,13 +73,13 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 723171aeee1fa97c45d9ca532b53203c4fa116f4 + 0260ec44914f3b7e89c0d731331f814e94791817 - + https://github.com/dotnet/sdk - b3cf8ef9e7df8d9cb28b3545ce1f85f548deca75 + 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index a4a07c399..3232a0049 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20072.4 + 3.1.200-preview.20078.5 @@ -52,7 +52,7 @@ - 3.1.200-preview.20059.2 + 3.1.200-preview.20072.3 $(MicrosoftNETSdkPackageVersion) From 62435b1900032707e40f210eab658361a3914e35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2020 22:28:25 +0000 Subject: [PATCH 15/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6254) * Update dependencies from https://github.com/dotnet/toolset build 20200129.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20079.5 * Update dependencies from https://github.com/dotnet/toolset build 20200129.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20079.6 --- 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 bf503c0a9..24f016494 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 0260ec44914f3b7e89c0d731331f814e94791817 + b02b6bc91dd9c0bdb57285687f46a3336749eae5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3232a0049..e9a266728 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20078.5 + 3.1.200-preview.20079.6 From 3546a6767be449dee427b75a51d0202c103812e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2020 00:42:07 +0000 Subject: [PATCH 16/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6256) * Update dependencies from https://github.com/dotnet/toolset build 20200129.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20079.7 * Update dependencies from https://github.com/dotnet/toolset build 20200129.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20079.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 24f016494..826719dd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - b02b6bc91dd9c0bdb57285687f46a3336749eae5 + 70bc877b06e162b0a13443843658aadcc30c1a40 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e9a266728..196a5e1ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20079.6 + 3.1.200-preview.20079.8 From 1bce0e17ac3e0eabe0c87a114fb70a7e151ee2c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2020 07:39:01 +0000 Subject: [PATCH 17/50] Update dependencies from https://github.com/dotnet/test-templates build 20200129.1 (#6259) - Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.20079.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 826719dd4..9c49cdc5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ https://github.com/dotnet/aspnetcore c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/test-templates - 5117d3d9d7dfd3583f0c42a639efaf092f957b7b + 07c739a22eeb760e60322ac0989c998328fe0aa2 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 196a5e1ca..e4da7ec67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 1.0.2-beta4.19570.1 + 1.0.2-beta4.20079.1 From a6b35e431bef134b0793841c9cbf88bd77a9d69b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2020 23:28:34 +0000 Subject: [PATCH 18/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6265) * Update dependencies from https://github.com/dotnet/toolset build 20200130.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20080.5 * Update dependencies from https://github.com/dotnet/toolset build 20200130.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20080.7 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20080.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 9c49cdc5c..55f1465e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,13 +73,13 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 70bc877b06e162b0a13443843658aadcc30c1a40 + 96d8d4f873c5e63e27f69e2f3807cfefc722b9bb - + https://github.com/dotnet/sdk - 3ff3791a1b3f8af0c3fadf3988012c69ac16c28f + 1de5bc87ab0a42441ceb3044aa0c74185dcb888f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index e4da7ec67..2db4978cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20079.8 + 3.1.200-preview.20080.7 @@ -52,7 +52,7 @@ - 3.1.200-preview.20072.3 + 3.1.200-preview.20080.4 $(MicrosoftNETSdkPackageVersion) From 5304bfa12fb52fad8b823b35bf0f00e68cf243b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:00:15 +0000 Subject: [PATCH 19/50] Update dependencies from https://github.com/dotnet/toolset build 20200131.7 (#6273) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20081.7 --- 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 55f1465e0..405f3d24c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 96d8d4f873c5e63e27f69e2f3807cfefc722b9bb + 71c42ff72e6c80975429d35a37e0145b170c2ce3 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2db4978cc..4bfd0098e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20080.7 + 3.1.200-preview.20081.7 From 66036819a60ff904922a2e2543669af8716bcd93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2020 01:26:40 +0000 Subject: [PATCH 20/50] Update dependencies from https://github.com/dotnet/toolset build 20200131.8 (#6274) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20081.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 405f3d24c..5c005ccef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 71c42ff72e6c80975429d35a37e0145b170c2ce3 + 02b073f488cda2fef27a6ba0a4cd2e288273166c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 4bfd0098e..fe65634cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20081.7 + 3.1.200-preview.20081.8 From 6dc2944d318bedd1f1a9c05be1ffb78313aa5d57 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 3 Feb 2020 10:46:25 -0800 Subject: [PATCH 21/50] Revert to 3.1.1 runtime (#6272) * Revert to 3.1.1 runtime * use 3.1.1 version of GenerateLayout.targets --- NuGet.config | 5 +- eng/Version.Details.xml | 80 +++++++++++------------ eng/Versions.props | 30 ++++----- src/redist/targets/GenerateLayout.targets | 2 +- 4 files changed, 59 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5efcd05c8..cac8fdf35 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,10 @@ - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c005ccef..906dff544 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 966115a91565d43cd545c1b8acd83eda2a0cb4cb + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e @@ -41,33 +41,33 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/dotnet/aspnetcore - c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc + + https://github.com/aspnet/AspNetCore + 2b7e994b8a304700a09617ffc5052f0d943bbcba - - https://github.com/dotnet/aspnetcore - c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/dotnet/aspnetcore - c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/dotnet/aspnetcore - c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/dotnet/aspnetcore - c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/dotnet/aspnetcore - c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - + https://github.com/dotnet/test-templates - 07c739a22eeb760e60322ac0989c998328fe0aa2 + 5117d3d9d7dfd3583f0c42a639efaf092f957b7b https://github.com/dotnet/templating @@ -86,13 +86,13 @@ cbf29e13514ba9d3be54eff7ccfe4b9df93e581b - + https://github.com/dotnet/winforms - b3a34e6695615d67a167fdbc436fce1e885f986e + 9483a88b7764a74d71cbd449de6c56c1d5e0af21 - - https://github.com/dotnet/wpf - b30a16a465c9a0ed7e641a9d55df2f6e5c878a81 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + a8e48616c8d8e56469a456eb1ee263268316b827 diff --git a/eng/Versions.props b/eng/Versions.props index fe65634cc..b0cd7f7d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,19 +16,19 @@ - 4.8.1-servicing.20069.13 + 4.8.1-servicing.19605.5 - 3.1.2-servicing.20069.7 + 3.1.0-rtm.19605.7 - 3.1.2 + 3.1.1-servicing.19605.2 - 1.0.2-beta4.20079.1 + 1.0.2-beta4.19570.1 @@ -36,12 +36,12 @@ - 3.1.2 - 3.1.2 - 3.1.2-servicing.20068.1 - 3.1.2-servicing.20068.1 - 3.1.2-servicing.20068.1 - 3.1.2-servicing.20068.1 + 3.1.1 + 3.1.0 + 3.1.1-servicing.19615.10 + 3.1.1-servicing.19615.10 + 3.1.1-servicing.19615.10 + 3.1.1-servicing.19615.10 @@ -61,12 +61,12 @@ - 3.1.2-servicing.20070.1 - 3.1.2 - 3.1.2 + 3.1.1-servicing.19608.4 + 3.1.1 + 3.1.1 3.1.0 - 3.1.2 - 3.1.2 + 3.1.1 + 3.1.1 3.1.0 2.1.0 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 751f97cf4..771478685 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -16,7 +16,7 @@ 3.1.0-rtm.19565.2 - 3.1.2-servicing.20068.1 + 3.1.0 3.1.0-rtm.19565.2 3.0.0 From 9afa016114ef4bfa56212ada810ec1e3581f653f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2020 22:24:13 +0000 Subject: [PATCH 22/50] Update dependencies from https://github.com/dotnet/toolset build 20200203.3 (#6276) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20103.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20103.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- NuGet.config | 3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index cac8fdf35..a7d9e7dce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,10 +8,7 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 906dff544..3980f7966 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 02b073f488cda2fef27a6ba0a4cd2e288273166c + 5d28dba08e74c3efe328410ed2c441a77a73805a https://github.com/dotnet/sdk 1de5bc87ab0a42441ceb3044aa0c74185dcb888f - + https://github.com/dotnet/cli - cbf29e13514ba9d3be54eff7ccfe4b9df93e581b + 96f648a89984f7f88b13a36eae069f76edc5516e diff --git a/eng/Versions.props b/eng/Versions.props index b0cd7f7d9..dc09f8af9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20081.8 + 3.1.200-preview.20103.3 @@ -45,7 +45,7 @@ - 3.1.200-preview.20059.1 + 3.1.200-preview.20103.1 0.2.0 From 68b3da9b496fa95668fdab7e248fee6ba6bb0b47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2020 22:57:45 +0000 Subject: [PATCH 23/50] Update dependencies from https://github.com/dotnet/toolset build 20200203.4 (#6277) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20103.4 --- 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 3980f7966..dc7fc90e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 5d28dba08e74c3efe328410ed2c441a77a73805a + 9b0de6dd501f68753d32c602fb492be843ebf576 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index dc09f8af9..f39a3d27e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20103.3 + 3.1.200-preview.20103.4 From 2eb843ac0381afe307b45e26124b9872f465651a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 21:02:55 +0000 Subject: [PATCH 24/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6284) * Update dependencies from https://github.com/dotnet/toolset build 20200204.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20104.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20104.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200204.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20104.6 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20104.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- NuGet.config | 1 - eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index a7d9e7dce..075766785 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 136af5108..faf62e8d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,13 +73,13 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 9b0de6dd501f68753d32c602fb492be843ebf576 + 46175b0e6dc423bb2019dd249d14a392eee1d518 - + https://github.com/dotnet/sdk - 1de5bc87ab0a42441ceb3044aa0c74185dcb888f + c9f0a7673c300873f72b1d6f97048d1c17760884 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index f39a3d27e..b1ac5bc81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20103.4 + 3.1.200-preview.20104.6 @@ -52,7 +52,7 @@ - 3.1.200-preview.20080.4 + 3.1.200-preview.20104.2 $(MicrosoftNETSdkPackageVersion) From 1090df74dd12bf659f2c8849f6e592d4fb6a7897 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 22:37:09 +0000 Subject: [PATCH 25/50] Update dependencies from https://github.com/dotnet/toolset build 20200204.7 (#6286) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20104.7 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20104.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 faf62e8d4..eb216128e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,13 +73,13 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 46175b0e6dc423bb2019dd249d14a392eee1d518 + eba47836cf1c67363c1e62b55d5a30d3fc4a685d - + https://github.com/dotnet/sdk - c9f0a7673c300873f72b1d6f97048d1c17760884 + 20950a8fe1eb06b181f08c778acc5bd4df9719db https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index b1ac5bc81..5489ece38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20104.6 + 3.1.200-preview.20104.7 @@ -52,7 +52,7 @@ - 3.1.200-preview.20104.2 + 3.1.200-preview.20104.3 $(MicrosoftNETSdkPackageVersion) From b3ddf6a2081d41ceed94fd4c931b5340c4b543bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 23:47:29 +0000 Subject: [PATCH 26/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6287) * Update dependencies from https://github.com/dotnet/toolset build 20200204.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20104.8 * Update dependencies from https://github.com/dotnet/toolset build 20200204.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20104.9 --- 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 eb216128e..9ebb8e486 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - eba47836cf1c67363c1e62b55d5a30d3fc4a685d + 869c8d132b4f1914e45a2e278d06ab9ff23f2540 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5489ece38..8e32bbd06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20104.7 + 3.1.200-preview.20104.9 From 7871a5b409215339267ad636a63811af0696e1db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2020 00:56:56 +0000 Subject: [PATCH 27/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6289) * Update dependencies from https://github.com/dotnet/toolset build 20200204.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20104.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20104.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200204.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20104.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20104.2 (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 9ebb8e486..f31124f41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 869c8d132b4f1914e45a2e278d06ab9ff23f2540 + e1054742a1364bef99a2f7bd907a41da82741da4 https://github.com/dotnet/sdk 20950a8fe1eb06b181f08c778acc5bd4df9719db - + https://github.com/dotnet/cli - 96f648a89984f7f88b13a36eae069f76edc5516e + 1fdbf3c21818378a8331e7d6c3bc5d3e6c82ee94 diff --git a/eng/Versions.props b/eng/Versions.props index 8e32bbd06..a4bc04dc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20104.9 + 3.1.200-preview.20104.11 @@ -45,7 +45,7 @@ - 3.1.200-preview.20103.1 + 3.1.200-preview.20104.2 0.2.0 From a746c802e7016f732f86e083b275c10dd3c0f897 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2020 17:27:05 -0800 Subject: [PATCH 28/50] Update dependencies from https://github.com/dotnet/toolset build 20200204.12 (#6291) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20104.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 f31124f41..d16621607 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - e1054742a1364bef99a2f7bd907a41da82741da4 + e12a1e5bb6a2d9ecfdc5a32eeb2a183f44b31578 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a4bc04dc8..f6543c505 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20104.11 + 3.1.200-preview.20104.12 From d8aeb111de9fe7f59bf5b8e4ddf43bf158677ef4 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Wed, 5 Feb 2020 13:36:31 +0100 Subject: [PATCH 29/50] Updated test template versions for 2.1, 3.0, and 3.1 Removing 2.2 version because it reached end of life and we don't produce that template anymore. --- eng/Versions.props | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f6543c505..8a42be504 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 1.0.2-beta4.19570.1 + 1.0.2-beta4.20105.2 @@ -96,19 +96,18 @@ 1.6.5 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) - 1.0.2-beta4.19354.2 + 1.0.2-beta4.20105.2 3.0.1 1.6.0 1.0.2-beta4 $(MicrosoftDotNetCommonItemTemplates22PackageVersion) - 1.0.2-beta4.19155.2 2.2.8 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4-20181009-2100240 + 1.0.2-beta4.20105.2 2.1.14 From 8fb2ddc08592075f4f5220c5633b09efe52e04c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2020 18:16:53 +0000 Subject: [PATCH 30/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6294) * Update dependencies from https://github.com/dotnet/toolset build 20200204.14 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20104.14 * Update dependencies from https://github.com/dotnet/toolset build 20200204.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20104.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20104.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 d16621607..2c6882e26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - e12a1e5bb6a2d9ecfdc5a32eeb2a183f44b31578 + 4d52f6a5fb82689582bbd23dace7b1eb3279daa9 https://github.com/dotnet/sdk 20950a8fe1eb06b181f08c778acc5bd4df9719db - + https://github.com/dotnet/cli - 1fdbf3c21818378a8331e7d6c3bc5d3e6c82ee94 + 281d35c146aa7d13787629ef42c931ce41563c9f diff --git a/eng/Versions.props b/eng/Versions.props index f6543c505..94c3d9839 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20104.12 + 3.1.200-preview.20104.15 @@ -45,7 +45,7 @@ - 3.1.200-preview.20104.2 + 3.1.200-preview.20104.3 0.2.0 From 4d32a82edff14d0e329e3e3ae9736264b08ded1d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 05:34:15 +0000 Subject: [PATCH 31/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6304) * Update dependencies from https://github.com/dotnet/toolset build 20200205.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20105.4 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20105.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200205.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20105.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20105.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200205.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20105.7 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20105.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20105.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c6882e26..6f78e54d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 4d52f6a5fb82689582bbd23dace7b1eb3279daa9 + 79967b4a51df5a10a2a3557b196b4b3cfdba7cae - + https://github.com/dotnet/sdk - 20950a8fe1eb06b181f08c778acc5bd4df9719db + f8d14891f5440e79d0449d357beb4cceede34382 - + https://github.com/dotnet/cli - 281d35c146aa7d13787629ef42c931ce41563c9f + 79c5e648b8cc0d891cee296d8141e35c421d8862 diff --git a/eng/Versions.props b/eng/Versions.props index 94c3d9839..4697f19de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20104.15 + 3.1.200-preview.20105.7 @@ -45,14 +45,14 @@ - 3.1.200-preview.20104.3 + 3.1.200-preview.20105.2 0.2.0 - 3.1.200-preview.20104.3 + 3.1.200-preview.20105.2 $(MicrosoftNETSdkPackageVersion) From 288bb5c8b61215ccf9715a8c99b42fcd2f03ac7d Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 5 Feb 2020 22:16:55 -0800 Subject: [PATCH 32/50] Remove all reference to 21 template --- eng/Versions.props | 5 --- src/redist/targets/Branding.targets | 1 - src/redist/targets/BundledTemplates.targets | 38 +-------------------- src/redist/targets/GenerateLayout.targets | 1 - src/redist/targets/GenerateMSIs.targets | 21 +----------- src/redist/targets/Signing.targets | 1 - 6 files changed, 2 insertions(+), 65 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8a42be504..cffeabf1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,11 +98,6 @@ $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.20105.2 3.0.1 - - 1.6.0 - 1.0.2-beta4 - $(MicrosoftDotNetCommonItemTemplates22PackageVersion) - 2.2.8 1.5.3 1.0.2-beta3 diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index 44174a784..f42f3cc32 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -15,7 +15,6 @@ $(SharedFrameworkName) Microsoft .NET Core 3.1 Templates $(CliBrandingVersion) Microsoft .NET Core 3.0 Templates $(CliBrandingVersion) - Microsoft .NET Core 2.2 Templates $(CliBrandingVersion) Microsoft .NET Core 2.1 Templates $(CliBrandingVersion) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 709da201f..7c2713bc9 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -18,14 +18,6 @@ - - - - - - @@ -57,15 +49,6 @@ - - - - - - - - - @@ -90,13 +73,6 @@ [%(PackageVersion)] - - - %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg - $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) - [%(PackageVersion)] - - %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg @@ -109,32 +85,27 @@ - @@ -151,7 +122,7 @@ + DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor31MSI;LayoutTemplatesFor30MSI;LayoutTemplatesFor21MSI" /> @@ -177,13 +148,6 @@ DestinationFolder="$(Templates30LayoutPath)templates/$(BundledTemplates30InstallPath)"/> - - - - diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 771478685..781fa0b8a 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -4,7 +4,6 @@ $(BaseOutputPath)$(Configuration)\dotnet-internal\ $(BaseOutputPath)$(Configuration)\templates-3.1\ $(BaseOutputPath)$(Configuration)\templates-3.0\ - $(BaseOutputPath)$(Configuration)\templates-2.2\ $(BaseOutputPath)$(Configuration)\templates-2.1\ $(IntermediateOutputPath)downloads\ diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index c73470943..6f6e8463d 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -41,7 +41,6 @@ Dotnet_CLI $(ArtifactsShippingPackagesDir)dotnet-31templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) - $(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-21templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-sdkplaceholder-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) NetCore_SdkPlaceholder @@ -60,7 +59,7 @@ DependsOnTargets="GenerateLayout;SetupWixProperties;GetCoreSdkGitCommitInfo"> - + - - - - @@ -214,14 +208,6 @@ $(Templates30InstallerUpgradeCode) NetCore_Templates_3.0 - - $(Templates22LayoutPath.TrimEnd('\')) - $(Templates22MSIInstallerFile) - $(BundledTemplates22BrandName) - $(BundledTemplates22MsiVersion) - $(Templates22InstallerUpgradeCode) - NetCore_Templates_2.2 - $(Templates21LayoutPath.TrimEnd('\')) $(Templates21MSIInstallerFile) @@ -345,11 +331,6 @@ $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(FullNugetVersion).nupkg $(BundledTemplates30MajorMinorVersion) - - $(Templates22MSIInstallerFile) - $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates22MajorMinorVersion).$(FullNugetVersion).nupkg - $(BundledTemplates22MajorMinorVersion) - $(Templates21MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates21MajorMinorVersion).$(FullNugetVersion).nupkg diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index c6f771010..0d5eb9596 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -177,7 +177,6 @@ - From a6b14864c84583dfbe0302be514814cf5a78db72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2020 22:49:33 +0000 Subject: [PATCH 33/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6310) * Update dependencies from https://github.com/dotnet/toolset build 20200206.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20106.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20106.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200207.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20107.3 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20106.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 6f78e54d0..fa1dff59f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,13 +73,13 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 79967b4a51df5a10a2a3557b196b4b3cfdba7cae + 9fad3091515f3c77ab94d4a1a6620117026107ab - + https://github.com/dotnet/sdk - f8d14891f5440e79d0449d357beb4cceede34382 + 261e44a129f73bec98adf6eb3b45556f121316e8 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 039275382..eb55b1458 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20105.7 + 3.1.200-preview.20107.3 @@ -52,7 +52,7 @@ - 3.1.200-preview.20105.2 + 3.1.200-preview.20106.1 $(MicrosoftNETSdkPackageVersion) From df52b3c339a61fc6dbe7792cda41da09787cc8dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Feb 2020 00:07:49 +0000 Subject: [PATCH 34/50] Update dependencies from https://github.com/dotnet/toolset build 20200207.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20107.5 --- 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 fa1dff59f..1ab685abe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 9fad3091515f3c77ab94d4a1a6620117026107ab + 5ed3610c33745c7b6be15c1690040a6554f5cb98 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index eb55b1458..a0c9ea549 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20107.3 + 3.1.200-preview.20107.5 From af41478b6403b8a010083602018d9c85d0e93a1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Feb 2020 00:31:40 +0000 Subject: [PATCH 35/50] Update dependencies from https://github.com/dotnet/toolset build 20200207.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20107.7 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20106.2 (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 1ab685abe..623863dd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,13 +73,13 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 5ed3610c33745c7b6be15c1690040a6554f5cb98 + a5f564c82ee7c4c371d9f3b6513d8f7b437fe8f0 - + https://github.com/dotnet/sdk - 261e44a129f73bec98adf6eb3b45556f121316e8 + 1951672f0cdf3ab6a9841781bdf17b3619ca2755 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index a0c9ea549..ab8b45469 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20107.5 + 3.1.200-preview.20107.7 @@ -52,7 +52,7 @@ - 3.1.200-preview.20106.1 + 3.1.200-preview.20106.2 $(MicrosoftNETSdkPackageVersion) From 00f10c1f7643f12dc411fe23a3a25292605847da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 9 Feb 2020 06:40:03 +0000 Subject: [PATCH 36/50] Update dependencies from https://github.com/dotnet/toolset build 20200208.2 (#6320) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20108.2 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20107.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20107.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 623863dd2..17302c1bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - a5f564c82ee7c4c371d9f3b6513d8f7b437fe8f0 + 25c7517a93a64651195f7669e29ce6426db51080 - + https://github.com/dotnet/sdk - 1951672f0cdf3ab6a9841781bdf17b3619ca2755 + 130be5a782f6fa8410627a8fddd3e2988bde1c71 - + https://github.com/dotnet/cli - 79c5e648b8cc0d891cee296d8141e35c421d8862 + ce7027083cc440b7d9715b5d3ea73ac3f2069c22 diff --git a/eng/Versions.props b/eng/Versions.props index ab8b45469..2ab2d4f08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20107.7 + 3.1.200-preview.20108.2 @@ -45,14 +45,14 @@ - 3.1.200-preview.20105.2 + 3.1.200-preview.20107.2 0.2.0 - 3.1.200-preview.20106.2 + 3.1.200-preview.20107.4 $(MicrosoftNETSdkPackageVersion) From ca5522cead2523cef175a2e47333ba129c26cbd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 9 Feb 2020 16:20:57 +0000 Subject: [PATCH 37/50] Update dependencies from https://github.com/dotnet/toolset build 20200208.3 (#6321) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20108.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 17302c1bf..2ca52088b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 25c7517a93a64651195f7669e29ce6426db51080 + 10b58218b32345dd2daac5aff6b7d2b5e72312e1 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2ab2d4f08..ddeff7283 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20108.2 + 3.1.200-preview.20108.3 From 1619ec80265cc632901505f929f3470bd349499b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 01:12:28 +0000 Subject: [PATCH 38/50] Update dependencies from https://github.com/dotnet/toolset build 20200210.6 (#6333) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20110.6 --- 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 2ca52088b..c0bc219fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 10b58218b32345dd2daac5aff6b7d2b5e72312e1 + 6ad9111885d0b3b74bad8adc6e10a08d63c4963a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ddeff7283..76d213f8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20108.3 + 3.1.200-preview.20110.6 From 9634d8d8a59f0bb27025833f2c460e64f82ffcfb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 04:35:54 +0000 Subject: [PATCH 39/50] Update dependencies from https://github.com/dotnet/toolset build 20200210.7 (#6336) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20110.7 --- 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 c0bc219fe..d6a3049ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 6ad9111885d0b3b74bad8adc6e10a08d63c4963a + 93b15f339409b2fbf7978cd41b9f5e375d7defb9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 76d213f8f..3add5b03b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20110.6 + 3.1.200-preview.20110.7 From f2bd58fe6bca24d5ae1b5215eb2a6cd14063aa76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2020 03:57:23 +0000 Subject: [PATCH 40/50] Update dependencies from https://github.com/dotnet/toolset build 20200212.2 (#6360) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20112.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 d6a3049ff..134aa2b8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 93b15f339409b2fbf7978cd41b9f5e375d7defb9 + 308b971f7ffe6ea66420ef52c4b1d5560822b2a7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3add5b03b..295d1c64a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20110.7 + 3.1.200-preview.20112.2 From 94a1f40b45dcf8368e9525b487cd9df8248ad13d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2020 06:42:59 +0000 Subject: [PATCH 41/50] Update dependencies from https://github.com/dotnet/toolset build 20200212.3 (#6362) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20112.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 134aa2b8d..7adabc22e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 308b971f7ffe6ea66420ef52c4b1d5560822b2a7 + c408596a0c8ee062e7b008eb0daa36c32489a5bb https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 295d1c64a..24c17bb9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20112.2 + 3.1.200-preview.20112.3 From f57c93c0a82766d1986f4db72dbfbbd9d97c940d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2020 19:52:26 +0000 Subject: [PATCH 42/50] Update dependencies from https://github.com/dotnet/toolset build 20200213.1 (#6370) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20113.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 7adabc22e..f1f04d99e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - c408596a0c8ee062e7b008eb0daa36c32489a5bb + a1c6678066e7ad854eea0a877ea7fddc3895f44d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 24c17bb9d..911481f6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20112.3 + 3.1.200-preview.20113.1 From de8a3a214ccc3e4e2ba5949541a18f253253c4ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 00:39:32 +0000 Subject: [PATCH 43/50] Update dependencies from https://github.com/dotnet/arcade build 20200213.5 (#6373) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.20113.5 --- eng/Version.Details.xml | 4 ++-- eng/common/darc-init.ps1 | 2 +- .../templates/post-build/post-build.yml | 24 +++++++++++++++++++ global.json | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1f04d99e..055424126 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,9 +102,9 @@ - + https://github.com/dotnet/arcade - 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + 15f00efd583eab4372b2e9ca25bd80ace5b119ad diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 46d175fdf..b94c2f4e4 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -27,7 +27,7 @@ function InstallDarcCli ($darcVersion) { Write-Host "Installing Darc CLI version $darcVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1 } InstallDarcCli $darcVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index b121d77e0..3c69186f0 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -341,4 +341,28 @@ stages: channelId: 557 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Publishing' + channelName: '.NET Core SDK 3.1.3xx' + channelId: 759 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.3xx Internal' + channelId: 760 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index 84f775a7a..2c321daa9 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5" } } From 41ab79d7fd5dbdd3c4d4a81214e6db520345e017 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 03:05:09 +0000 Subject: [PATCH 44/50] Update dependencies from https://github.com/dotnet/toolset build 20200213.6 (#6378) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20113.6 --- 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 055424126..084f3deff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - a1c6678066e7ad854eea0a877ea7fddc3895f44d + 3ab06e3a80dfdb3c8d6d1a1c1499743bb185391e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 911481f6c..1c323f774 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20113.1 + 3.1.200-preview.20113.6 From 498b2e7e59b98196fa4d81a34ed42a69ca40b7dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 03:37:11 +0000 Subject: [PATCH 45/50] Update dependencies from https://github.com/dotnet/toolset build 20200213.7 (#6380) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20113.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20113.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 084f3deff..49ffe2fde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 3ab06e3a80dfdb3c8d6d1a1c1499743bb185391e + 0bf3abac96f2282400d0f3dd872d1b00fd32c4aa https://github.com/dotnet/sdk 130be5a782f6fa8410627a8fddd3e2988bde1c71 - + https://github.com/dotnet/cli - ce7027083cc440b7d9715b5d3ea73ac3f2069c22 + 6bd49230cf41bf1c263e5b0b60da4ced63316837 diff --git a/eng/Versions.props b/eng/Versions.props index 1c323f774..37c27c983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20113.6 + 3.1.200-preview.20113.7 @@ -45,7 +45,7 @@ - 3.1.200-preview.20107.2 + 3.1.200-preview.20113.3 0.2.0 From aa3a82d96ede5276786a80f061e78b8238646cfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 05:47:52 +0000 Subject: [PATCH 46/50] [release/3.1.2xx] Update dependencies from dotnet/toolset (#6382) * Update dependencies from https://github.com/dotnet/toolset build 20200213.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20113.8 * Update dependencies from https://github.com/dotnet/toolset build 20200213.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20113.9 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20113.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20200213.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20113.12 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.200-preview.20113.2 (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 49ffe2fde..9faf141bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,13 +73,13 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 0bf3abac96f2282400d0f3dd872d1b00fd32c4aa + 0c08f73cd1ce63143cd6b78c34524d5f2a5474eb - + https://github.com/dotnet/sdk - 130be5a782f6fa8410627a8fddd3e2988bde1c71 + 0bc67530cef6dd771a8750d1747926eca2dcb845 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 37c27c983..11f70c717 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20113.7 + 3.1.200-preview.20113.12 @@ -52,7 +52,7 @@ - 3.1.200-preview.20107.4 + 3.1.200-preview.20113.2 $(MicrosoftNETSdkPackageVersion) From ec739907966c6b1f4f340c4207ef491d737cf3cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 09:22:29 +0000 Subject: [PATCH 47/50] Update dependencies from https://github.com/dotnet/toolset build 20200214.1 (#6386) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20114.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 9faf141bb..ea46e8141 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 0c08f73cd1ce63143cd6b78c34524d5f2a5474eb + e67c4a6cfcf1c7dc3cafd40427024fb8495f2333 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 11f70c717..300d0d9c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20113.12 + 3.1.200-preview.20114.1 From 9719dc0d730bab8a2cbc315e53990d1d985fbca1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2020 20:59:53 +0000 Subject: [PATCH 48/50] Update dependencies from https://github.com/dotnet/toolset build 20200218.2 (#6446) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20118.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.200-preview.20118.2 (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 ea46e8141..1d61692b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,17 +73,17 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - e67c4a6cfcf1c7dc3cafd40427024fb8495f2333 + 0431c8677d3933fdfbd62946dbdd31294787a11a https://github.com/dotnet/sdk 0bc67530cef6dd771a8750d1747926eca2dcb845 - + https://github.com/dotnet/cli - 6bd49230cf41bf1c263e5b0b60da4ced63316837 + 003454db824f0bd58d0b7a967e42f11f20692a48 diff --git a/eng/Versions.props b/eng/Versions.props index 300d0d9c3..f33bf1830 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20114.1 + 3.1.200-preview.20118.2 @@ -45,7 +45,7 @@ - 3.1.200-preview.20113.3 + 3.1.200-preview.20118.2 0.2.0 From 633a9e8178bfce7352f1210f4eb47ba7be0102dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Feb 2020 05:32:16 +0000 Subject: [PATCH 49/50] Update dependencies from https://github.com/dotnet/toolset build 20200218.13 (#6458) - Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20118.13 --- 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 1d61692b6..87c215190 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ https://github.com/dotnet/templating 13abe7e2749d95337e8d72efdc5b71611815fd43 - + https://github.com/dotnet/toolset - 0431c8677d3933fdfbd62946dbdd31294787a11a + e8dfcaf6d27640aea0af2ee4623f9a5e3c9cd407 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f33bf1830..22fa2550b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20118.2 + 3.1.200-preview.20118.13 From c6b041e78c34b237c9da6c00889272cfaa6ba8e1 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 19 Feb 2020 15:43:20 -0800 Subject: [PATCH 50/50] Fix merge issues with templates --- .../CalculateTemplateVersions.cs | 27 +++++++++---------- src/redist/targets/BundledTemplates.targets | 26 ++++++++---------- .../CalculateTemplateVerionsTests.cs | 16 +++++------ 3 files changed, 32 insertions(+), 37 deletions(-) diff --git a/src/core-sdk-tasks/CalculateTemplateVersions.cs b/src/core-sdk-tasks/CalculateTemplateVersions.cs index 55d58fd40..b133ea29c 100644 --- a/src/core-sdk-tasks/CalculateTemplateVersions.cs +++ b/src/core-sdk-tasks/CalculateTemplateVersions.cs @@ -12,38 +12,37 @@ namespace Microsoft.DotNet.Cli.Build [Required] public string AspNetCorePackageVersionTemplate { get; set; } - [Required] - public string GitCommitCount { get; set; } - [Required] public string VersionSuffix { get; set; } - [Output] - public string BundledTemplateMSIVersion { get; set; } - [Output] public string BundledTemplateInstallPath { get; set; } [Output] public string BundledTemplateMajorMinorVersion { get; set; } + [Output] + public string BundledTemplateMajorMinorPatchVersion { get; set; } + private const int _patchVersionResetOffset = 1; public override bool Execute() { - var result = Calculate(AspNetCorePackageVersionTemplate, GitCommitCount, VersionSuffix); - BundledTemplateMSIVersion = result.BundledTemplateMsiVersion; + var result = Calculate(AspNetCorePackageVersionTemplate, VersionSuffix); BundledTemplateInstallPath = result.BundledTemplateInstallPath; BundledTemplateMajorMinorVersion = result.BundledTemplateMajorMinorVersion; + BundledTemplateMajorMinorPatchVersion = result.BundledTemplateMajorMinorPatchVersion; return true; } public static - (string BundledTemplateMsiVersion, - string BundledTemplateInstallPath, - string BundledTemplateMajorMinorVersion) Calculate(string aspNetCorePackageVersionTemplate, - string gitCommitCount, string versionSuffix) + (string BundledTemplateInstallPath, + string BundledTemplateMajorMinorVersion, + string BundledTemplateMajorMinorPatchVersion) + Calculate( + string aspNetCorePackageVersionTemplate, + string versionSuffix) { var aspNetCoreTemplate = NuGetVersion.Parse(aspNetCorePackageVersionTemplate); @@ -54,9 +53,9 @@ namespace Microsoft.DotNet.Cli.Build : $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}"; return ( - $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}.{gitCommitCount}", bundledTemplateInstallPath, - $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}"); + $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}", + $"{baseMajorMinorPatch.Major}.{baseMajorMinorPatch.Minor}.{baseMajorMinorPatch.Patch}"); } private static NuGetVersion GetBaseMajorMinorPatch(NuGetVersion aspNetCoreTemplate) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 2622d3e8e..68f15cabb 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -1,43 +1,39 @@ - + - + VersionSuffix="$(VersionSuffix)"> + - + VersionSuffix="$(VersionSuffix)"> + - + VersionSuffix="$(VersionSuffix)"> + + + VersionMajorMinorPatch="$(BundledTemplates31MajorMinorPatchVersion)"> + VersionMajorMinorPatch="$(BundledTemplates30MajorMinorPatchVersion)"> - + VersionMajorMinorPatch="$(BundledTemplates21MajorMinorPatchVersion)"> diff --git a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs index 8f25cc34e..3d5082f32 100644 --- a/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs +++ b/test/core-sdk-tasks.Tests/CalculateTemplateVerionsTests.cs @@ -9,10 +9,10 @@ namespace EndToEnd [Fact] public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInStableBuilds() { - var result = CalculateTemplateVersions.Calculate("3.1.0", "014885", "dev"); + var result = CalculateTemplateVersions.Calculate("3.1.0", "dev"); result.Should() - .Be(("3.1.1.014885", "3.1.1", "3.1"), + .Be(("3.1.1", "3.1", "3.1.1"), "the patch is 1 higher than aspnetTemplateVersion " + "due to https://github.com/dotnet/core-sdk/issues/6243"); } @@ -20,19 +20,19 @@ namespace EndToEnd [Fact] public void WhenAspNetCoreTemplateMajorVersionLowerthan3ItCanCalculateTemplateVersionsInNonStableBuilds() { - var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6", "014885", "dev"); + var result = CalculateTemplateVersions.Calculate("3.0.0-alpha.1.20071.6", "dev"); result.Should() - .Be(("3.0.1.014885", "3.0.1-dev", "3.0")); + .Be(("3.0.1-dev", "3.0", "3.0.1")); } [Fact] public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInStableBuilds() { - var result = CalculateTemplateVersions.Calculate("5.1.0", "014885", "dev"); + var result = CalculateTemplateVersions.Calculate("5.1.0", "dev"); result.Should() - .Be(("5.1.0.014885", "5.1.0", "5.1"), + .Be(("5.1.0", "5.1", "5.1.0"), "the patch align with AspNetCoreTemplateMajorVersion again, " + "since there is no non-deterministic existing ComponentId under Major version 5."); } @@ -40,10 +40,10 @@ namespace EndToEnd [Fact] public void WhenAspNetCoreTemplateMajorVersionHigherthan3ItCanCalculateTemplateVersionsInNonStableBuilds() { - var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "014885", "dev"); + var result = CalculateTemplateVersions.Calculate("5.0.0-alpha.1.20071.6", "dev"); result.Should() - .Be(("5.0.0.014885", "5.0.0-dev", "5.0")); + .Be(("5.0.0-dev", "5.0", "5.0.0")); } } }