Merge pull request #8143 from dotnet/merges/release/2.0.0-to-release/15.5-20171201-080033

Merge release/2.0.0 to release/15.5

.gitignore

@@ -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

NuGet.Config

@@ -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>

build.proj

@@ -32,7 +32,8 @@
 
   <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/Package.targets" />

build/InitRepo.props

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

build/InitRepo.targets

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

build/NugetConfigFile.targets

@@ -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>

run-build.ps1

@@ -80,16 +80,16 @@ $env:VSTEST_TRACE_BUILD=1
 # install a stage0
 $dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1"
 
-Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Write-Output "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Channel ""release/2.0.0"""
-Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Invoke-Expression "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Channel ""release/2.0.0"""
 if ($LastExitCode -ne 0)
 {
     Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
     exit $LastExitCode
 }
 
-Write-Output "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177"
+Write-Output "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177"
-Invoke-Expression "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177"
+Invoke-Expression "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177"
 if ($LastExitCode -ne 0)
 {
     Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
@@ -106,7 +106,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" } 
 }