From b3ad7d3c8b314d4aa09e219bbf2edd10a0f7763e Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 26 Jun 2018 17:10:42 -0700 Subject: [PATCH 1/6] Updating branding to 401. --- build/BranchInfo.props | 4 ++-- build/Version.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index c7a84c19d..86fd82b58 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - release/2.1.4xx - release/2.1.4xx + release/2.1.401 + release/2.1.401 diff --git a/build/Version.props b/build/Version.props index cde7dcc9d..c2309c774 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 400 + 401 preview $(VersionMajor).$(VersionMinor) From ce5493b7d689db54354542743eff79eb1747f5ff Mon Sep 17 00:00:00 2001 From: jbeisner Date: Fri, 29 Jun 2018 20:10:19 +0000 Subject: [PATCH 2/6] Fixing recent ProCon test failures. --- .../TestWebAppSimple/TestWebAppSimple.csproj | 11 +++++++++-- .../GivenAspNetAppsResolveImplicitVersions.cs | 6 +++--- .../GivenAProjectToolsCommandResolver.cs | 2 +- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj index f600e9d8e..a590d599c 100644 --- a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj +++ b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj @@ -13,11 +13,18 @@ - + + + + + - + diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs index dc780f792..c4096b9da 100644 --- a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs +++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs @@ -48,11 +48,11 @@ namespace EndToEnd var restoredVersion = GetAspNetCoreAppVersion(assetsFile, portable: true); restoredVersion.Should().NotBeNull(); - var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion"); + var bundledVersionPath = Path.Combine(projectDirectory, ".DefaultPatchVersionForAspNetCoreApp2_1"); var bundledVersion = File.ReadAllText(bundledVersionPath).Trim(); restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion, - "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." + + "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be identical to the versions generated." + "Please update MSBuildExtensions.targets in this repo so these versions match."); } @@ -98,7 +98,7 @@ namespace EndToEnd var bundledVersion = File.ReadAllText(bundledVersionPath).Trim(); restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion, - "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." + + "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be identical to the versions set in DependencyVersions.props." + "Please update MSBuildExtensions.targets in this repo so these versions match."); } diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 632a1cc36..6da24c7a3 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.1.1"); + result.Args.Should().Contain("--fx-version 2.1"); } [Fact] diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index cb9d8135e..2585c50fc 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -106,7 +106,7 @@ namespace Microsoft.DotNet.New.Tests var sharedFxDir = dotnetDir .GetDirectory("shared", "Microsoft.NETCore.App") .EnumerateDirectories() - .Single(d => d.Name.StartsWith("2.1.1")); + .Single(d => d.Name.StartsWith("2.1")); if (packageName == "microsoft.netcore.app") { From ed629af9a605ff72ff86e43f7a49bc81f4b731bd Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 13 Jul 2018 18:48:13 -0700 Subject: [PATCH 3/6] Update coresetup, sdk to preview1-26216-03, servicing-63108-01, respectively (#9635) --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2d126aaaa..d5440b883 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -10,7 +10,7 @@ 2.1.1 2.1.1 2.1.1 - 2.1.2 + 2.1.3-servicing-26708-02 $(MicrosoftNETCoreAppPackageVersion) 15.8.0-preview-000160 $(MicrosoftBuildPackageVersion) From e63a8b5a522cf1501fc89e5f7923b50bc4dc544a Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 23 Jul 2018 23:25:16 +0000 Subject: [PATCH 4/6] Update coresetup, sdk to preview1-26216-03, servicing-63122-02, respectively --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3f9a9c7fa..cb8d1837d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -10,7 +10,7 @@ 2.1.1 2.1.1 2.1.1 - 2.1.3-servicing-26708-02 + 2.1.3-servicing-26722-02 $(MicrosoftNETCoreAppPackageVersion) 15.8.166 $(MicrosoftBuildPackageVersion) @@ -23,7 +23,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.400-preview-63120-01 + 2.1.400-servicing-63122-02 $(MicrosoftNETSdkPackageVersion) 2.1.1 2.1.400-preview1-20180705-1834985 From 3adf70de814f18c1c5887f8bf73dfe78a82969b7 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 25 Jul 2018 03:22:18 +0000 Subject: [PATCH 5/6] Update coresetup, sdk to preview1-26216-03, servicing-63124-04, respectively --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cb8d1837d..014ffe6de 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -10,7 +10,7 @@ 2.1.1 2.1.1 2.1.1 - 2.1.3-servicing-26722-02 + 2.1.3-servicing-26724-03 $(MicrosoftNETCoreAppPackageVersion) 15.8.166 $(MicrosoftBuildPackageVersion) @@ -23,7 +23,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.400-servicing-63122-02 + 2.1.400-servicing-63124-04 $(MicrosoftNETSdkPackageVersion) 2.1.1 2.1.400-preview1-20180705-1834985 From 817e3218950c787c86949d3541e2b62e04e91a4f Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 2 Aug 2018 09:02:57 -0700 Subject: [PATCH 6/6] Keeping branch info as 2.1.4xx. --- build/BranchInfo.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index 86fd82b58..c7a84c19d 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - release/2.1.401 - release/2.1.401 + release/2.1.4xx + release/2.1.4xx