diff --git a/build/Branding.props b/build/Branding.props index a64a535bb..049ee488e 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -2,7 +2,7 @@ Microsoft .NET Core SDK - 2.1.200 .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/BundledRuntimes.props b/build/BundledRuntimes.props index 82f47ecca..eb8c4cc57 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) + $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json runtime.version $(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName) - + $(HostOSName)$(Architecture) $(HostOSName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 65d41dbe6..02f5c1343 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,8 @@ - 2.0.6 + + 2.0.7 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000127 $(MicrosoftBuildPackageVersion) @@ -58,22 +59,36 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.6 + 2.0.7 notimestamp - 2.0.6 + 2.0.7 rtm - 2.0.6 - 10011 + 2.0.7 + 230 + $(AspNetCoreVersion) + $(AspNetCoreVersion)-$(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 c2b86aaf5..c6a164bfc 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -4,7 +4,7 @@ - + - + @@ -33,6 +33,7 @@ + ]]> @@ -43,13 +44,13 @@ ]]> - + - + + + + + - - - - + - - - - + @@ -106,17 +104,19 @@ Inputs="$(DownloadedSharedHostInstallerFile); $(DownloadedHostFxrInstallerFile); $(DownloadedSharedFrameworkInstallerFile); + @(AspNetCoreDebInstallerFile); $(SdkInstallerFile);" Outputs="$(DebianTestResultsXmlFile)" > + + + + - - - - + @@ -130,10 +130,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..cb06d9823 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,18 +217,19 @@ Inputs="$(DownloadedSharedHostInstallerFile); $(DownloadedHostFxrInstallerFile); $(DownloadedSharedFrameworkInstallerFile); - $(DownloadedSharedAspNetCoreRuntime); + @(AspNetCoreRpmInstallerFile); $(RpmTestResultsXmlFile);" Outputs="$(RpmTestResultsXmlFile)" > + + + + - - - - + @@ -261,10 +244,7 @@ - - - - + diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .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 2d79b7646..c4c20ac7e 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -8,7 +8,7 @@

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

  • .NET Core SDK 2.1.200
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 3d2725631..c7cb4dbd0 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -51,7 +51,7 @@ The following were installed at [DOTNETHOME] • .NET Core SDK 2.1.200 - • .NET Core Runtime 2.0.6 + • .NET Core Runtime 2.0.7 • Runtime Package Store This product collects usage data 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 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] 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;