From 2277ac91da9023fbc6d5a2dcf6155bb8d614e725 Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Wed, 30 Aug 2017 22:05:09 +0000 Subject: [PATCH 01/18] Merged PR 82801: Allow non-anonymous storage account access for .lzma download Allow non-anonymous storage account access for .lzma download --- build/compile/LzmaArchive.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index 98a23337bc..494164b262 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -2,10 +2,12 @@ + + ?$(CoreSetupBlobAccessToken) $(SdkOutputDirectory)/nuGetPackagesArchive.lzma nuGetPackagesArchive.$(AspNetCoreRuntimePackageFlavor).lzma $(IntermediateDirectory)/$(NugetPackagesArchiveName) - $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(NugetPackagesArchiveName) + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(NugetPackagesArchiveName)$(CoreSetupBlobAccessTokenParam) Date: Fri, 6 Oct 2017 11:08:02 -0700 Subject: [PATCH 02/18] Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM. --- build/BundledRuntimes.props | 3 +++ build/Test.targets | 35 ++++++++++++++++++++++++++++++++ build/package/Installer.DEB.proj | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index a3c20a3e96..cbc7a67a0a 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -21,6 +21,9 @@ $(CoreSetupRid) linux-x64 dotnet-runtime-$(SharedFrameworkVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + + $([System.Text.RegularExpressions.Regex]::IsMatch($(SharedFrameworkVersion), '\d*\.\d*\.\d*-')) + $([System.Text.RegularExpressions.Regex]::Match($(SharedFrameworkVersion), '\d*\.\d*\.\d*').get_Groups().get_Item(0).ToString()) diff --git a/build/Test.targets b/build/Test.targets index 4fadf70e43..0b8bc06208 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -38,6 +38,35 @@ + + + + $(OutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion) + $(Stage2WithBackwardsCompatibleRuntimesOutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion) + + + + + + + + + + + + + + + + + + + + - Microsoft .NET Core SDK - 2.0.3 + Microsoft .NET Core SDK - 15.5.1 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.1 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 2f7ba1395e..73336fce77 100644 --- a/build/Version.props +++ b/build/Version.props @@ -1,9 +1,9 @@ - 2 - 0 - 3 - servicing + 15 + 5 + 1 + preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount) From 7ce43b9e3e41b5783520fdc874eb99dfd9af2e58 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 9 Oct 2017 11:37:12 -0700 Subject: [PATCH 04/18] Updating the runtime version. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index ab6b45f753..50c72e3c6a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0 + 2.0.3-servicing-25808-01 15.5.0-preview-000113-1032064 2.6.0-beta1-62126-01 2.3.0-pre-20170727-1 From e11c66e7f08e05f5dec758f9bf115cc77c047e6e Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 9 Oct 2017 12:35:38 -0700 Subject: [PATCH 05/18] Fixing the expected runtime version by the tool tests. --- .../GivenAProjectToolsCommandResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 83a877151d..8c2cc12359 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -309,7 +309,7 @@ public void ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile() result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.0"); + result.Args.Should().Contain("--fx-version 2.0.3-servicing-25808-01"); } [Fact] From ec9b583eb48ff54c391aca8b9fdc0c9295ba7a2b Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 9 Oct 2017 14:09:48 -0700 Subject: [PATCH 06/18] Adding the access token to the native installer URLs so that we can download those from protected locations when needed. --- build/package/Installer.DEB.targets | 2 +- build/package/Installer.RPM.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index b041bc344c..103d3782f2 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -126,7 +126,7 @@ $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 1781d689b5..c6ede8b3df 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -188,7 +188,7 @@ $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) From 34235acb3716a68cda1223ed89cea297665e39fe Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 9 Oct 2017 15:27:05 -0700 Subject: [PATCH 07/18] Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime. --- build/package/Installer.RPM.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index c6ede8b3df..b2a10eb39e 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -213,7 +213,7 @@ - - - + + + + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index bc353e1018..aa3ef1681b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -30,16 +30,16 @@ 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 - 1.0.417 0.2.0-beta-000042 + 2.0.3 notimestamp - 2.0.0 + 2.0.3 rtm - 2.0.0 - 26452 + 2.0.3 + 120 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From d4f980a02e9ffc9c99a0e8130ac132160445ce31 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 20 Oct 2017 14:23:34 -0700 Subject: [PATCH 09/18] Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now. --- build/package/Installer.DEB.proj | 4 ++++ build/package/Installer.DEB.targets | 6 ++++++ build/package/Installer.RPM.targets | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 59fd3f2f0d..c3baf267bd 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -25,6 +25,7 @@ + @@ -88,6 +89,7 @@ + @@ -107,6 +109,7 @@ + @@ -122,6 +125,7 @@ + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 103d3782f2..4ab22f6dc9 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -36,6 +36,7 @@ $(HostFxrDebianPackageName.ToLower()) dotnet-host $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) + $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(HostRid) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb @@ -123,8 +124,13 @@ + $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb + $(PackagesDirectory)/AspNetCoreRuntimeDebInstallerFileName200 $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index b2a10eb39e..55284c27bb 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -53,6 +53,7 @@ $(HostRid) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) + $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm @@ -185,8 +186,13 @@ + $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm + $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200) $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) + @@ -225,6 +231,7 @@ + @@ -241,6 +248,7 @@ + From e37e9f3fe8a325d87573f576161799b92580bb32 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 20 Oct 2017 14:43:29 -0700 Subject: [PATCH 10/18] Fixing closing tags in the DEB and RPM targets. --- build/package/Installer.DEB.targets | 2 +- build/package/Installer.RPM.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 4ab22f6dc9..00afd7f30a 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -124,7 +124,7 @@ - $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb + $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb $(PackagesDirectory)/AspNetCoreRuntimeDebInstallerFileName200 $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 55284c27bb..a4f7853ca1 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -186,7 +186,7 @@ - $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm + $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200) $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) From 687cba8ca8ab1bbc9bb87a0c3800f96b3fa1ac25 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 20 Oct 2017 16:35:01 -0700 Subject: [PATCH 11/18] Updating branding to 2.0.3, again --- build/Branding.props | 2 +- build/Version.props | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 9d5d5b29bb..9a66fdc2df 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 15.5.1 + Microsoft .NET Core SDK - 2.0.3 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.1 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 73336fce77..b8a2d499e8 100644 --- a/build/Version.props +++ b/build/Version.props @@ -1,8 +1,8 @@ - 15 - 5 - 1 + 2 + 0 + 3 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) From 347169e68a2a83ff4b61c0a70f076cfa8eb4ee96 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 24 Oct 2017 15:27:08 -0700 Subject: [PATCH 12/18] Update aspnetcore to 2.0.3 build 123 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index aa3ef1681b..45e8366d9b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -39,7 +39,7 @@ 2.0.3 rtm 2.0.3 - 120 + 123 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 878532eedf84129671fe7583a8198d6c9af158cb Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 27 Oct 2017 07:57:14 -0700 Subject: [PATCH 13/18] Update aspnetcore to 2.0.3 build 124 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 45e8366d9b..e34b044d7f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -39,7 +39,7 @@ 2.0.3 rtm 2.0.3 - 123 + 124 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 255e7bc850303724b31545d0c91795a176467ad1 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 31 Oct 2017 09:10:35 -0700 Subject: [PATCH 14/18] Update aspnetcore to 2.0.3 build 125 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e34b044d7f..88d76f8a03 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -39,7 +39,7 @@ 2.0.3 rtm 2.0.3 - 124 + 125 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From aa944444f61560c1e9b072d22aa9f6ca3506a354 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 8 Nov 2017 14:31:06 -0800 Subject: [PATCH 15/18] Update SDK to 2.0.2-vspre-20170927-1. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3f359e31f8..1b18e6991f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.1-servicing-20170926-1 + 2.0.2-vspre-20170927-1 $(CLI_NETSDK_Version) 4.4.0-preview3-4475 From f85436d82d94075385eb2ee903ca7b7dce4ea546 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 8 Nov 2017 19:16:27 -0800 Subject: [PATCH 16/18] Updating SDK to 2.0.3-servicing-20171109-3 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1b18e6991f..20f5daa407 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.2-vspre-20170927-1 + 2.0.3-servicing-20171109-3 $(CLI_NETSDK_Version) 4.4.0-preview3-4475 From e212767253e4aaf89cb38627c923925078372396 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 14 Nov 2017 12:57:11 -0800 Subject: [PATCH 17/18] Keeping the branding suffix as servicing. --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index b8a2d499e8..2f7ba1395e 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ 2 0 3 - preview + servicing $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount) From dad6eb275d29cab7e9798185c983e0df6eca63f4 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 14 Nov 2017 18:54:01 -0800 Subject: [PATCH 18/18] Adding the ASP.NET feed where the ASP.NET templates are being published to. --- NuGet.Config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.Config b/NuGet.Config index 95416b2f12..1b3a83551e 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -18,5 +18,6 @@ +