Merge branch 'release/2.1.1xx-MSRC' into release/2.1.1xx

* release/2.1.1xx-MSRC: (21 commits)
  Update to consume aspnetcore 2.0.6-10011
  Update SDK to 2.1.100-preview-62617-01
  Updating Roslyn to 2.7.0-beta3-62615-05
  Update FSharp Compiler
  Fix README.md for 2.1.1xx (#8600)
  MSBuild 15.6.82
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  Update fsharp
  Build trigger commit.
  Update to consume aspnetcore 2.0.6-10008 notimestamp build
  Update to consume aspnetcore 2.0.6-10008 timestamp build
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
  Making a document only commit to trigger another build of the CLI.
  Add 2.0.5 ASP.NET store to native installers.
  Update to consume aspnetcore 2.0.6-10007
  Fix Windows servicing builds.
  Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
  Update runtime and branding to 2.0.6.
  ...
This commit is contained in:
Peter Huene 2018-03-13 15:01:01 -07:00
commit 075bf14db6
No known key found for this signature in database
GPG key ID: E1D265D820213D6A
24 changed files with 97 additions and 78 deletions

View file

@ -9,7 +9,7 @@ Looking for V1 of the .NET Core tooling?
If you are looking for the v1.0.1 release of the .NET Core tools (CLI, MSBuild and the new csproj), see https://dot.net/core.
> **Note:** the release/15.5 branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the
> **Note:** the release/2.1.1xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the
> released version of the tools available at https://dot.net/core
Found an issue?
@ -64,7 +64,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/
> **Note:** Be aware that the following installers are the **latest bits**. If you
> want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling).
| Platform | Latest Daily Build<br>*release/15.5*<br>[![][version-badge]][version] |
| Platform | Latest Daily Build<br>*release/2.1.1xx*<br>[![][version-badge]][version] |
| -------- | :-------------------------------------: |
| **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]<br>[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] |
| **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]<br>[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] |
@ -80,7 +80,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/
| **OpenSUSE 42.1** | tar.gz - See **Linux x64** |
| Latest Coherent Build<sup>2</sup><br>*release/15.5* |
| Latest Coherent Build<sup>2</sup><br>*release/2.1.1xx* |
|:------:|
| [![][coherent-version-badge]][coherent-version] |
@ -89,43 +89,43 @@ Reference notes:
> <br><br>**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.*
[comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.)
[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/latest.version
[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/win_x64_Release_version_badge.svg
[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/latest.coherent.version
[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/win_x86_Release_coherent_badge.svg
[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/latest.version
[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/win_x64_Release_version_badge.svg
[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/latest.coherent.version
[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/win_x86_Release_coherent_badge.svg
[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.exe
[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.exe.sha
[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.zip
[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.zip.sha
[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x64.exe
[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x64.exe.sha
[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x64.zip
[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x64.zip.sha
[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.exe
[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.exe.sha
[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.zip
[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.zip.sha
[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x86.exe
[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x86.exe.sha
[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x86.zip
[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-win-x86.zip.sha
[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.pkg
[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.pkg.sha
[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.tar.gz
[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.tar.gz.sha
[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-osx-x64.pkg
[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-osx-x64.pkg.sha
[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-osx-x64.tar.gz
[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-osx-x64.tar.gz.sha
[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-linux-x64.tar.gz
[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-linux-x64.tar.gz.sha
[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-linux-x64.tar.gz
[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-linux-x64.tar.gz.sha
[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu-x64.deb
[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu-x64.deb.sha
[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu-x64.deb
[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu-x64.deb.sha
[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.04-x64.deb
[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha
[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu.16.04-x64.deb
[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha
[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.10-x64.deb
[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha
[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu.16.10-x64.deb
[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha
[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-debian-x64.deb
[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-debian-x64.deb.sha
[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-debian-x64.deb
[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-debian-x64.deb.sha
[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-rhel-x64.rpm
[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-rhel-x64.rpm.sha
[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-rhel-x64.rpm
[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.1xx/dotnet-sdk-latest-rhel-x64.rpm.sha
# Debian daily feed
@ -226,4 +226,3 @@ License
-------
By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula).

View file

@ -1,8 +1,8 @@
<Project ToolsVersion="14.0">
<PropertyGroup>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.100</SdkBrandName>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.101</SdkBrandName>
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.5</SharedFrameworkBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.6</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver - 2.0.0</HostFxrBrandName>

View file

@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>2.0.5</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.0.6</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftBuildPackageVersion>15.6.81</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>15.6.82</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftFSharpCompilerPackageVersion>10.1.2-rtm-180131-0</MicrosoftFSharpCompilerPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>2.7.0-beta3-62612-07</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftFSharpCompilerPackageVersion>10.1.4-rtm-180213-0</MicrosoftFSharpCompilerPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>2.7.0-beta3-62615-05</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
<MicrosoftNETSdkPackageVersion>15.5.0-preview-62518-04</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>2.1.100-preview-62617-01</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftNETSdkWebPackageVersion>2.0.0-rel-20171110-671</MicrosoftNETSdkWebPackageVersion>
<MicrosoftNETSdkPublishPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkPublishPackageVersion>
<MicrosoftNETSdkWebProjectSystemPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWebProjectSystemPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.0-beta3-20171110-312</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.0-beta3-20171117-314</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonProjectTemplates20PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates20PackageVersion>
<MicrosoftDotNetTestProjectTemplates20PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetTestProjectTemplates20PackageVersion>
<MicrosoftTemplateEngineAbstractionsPackageVersion>1.0.0-beta3-20171117-314</MicrosoftTemplateEngineAbstractionsPackageVersion>
@ -58,14 +58,16 @@
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<AspNetCoreTemplatePackageVersion>2.0.5</AspNetCoreTemplatePackageVersion>
<!-- This should either be timestamped or notimestamp as appropriate -->
<AspNetCoreTemplatePackageVersion>2.0.6</AspNetCoreTemplatePackageVersion>
<!-- This should either be timestamped or notimestamp as appropriate.
AspNetCoreRelease is only used if the value of this property is "timestamped" -->
<AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
<!--BranchName and AspNetCoreVersion will not always be the same-->
<AspNetCoreBranchName>2.0.5</AspNetCoreBranchName>
<AspNetCoreBranchName>2.0.6</AspNetCoreBranchName>
<AspNetCoreRelease>rtm</AspNetCoreRelease>
<AspNetCoreVersion>2.0.5</AspNetCoreVersion>
<AspNetCoreRuntimePackageTimestamp>155</AspNetCoreRuntimePackageTimestamp>
<AspNetCoreVersion>2.0.6</AspNetCoreVersion>
<AspNetCoreRuntimePackageTimestamp>10011</AspNetCoreRuntimePackageTimestamp>
<AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
<AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease>

View file

@ -50,7 +50,7 @@
<WriteLinesToFile Condition="'$(ExternalRestoreSources)' != '' and '$(DotNetBuildOffline)' != 'true'"
File="$(GeneratedNuGetConfig)"
Lines="&lt;add key=&quot;PrivateBlobFeed&quot; value=&quot;%(NugetConfigPrivateFeeds.Identity)&quot; /&gt;"
Lines="&lt;add key=&quot;PrivateBlobFeed%(NugetConfigPrivateFeeds.Filename)&quot; value=&quot;%(NugetConfigPrivateFeeds.Identity)&quot; /&gt;"
Overwrite="false" />
<WriteLinesToFile Condition="'$(DotNetBuildOffline)' != 'true'"

View file

@ -2,7 +2,7 @@
<PropertyGroup>
<VersionMajor>2</VersionMajor>
<VersionMinor>1</VersionMinor>
<VersionPatch>100</VersionPatch>
<VersionPatch>101</VersionPatch>
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
<CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>

View file

@ -27,6 +27,7 @@
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime200)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime203)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime205)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime)" />
<!-- Create layout: Binaries -->
@ -90,6 +91,7 @@
<!-- Remove Shared Framework and Debian Packages -->
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName205)" />
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName203)" />
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName200)" />
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
@ -113,6 +115,7 @@
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime200)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime203)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime205)" />
<Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime)" />
<Exec Command="sudo dpkg -i $(SdkInstallerFile)" />
@ -128,6 +131,7 @@
<!-- Clean up Packages -->
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName205)" />
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName203)" />
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName200)" />
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />

View file

@ -38,6 +38,7 @@
<AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageName>
<AspNetCoreRuntimePackageName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0</AspNetCoreRuntimePackageName200>
<AspNetCoreRuntimePackageName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3</AspNetCoreRuntimePackageName203>
<AspNetCoreRuntimePackageName205>$(AspNetCoreRuntimePackageBrandName)-2.0.5</AspNetCoreRuntimePackageName205>
<AspNetCoreRuntimePackageName Condition=" '$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp' ">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)</AspNetCoreRuntimePackageName>
<HostRidInAspNetCoreRuntimeDebInstallerFileName>$(HostRid)</HostRidInAspNetCoreRuntimeDebInstallerFileName>
<AspNetCoreRuntimeDebInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName>
@ -127,8 +128,10 @@
<PropertyGroup>
<AspNetCoreRuntimeDebInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName200>
<AspNetCoreRuntimeDebInstallerFileName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName203>
<AspNetCoreRuntimeDebInstallerFileName205>$(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName205>
<DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName200)</DownloadedSharedAspNetCoreRuntime200>
<DownloadedSharedAspNetCoreRuntime203>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName203)</DownloadedSharedAspNetCoreRuntime203>
<DownloadedSharedAspNetCoreRuntime205>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName205)</DownloadedSharedAspNetCoreRuntime205>
<DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
</PropertyGroup>
<DownloadFile
@ -137,6 +140,9 @@
<DownloadFile
Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName203)$(CoreSetupBlobAccessTokenParam)"
DestinationPath="$(DownloadedSharedAspNetCoreRuntime203)"/>
<DownloadFile
Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName205)$(CoreSetupBlobAccessTokenParam)"
DestinationPath="$(DownloadedSharedAspNetCoreRuntime205)"/>
<DownloadFile
Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>

View file

@ -55,6 +55,7 @@
<AspNetCoreRuntimePackageName Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)</AspNetCoreRuntimePackageName>
<AspNetCoreRuntimePackageName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0</AspNetCoreRuntimePackageName200>
<AspNetCoreRuntimePackageName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3</AspNetCoreRuntimePackageName203>
<AspNetCoreRuntimePackageName205>$(AspNetCoreRuntimePackageBrandName)-2.0.5</AspNetCoreRuntimePackageName205>
<AspNetCoreRuntimePackageVersion>$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageVersion>
<AspNetCoreRuntimePackageVersion Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreVersion)</AspNetCoreRuntimePackageVersion>
<AspNetCoreRuntimeRpmInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName>
@ -189,8 +190,10 @@
<PropertyGroup>
<AspNetCoreRuntimeRpmInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName200>
<AspNetCoreRuntimeRpmInstallerFileName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName203>
<AspNetCoreRuntimeRpmInstallerFileName205>$(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName205>
<DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200)</DownloadedSharedAspNetCoreRuntime200>
<DownloadedSharedAspNetCoreRuntime203>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName203)</DownloadedSharedAspNetCoreRuntime203>
<DownloadedSharedAspNetCoreRuntime205>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName205)</DownloadedSharedAspNetCoreRuntime205>
<DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
</PropertyGroup>
<DownloadFile
@ -199,6 +202,9 @@
<DownloadFile
Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName203)$(CoreSetupBlobAccessTokenParam)"
DestinationPath="$(DownloadedSharedAspNetCoreRuntime203)"/>
<DownloadFile
Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName205)$(CoreSetupBlobAccessTokenParam)"
DestinationPath="$(DownloadedSharedAspNetCoreRuntime205)"/>
<DownloadFile
Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
@ -239,6 +245,7 @@
<Exec Command="sudo yum -y install $(DownloadedSharedFrameworkInstallerFile)" />
<Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime200)" />
<Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime203)" />
<Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime205)" />
<Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime)" />
<Exec Command="sudo yum -y install $(SdkInstallerFile)" />
@ -255,6 +262,7 @@
<Exec Command="sudo yum remove -y $(SdkRpmPackageName)" />
<Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName)" />
<Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName205)" />
<Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName203)" />
<Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName200)" />
<Exec Command="sudo yum remove -y $(SharedFxRpmPackageName)" />

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -7,8 +7,8 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>.NET Core SDK 2.1.101</li>
<li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li>
</ul>
</div>

View file

@ -50,8 +50,8 @@
<String Id="FirstTimeWelcomeMessage">The installation was successful
The following were installed at [DOTNETHOME]
• .NET Core SDK 2.1.100
• .NET Core Runtime 2.0.5
• .NET Core SDK 2.1.101
• .NET Core Runtime 2.0.6
• Runtime Package Store
This product collects usage data

View file

@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests
result.Should().NotBeNull();
result.Args.Should().Contain("--fx-version 2.0.5");
result.Args.Should().Contain("--fx-version 2.0.6");
}
[Fact]