From b84a0eb8b234619e11b72a3351be1f3fb246c22f Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Thu, 29 Mar 2018 23:11:58 -0700 Subject: [PATCH 01/14] MSBuild 15.6.84 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index be87b86d7..62e529dca 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.7-servicing-26322-01 $(MicrosoftNETCoreAppPackageVersion) - 15.6.82 + 15.6.84 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From d3a78f7d3fd9e1b55f17f336bf8668025c65abb7 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Fri, 30 Mar 2018 09:10:10 -0700 Subject: [PATCH 02/14] Add msbuild myget.org feed --- build/NugetConfigFile.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index e0737ca5a..55ebdf871 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -33,6 +33,7 @@ + ]]> From 27435ea589fd6b516400ad41bb4affe508f54c1a Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 30 Mar 2018 10:21:43 -0700 Subject: [PATCH 03/14] Update SDK to 2.1.100-preview-62730-07 Contains a matching NuGet version to the one in the CLI. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 9a093e602..5d19eb80f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.7.0-beta3-62707-11 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.100-preview-62721-01 + 2.1.100-preview-62730-07 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20171110-671 $(MicrosoftNETSdkWebPackageVersion) From 5b8949e66b2512412f9dbc7b79fc54fa6409f70a Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 18:19:24 -0700 Subject: [PATCH 04/14] Updating the runtime to 2.0.7 and the CLI branding to 2.1.104. --- build/Branding.props | 2 +- build/DependencyVersions.props | 3 ++- .../GivenAProjectToolsCommandResolver.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 4b0a55ab0..234b69304 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -2,7 +2,7 @@ Microsoft .NET Core SDK - 2.1.104 .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime - 2.0.6 + Microsoft .NET Core Runtime - 2.0.7 Microsoft .NET Core Host - 2.0.1 Microsoft .NET Core Host FX Resolver - 2.0.0 diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 25a97c5bb..8e732a775 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,8 @@ - 2.0.6 + + 2.0.7 $(MicrosoftNETCoreAppPackageVersion) 15.6.84 $(MicrosoftBuildPackageVersion) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 4333b887c..90f68472c 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.6"); + result.Args.Should().Contain("--fx-version 2.0.7"); } [Fact] From caff97a3ee6e4e4c25ffa282e0a2c4d163876b7b Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 21:37:27 -0700 Subject: [PATCH 05/14] Updating the CLI branding to 2.1.105, to go over the 104 release we will have to do for NuGet. Also, fixed the branding of the runtime in our installers to 2.0.7. --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 4 ++-- packaging/windows/clisdk/bundle.wxl | 4 ++-- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 234b69304..3a8979d5d 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.104 + Microsoft .NET Core SDK - 2.1.105 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.7 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 8753235f1..72f42115f 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 104 + 105 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 59d03795e..53b6fca6e 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,8 +50,8 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.104 - • .NET Core Runtime 2.0.6 + • .NET Core SDK 2.1.105 + • .NET Core Runtime 2.0.7 • Runtime Package Store This product collects usage data From 9b68d55059fc043c66496ea5c3405d59d5e94d6c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 30 Mar 2018 13:24:07 -0700 Subject: [PATCH 06/14] Moving the opensuse 43.2 docker file to the right folder. --- scripts/docker/{opensuse.42.3 => opensuse.43.2}/Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/docker/{opensuse.42.3 => opensuse.43.2}/Dockerfile (100%) diff --git a/scripts/docker/opensuse.42.3/Dockerfile b/scripts/docker/opensuse.43.2/Dockerfile similarity index 100% rename from scripts/docker/opensuse.42.3/Dockerfile rename to scripts/docker/opensuse.43.2/Dockerfile From c5f3e09520f174b90dbe2bc41996abe53854e74c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 30 Mar 2018 09:09:43 -0700 Subject: [PATCH 07/14] Update to ASP.NET Core 2.0.7 build 228 - Remove unused myget feeds - Refactor how we keep track of all previous versions of the runtime store --- build/BundledRuntimes.props | 5 +-- build/DependencyVersions.props | 18 ++++++++--- build/NugetConfigFile.targets | 10 +++--- build/package/Installer.DEB.proj | 21 +++---------- build/package/Installer.DEB.targets | 39 ++++++----------------- build/package/Installer.RPM.targets | 48 ++++++++--------------------- 6 files changed, 48 insertions(+), 93 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 82f47ecca..4d36aadd9 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -5,7 +5,7 @@ -internal - + dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) @@ -34,9 +34,10 @@ $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName) + $(DotnetBlobRootUrl)/aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json runtime.version $(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName) - + $(HostOSName)$(Architecture) $(HostOSName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c210b83f7..b89c4681c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -58,22 +58,32 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.6 + 2.0.7 notimestamp + + 2.0.0;2.0.3;2.0.5;2.0.6 + - 2.0.6 + 2.0.7 rtm - 2.0.6 - 10011 + 2.0.7 + 228 + $(AspNetCoreVerison) + $(AspNetCoreVerison)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) $(AspNetCoreBranchName)-$(AspNetCoreRuntimePackageTimestamp) + + + + + 2.1.0-prerelease-02430-04 diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 55ebdf871..38e858fff 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -4,7 +4,7 @@ - + - + @@ -30,8 +30,6 @@ - - ]]> @@ -43,13 +41,13 @@ ]]> - + - + - - - - + - - - - + @@ -106,6 +100,7 @@ Inputs="$(DownloadedSharedHostInstallerFile); $(DownloadedHostFxrInstallerFile); $(DownloadedSharedFrameworkInstallerFile); + @(AspNetCoreDebInstallerFile); $(SdkInstallerFile);" Outputs="$(DebianTestResultsXmlFile)" > @@ -113,10 +108,7 @@ - - - - + @@ -130,10 +122,7 @@ - - - - + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index f4cfc11a2..57b5a603d 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -35,14 +35,6 @@ dotnet-hostfxr-$(HostFxrDebianPackageVersion) $(HostFxrDebianPackageName.ToLower()) dotnet-host - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) - $(AspNetCoreRuntimePackageBrandName)-2.0.0 - $(AspNetCoreRuntimePackageBrandName)-2.0.3 - $(AspNetCoreRuntimePackageBrandName)-2.0.5 - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) - $(HostRid) - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb @@ -125,26 +117,15 @@ - - $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName200) - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName203) - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName205) - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) - - - - - + + + + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)-$(HostRid).deb$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity) + + + + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 04d79e051..ce69dad4f 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -50,16 +50,10 @@ dotnet-hostfxr-$(HostFxrRpmPackageVersion) $(HostFxrRpmPackageName.ToLower()) dotnet-host - $(HostRid) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreRuntimePackageBrandName)-2.0.3 - $(AspNetCoreRuntimePackageBrandName)-2.0.5 - $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) - $(AspNetCoreVersion) - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(ScriptsDir)/$(AfterInstallHostScriptName) $(RpmLayoutScripts)/$(AfterInstallHostScriptName) @@ -187,27 +181,15 @@ - - $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200) - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName203) - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName205) - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) - - - - - + + + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)-$(HostRid).rpm$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity) + + + + @@ -235,7 +217,7 @@ Inputs="$(DownloadedSharedHostInstallerFile); $(DownloadedHostFxrInstallerFile); $(DownloadedSharedFrameworkInstallerFile); - $(DownloadedSharedAspNetCoreRuntime); + @(AspNetCoreRpmInstallerFile); $(RpmTestResultsXmlFile);" Outputs="$(RpmTestResultsXmlFile)" > @@ -243,10 +225,7 @@ - - - - + @@ -261,10 +240,7 @@ - - - - + From c20f79e8e39ebc5c188134e3878eac933f9d04ef Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 30 Mar 2018 16:20:38 -0700 Subject: [PATCH 08/14] Reverse the order in which old runtime stores are listed --- build/DependencyVersions.props | 12 ++++++++---- build/package/Installer.DEB.proj | 12 ++++++++++-- build/package/Installer.RPM.targets | 6 +++++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b89c4681c..0b86826ab 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -63,9 +63,6 @@ AspNetCoreRelease is only used if the value of this property is "timestamped" --> notimestamp - - 2.0.0;2.0.3;2.0.5;2.0.6 - 2.0.7 rtm @@ -80,8 +77,15 @@ - + + + + + diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 2c0447372..71408e33b 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -21,11 +21,15 @@ Inputs="@(CLISdkFiles)" Outputs="$(SdkInstallerFile)" > + + + + - + + + + + - + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index ce69dad4f..2053557fc 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -221,11 +221,15 @@ $(RpmTestResultsXmlFile);" Outputs="$(RpmTestResultsXmlFile)" > + + + + - + From 370243ab81c43fe0e3e2a57c1d101b45724ea75e Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 30 Mar 2018 17:57:03 -0700 Subject: [PATCH 09/14] Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0. --- .../GivenDotnetPublishPublishesProjects.cs | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 2db2018fa..ad9991805 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -4,7 +4,9 @@ using System; using System.IO; using System.Diagnostics; +using System.Linq; using System.Runtime.InteropServices; +using System.Xml.Linq; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.PlatformAbstractions; @@ -103,7 +105,19 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testInstance = TestAssets.Get(testAppName) .CreateInstance() .WithSourceFiles() - .WithRestoreFiles(); + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + + // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0. + // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the + // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we + // need a manual roll-forward. + propertyGroup.Add( + new XElement(ns + "RuntimeFrameworkVersion", "2.0.*")); + }); var testProjectDirectory = testInstance.Root; @@ -170,7 +184,19 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testInstance = TestAssets.Get(testAppName) .CreateInstance($"PublishesSelfContained{selfContained}") .WithSourceFiles() - .WithRestoreFiles(); + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + + // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0. + // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the + // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we + // need a manual roll-forward. + propertyGroup.Add( + new XElement(ns + "RuntimeFrameworkVersion", "2.0.*")); + }); var testProjectDirectory = testInstance.Root; From beea8c2e9ba81ff3ca1b255be9c54b5e26293581 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 2 Apr 2018 10:55:15 -0700 Subject: [PATCH 10/14] Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl CoreSetupBlobRootUrl determines from which blob storage the CLI consumes bits. That's the right URL to use for consuming asp.net bits as well. --- build/BundledRuntimes.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 4d36aadd9..eb8c4cc57 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -34,7 +34,7 @@ $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName) - $(DotnetBlobRootUrl)/aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json + $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json runtime.version $(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName) From de09fb5104bfe5a89b7adbf584184ccaaa05e8cc Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 3 Apr 2018 16:20:11 -0700 Subject: [PATCH 11/14] Producing an empty commit to trigger a rebuild of the CLI The runtime had to spin in place and as such we need a "fake" commit to trigger a CLI rebuild using the new runtime bits. From 21529f350d520492a1b5a4feaa91fb2e147b585f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 3 Apr 2018 17:21:31 -0700 Subject: [PATCH 12/14] Update to aspnet 2.0.7 build 230 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3761882a7..b287f41d5 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -68,7 +68,7 @@ 2.0.7 rtm 2.0.7 - 228 + 230 $(AspNetCoreVerison) $(AspNetCoreVerison)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) From 9fb0f9a35b476f71d63b594a0b15e110123b41a9 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 4 Apr 2018 13:14:13 -0700 Subject: [PATCH 13/14] Fix a typo in the rpm.targets when testing the rpm generated packages. --- build/package/Installer.RPM.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 2053557fc..cb06d9823 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -188,8 +188,8 @@ - + From 364ee996bf3dd6c69f4ac89b3ff504481530e1bf Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 4 Apr 2018 22:43:37 -0700 Subject: [PATCH 14/14] Fixing another typo in that is breaking RHEL. --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b287f41d5..cb1243b3a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -69,8 +69,8 @@ rtm 2.0.7 230 - $(AspNetCoreVerison) - $(AspNetCoreVerison)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) + $(AspNetCoreVersion) + $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease)