Merge pull request #9836 from dotnet/merges/release/2.1.4xx-to-release/2.1.5xx

Merge release/2.1.4xx to release/2.1.5xx

build/BuildDefaults.props

@@ -33,6 +33,7 @@
     <NoWarn>NU1701;NU5104</NoWarn>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
+    <!-- https://github.com/dotnet/cli/issues/9834 - re-enable the flag below once warnings are cleared up -->
+    <!-- <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors> -->
   </PropertyGroup>
 </Project>

build/NugetConfigFile.targets

@@ -30,6 +30,7 @@
     <add key="linux-musl-bootstrap-feed" value="https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180420-03/aspnet-inputs/index.json" />
     <add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
     <add key="myget-vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
+    <add key="BlobFeed-2.1.3-runtime" value="https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180725-02/final/index.json"/>
         ]]>
       </NugetConfigCLIFeeds>
 

build/publish/PublishNupkgToBlobFeed.targets

@@ -26,7 +26,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="PublishNupkgToBlobFeed" DependsOnTargets="GatherNupkgsForPublishing">
+  <Target Name="PublishNupkgToBlobFeed" Condition=" '$(PUBLISH_NUPKG_TO_BLOB_FEED)' == 'true'" DependsOnTargets="GatherNupkgsForPublishing">
     <Error Condition="'$(BlobFeedCloudDropAccessToken)' == ''" Text="Missing property BlobFeedCloudDropAccessToken." />
     <Error Condition="'$(BlobFeedExpectedURL)' == ''" Text="Missing property BlobFeedExpectedURL." />