Merge pull request #8781 from peterhuene/msrc-merge
Merge release/2.1.1xx-MSRC to release/2.1.1xx
This commit is contained in:
commit
8444cb04b5
24 changed files with 62 additions and 44 deletions
|
@ -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).
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?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.82</MicrosoftBuildPackageVersion>
|
||||
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
|
||||
|
@ -17,7 +17,7 @@
|
|||
<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>1.0.1-beta3-20180227-1423531</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>
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
<add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
|
||||
<add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
|
||||
<add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
|
||||
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
|
||||
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
|
||||
<add key="symreader-native" value="https://dotnet.myget.org/f/symreader-native/api/v3/index.json" />
|
||||
<add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
|
||||
|
@ -50,7 +49,7 @@
|
|||
|
||||
<WriteLinesToFile Condition="'$(ExternalRestoreSources)' != '' and '$(DotNetBuildOffline)' != 'true'"
|
||||
File="$(GeneratedNuGetConfig)"
|
||||
Lines="<add key="PrivateBlobFeed" value="%(NugetConfigPrivateFeeds.Identity)" />"
|
||||
Lines="<add key="PrivateBlobFeed%(NugetConfigPrivateFeeds.Filename)" value="%(NugetConfigPrivateFeeds.Identity)" />"
|
||||
Overwrite="false" />
|
||||
|
||||
<WriteLinesToFile Condition="'$(DotNetBuildOffline)' != 'true'"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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)" />
|
||||
|
|
|
@ -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)"/>
|
||||
|
|
|
@ -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)" />
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue