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

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

Browse source 
* release/2.1.2xx:
  Updating netci.groovy to archive test results on failure.
  Fix version number
  Consume 15.7.2 compiler
  Updating the CLI branding to 201.
  MSBuild 15.7.179
This commit is contained in:
Peter Huene 2018-06-06 10:26:51 -07:00
commit e7b77268f5
No known key found for this signature in database
GPG key ID: E1D265D820213D6A
19 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/Branding.props
View file

@ -1,6 +1,6 @@
<Project ToolsVersion="14.0"> <Project ToolsVersion="14.0">
<PropertyGroup> <PropertyGroup>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.200</SdkBrandName> <SdkBrandName>Microsoft .NET Core SDK - 2.1.201</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.7</SharedFrameworkBrandName> <SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.7</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName> <SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>

4
build/DependencyVersions.props
View file

@ -4,13 +4,13 @@
<MicrosoftNETCoreAppPackageVersion>2.0.7</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>2.0.7</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftBuildPackageVersion>15.7.177</MicrosoftBuildPackageVersion> <MicrosoftBuildPackageVersion>15.7.179</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion> <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion> <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion> <MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion> <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftFSharpCompilerPackageVersion>10.1.4-rtm-180403-0</MicrosoftFSharpCompilerPackageVersion> <MicrosoftFSharpCompilerPackageVersion>10.1.4-rtm-180403-0</MicrosoftFSharpCompilerPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>2.8.0-beta4-62824-10</MicrosoftCodeAnalysisCSharpPackageVersion> <MicrosoftCodeAnalysisCSharpPackageVersion>2.8.1-beta6-62911-06</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion> <MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion> <MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
<MicrosoftNETSdkPackageVersion>2.1.200-preview-62827-05</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>2.1.200-preview-62827-05</MicrosoftNETSdkPackageVersion>

2
build/Version.props
View file

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

7
netci.groovy
View file

@ -3,6 +3,7 @@
// Import the utility functionality. // Import the utility functionality.
import jobs.generation.ArchivalSettings;
import jobs.generation.Utilities; import jobs.generation.Utilities;
def project = GithubProject def project = GithubProject
@ -68,6 +69,12 @@ platformList.each { platform ->
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
Utilities.addMSTestResults(newJob, '**/*.trx') Utilities.addMSTestResults(newJob, '**/*.trx')
Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build")
def archiveSettings = new ArchivalSettings()
archiveSettings.addFiles("test/**/*.trx")
archiveSettings.setFailIfNothingArchived()
archiveSettings.setArchiveOnFailure()
Utilities.addArchival(newJob, archiveSettings)
} }
// Make the call to generate the help job // Make the call to generate the help job

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.200</li> <li>.NET Core SDK 2.1.201</li>
<li>.NET Core Runtime 2.0.7</li> <li>.NET Core Runtime 2.0.7</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -50,7 +50,7 @@
<String Id="FirstTimeWelcomeMessage">The installation was successful <String Id="FirstTimeWelcomeMessage">The installation was successful
The following were installed at [DOTNETHOME] The following were installed at [DOTNETHOME]
• .NET Core SDK 2.1.200 • .NET Core SDK 2.1.201
• .NET Core Runtime 2.0.7 • .NET Core Runtime 2.0.7
• Runtime Package Store • Runtime Package Store