mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source 
* release/2.1-MSRC:
  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.

* Conflicts:
  build/Branding.props
  build/Version.props
  packaging/osx/clisdk/resources/cs.lproj/conclusion.html
  packaging/osx/clisdk/resources/de.lproj/conclusion.html
  packaging/osx/clisdk/resources/en.lproj/conclusion.html
  packaging/osx/clisdk/resources/es.lproj/conclusion.html
  packaging/osx/clisdk/resources/fr.lproj/conclusion.html
  packaging/osx/clisdk/resources/it.lproj/conclusion.html
  packaging/osx/clisdk/resources/ja.lproj/conclusion.html
  packaging/osx/clisdk/resources/ko.lproj/conclusion.html
  packaging/osx/clisdk/resources/pl.lproj/conclusion.html
  packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
  packaging/osx/clisdk/resources/ru.lproj/conclusion.html
  packaging/osx/clisdk/resources/tr.lproj/conclusion.html
  packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
  packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
  packaging/windows/clisdk/bundle.wxl
This commit is contained in:
Peter Huene 2018-02-13 15:57:24 -08:00
commit 118e5e56b5
No known key found for this signature in database
GPG key ID: E1D265D820213D6A
23 changed files with 42 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -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). By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula).

2
build/Branding.props
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.100</SdkBrandName> <SdkBrandName>Microsoft .NET Core SDK - 2.1.100</SdkBrandName>
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName> <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> <SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver - 2.0.0</HostFxrBrandName> <HostFxrBrandName>Microsoft .NET Core Host FX Resolver - 2.0.0</HostFxrBrandName>

12
build/DependencyVersions.props
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>2.0.5</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>2.0.6-servicing-26118-01</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftBuildPackageVersion>15.6.81</MicrosoftBuildPackageVersion> <MicrosoftBuildPackageVersion>15.6.81</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion> <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
@ -17,7 +17,7 @@
<MicrosoftNETSdkWebPackageVersion>2.0.0-rel-20171110-671</MicrosoftNETSdkWebPackageVersion> <MicrosoftNETSdkWebPackageVersion>2.0.0-rel-20171110-671</MicrosoftNETSdkWebPackageVersion>
<MicrosoftNETSdkPublishPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkPublishPackageVersion> <MicrosoftNETSdkPublishPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkPublishPackageVersion>
<MicrosoftNETSdkWebProjectSystemPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWebProjectSystemPackageVersion> <MicrosoftNETSdkWebProjectSystemPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWebProjectSystemPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.0-beta3-20171110-312</MicrosoftDotNetCommonItemTemplatesPackageVersion> <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.0-beta3-20171117-314</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonProjectTemplates20PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates20PackageVersion> <MicrosoftDotNetCommonProjectTemplates20PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates20PackageVersion>
<MicrosoftDotNetTestProjectTemplates20PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetTestProjectTemplates20PackageVersion> <MicrosoftDotNetTestProjectTemplates20PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetTestProjectTemplates20PackageVersion>
<MicrosoftTemplateEngineAbstractionsPackageVersion>1.0.0-beta3-20171117-314</MicrosoftTemplateEngineAbstractionsPackageVersion> <MicrosoftTemplateEngineAbstractionsPackageVersion>1.0.0-beta3-20171117-314</MicrosoftTemplateEngineAbstractionsPackageVersion>
@ -58,14 +58,14 @@
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion> <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion> <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<AspNetCoreTemplatePackageVersion>2.0.5</AspNetCoreTemplatePackageVersion> <AspNetCoreTemplatePackageVersion>2.0.6</AspNetCoreTemplatePackageVersion>
<!-- This should either be timestamped or notimestamp as appropriate --> <!-- This should either be timestamped or notimestamp as appropriate -->
<AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor> <AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
<!--BranchName and AspNetCoreVersion will not always be the same--> <!--BranchName and AspNetCoreVersion will not always be the same-->
<AspNetCoreBranchName>2.0.5</AspNetCoreBranchName> <AspNetCoreBranchName>2.0.6</AspNetCoreBranchName>
<AspNetCoreRelease>rtm</AspNetCoreRelease> <AspNetCoreRelease>rtm</AspNetCoreRelease>
<AspNetCoreVersion>2.0.5</AspNetCoreVersion> <AspNetCoreVersion>2.0.6</AspNetCoreVersion>
<AspNetCoreRuntimePackageTimestamp>155</AspNetCoreRuntimePackageTimestamp> <AspNetCoreRuntimePackageTimestamp>10007</AspNetCoreRuntimePackageTimestamp>
<AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName> <AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
<AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease> <AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease>

2
build/NugetConfigFile.targets
View file

@ -50,7 +50,7 @@
<WriteLinesToFile Condition="'$(ExternalRestoreSources)' != '' and '$(DotNetBuildOffline)' != 'true'" <WriteLinesToFile Condition="'$(ExternalRestoreSources)' != '' and '$(DotNetBuildOffline)' != 'true'"
File="$(GeneratedNuGetConfig)" 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" /> Overwrite="false" />
<WriteLinesToFile Condition="'$(DotNetBuildOffline)' != 'true'" <WriteLinesToFile Condition="'$(DotNetBuildOffline)' != 'true'"

4
build/package/Installer.DEB.proj
View file

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

6
build/package/Installer.DEB.targets
View file

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

8
build/package/Installer.RPM.targets
View file

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

2
packaging/osx/clisdk/resources/cs.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/de.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/en.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/es.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/fr.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/it.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/ja.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/ko.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/pl.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/ru.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/tr.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
View file

@ -8,7 +8,7 @@
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.100</li> <li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

2
packaging/windows/clisdk/bundle.wxl
View file

@ -51,7 +51,7 @@
The following were installed at [DOTNETHOME] The following were installed at [DOTNETHOME]
• .NET Core SDK 2.1.100 • .NET Core SDK 2.1.100
• .NET Core Runtime 2.0.5 • .NET Core Runtime 2.0.6
• Runtime Package Store • Runtime Package Store
This product collects usage data This product collects usage data

2
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
View file

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