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

Merge pull request #8158 from dotnet/merges/release/15.5-to-master-20171204-080035

Browse source 
Merge release/15.5 to master
This commit is contained in:
Livar 2017-12-05 09:34:02 -08:00 • committed by GitHub
commit c77452b9e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 122 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -15,6 +15,9 @@ Library/
# local nuget cache
.nuget/
# NuGet.Config at the root
/NuGet.Config
# NuGet v3 restore drops these even though we don't use MSBuild :(
*.nuget.targets
*.nuget.props

22
NuGet.Config
View file

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="TransportFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<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" />
<!-- Replace the aspnet entry above with this one when we switch to no-timestamp packages -->
<!-- add key="aspnet" value="https://dotnet.myget.org/F/aspnet-2-0-0-rtm/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" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
<add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
<add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
<add key="AspNetMaster" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
</packageSources>
</configuration>

6
build.proj
View file

@ -29,10 +29,11 @@
<RestoreDotnetCliBuildFrameworkOutputs Include="$(DotnetCliBuildDirectory)/obj/dotnet-cli-build.csproj.nuget.g.props" />
<RestoreDotnetCliBuildFrameworkOutputs Include="$(DotnetCliBuildDirectory)/obj/dotnet-cli-build.csproj.nuget.g.targets" />
</ItemGroup>
<Target Name="RestoreDotnetCliBuildFramework"
Inputs="$(DotnetCliBuildDirectory)/dotnet-cli-build.csproj"
Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)">
Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)"
DependsOnTargets="WriteNugetConfigFile">
<PropertyGroup>
<ExtraRestoreArgs>$(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile)</ExtraRestoreArgs>
@ -48,6 +49,7 @@
<Import Project="build/GitCommitInfo.targets" />
<Import Project="build/HostInfo.targets" />
<Import Project="build/BuildInfo.targets" />
<Import Project="build/NugetConfigFile.targets" />
<Import Project="build/Prepare.targets" />
<Import Project="build/Compile.targets" />
<Import Project="build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets" />

2
build/DependencyVersions.props
View file

@ -44,6 +44,6 @@
<PropertyGroup>
<VersionToolsVersion>1.0.27-prerelease-01723-01</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
<BuildTasksFeedToolVersion>1.0.0-prerelease-02203-01</BuildTasksFeedToolVersion>
<BuildTasksFeedToolVersion>2.1.0-prerelease-02221-02</BuildTasksFeedToolVersion>
</PropertyGroup>
</Project>

1
build/InitRepo.props
View file

@ -5,5 +5,6 @@
<GitCommitInfoProps>$(GeneratedPropsDir)/GitCommitInfo.props</GitCommitInfoProps>
<HostInfoProps>$(GeneratedPropsDir)/HostInfo.props</HostInfoProps>
<BuildInfoProps>$(GeneratedPropsDir)/BuildInfo.props</BuildInfoProps>
<GeneratedNuGetConfig>$(RepoRoot)/NuGet.Config</GeneratedNuGetConfig>
</PropertyGroup>
</Project>

3
build/InitRepo.targets
View file

@ -1,6 +1,7 @@
<Project ToolsVersion="15.0">
<Target Name="WriteDynamicPropsToStaticPropsFiles"
DependsOnTargets="BuildDotnetCliBuildFramework;
DependsOnTargets="WriteNugetConfigFile;
BuildDotnetCliBuildFramework;
EnsureGeneratedPropsDirectory;
WriteGitCommitInfoProps;
WriteHostInfoProps;

65
build/NugetConfigFile.targets Normal file
View file

@ -0,0 +1,65 @@
<Project ToolsVersion="15.0">
<Target Name="WriteNugetConfigFile">
<ItemGroup>
<NugetConfigPrivateFeeds Include="$(ExternalRestoreSources.Split(';'))" />
</ItemGroup>
<PropertyGroup>
<NugetConfigHeader>
<![CDATA[
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
]]>
</NugetConfigHeader>
<NugetConfigCLIFeeds>
<![CDATA[
<add key="BlobFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/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" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
<add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
<add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
]]>
</NugetConfigCLIFeeds>
<NugetConfigSuffix>
<![CDATA[
</packageSources>
</configuration>
]]>
</NugetConfigSuffix>
</PropertyGroup>
<WriteLinesToFile File="$(GeneratedNuGetConfig)"
Lines="$(NugetConfigHeader)"
Overwrite="true" />
<WriteLinesToFile Condition="'$(ExternalRestoreSources)' != '' and '$(DotNetBuildOffline)' != 'true'"
File="$(GeneratedNuGetConfig)"
Lines="&lt;add key=&quot;PrivateBlobFeed&quot; value=&quot;%(NugetConfigPrivateFeeds.Identity)&quot; /&gt;"
Overwrite="false" />
<WriteLinesToFile Condition="'$(DotNetBuildOffline)' != 'true'"
File="$(GeneratedNuGetConfig)"
Lines="$(NugetConfigCLIFeeds)"
Overwrite="false" />
<WriteLinesToFile File="$(GeneratedNuGetConfig)"
Lines="$(NugetConfigSuffix)"
Overwrite="false" />
</Target>
</Project>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -7,9 +7,9 @@
<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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>Runtime Store</li>
<li>.NET Core SDK 2.2.0</li>
<li>.NET Core Runtime 2.1.0</li>
<li>Runtime Package Store</li>
</ul>
</div>
<br>

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

@ -50,9 +50,9 @@
<String Id="FirstTimeWelcomeMessage">The installation was successful
The following were installed at [DOTNETHOME]
• .NET Core SDK 2.0.0
• .NET Core Runtime 2.0.0
• Runtime Store
• .NET Core SDK 2.2.0
• .NET Core Runtime 2.1.0
• Runtime Package Store
This product collects usage data
• More information and opt-out https://aka.ms/dotnet-cli-telemetry

2
run-build.ps1
View file

@ -86,7 +86,7 @@ if ($NoBuild)
}
else
{
dotnet msbuild build.proj /p:Architecture=$Architecture /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
dotnet msbuild build.proj /p:Architecture=$Architecture /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles $ExtraParameters
dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /p:Architecture=$Architecture $ExtraParameters
if($LASTEXITCODE -ne 0) { throw "Failed to build" }
}