Update dependencies from https://github.com/dotnet/arcade build 20190…

…524.6 (#1812)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19274.6

eng/Version.Details.xml

@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19273.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19274.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a858f1cb980cba38ec20cc46383ca0fce8af8fb2</Sha>
+      <Sha>b5016f5688dc8ca9f3e4811ee7e2e86ad8907a40</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/common/PublishToPackageFeed.proj

@@ -1,7 +1,7 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <!--
-    This MSBuild file is intended to be used as the body of the default
+    This MSBuild file is intended to be used as the body of the default 
     publishing release pipeline. The release pipeline will use this file
     to invoke the PushToStaticFeed task that will read the build asset
     manifest and publish the assets described in the manifest to
@@ -19,7 +19,7 @@
     https://github.com/dotnet/arcade/issues/2266
   -->
   <Import Project="$(MSBuildThisFileDirectory)ArtifactsCategory.props" Condition="Exists('$(MSBuildThisFileDirectory)ArtifactsCategory.props')" />
-
+  
   <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" />
 
   <Target Name="PublishToFeed">
@@ -57,8 +57,8 @@
       <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETBLAZOR'">https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json</TargetStaticFeed>
     </PropertyGroup>
 
-    <Error
-      Condition="'$(TargetStaticFeed)' == ''"
+    <Error 
+      Condition="'$(TargetStaticFeed)' == ''" 
       Text="'$(ArtifactsCategory)' wasn't recognized as a valid artifact category. Valid categories are: '.NetCore' and '.NetCoreValidation'" />
 
     <!-- Iterate publishing assets from each manifest file. -->

eng/common/SigningValidation.proj

@@ -1,13 +1,13 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <!--
-    This MSBuild file is intended to be used as the body of the default
+    This MSBuild file is intended to be used as the body of the default 
     publishing release pipeline. The release pipeline will use this file
     to invoke the the SignCheck tool to validate that packages about to
     be published are correctly signed.
-
+  
     Parameters:
-
+  
       - PackageBasePath   : Directory containing all files that need to be validated.
       - SignCheckVersion  : Version of SignCheck package to be used.
       - SignValidationExclusionList   : ItemGroup containing exclusion list to be forwarded to SignCheck.
@@ -33,7 +33,7 @@
       <SignCheckErrorLog>signcheck.errors.log</SignCheckErrorLog>
       <SignCheckExclusionsFile>signcheck.exclusions.txt</SignCheckExclusionsFile>
     </PropertyGroup>
-
+    
     <ItemGroup>
       <!--
         Documentation for these arguments is available here:
@@ -45,36 +45,36 @@
       <SignCheckArgs Include="--log-file $(SignCheckLog)" />
       <SignCheckArgs Include="--error-log-file $(SignCheckErrorLog)" />
       <SignCheckArgs Include="--input-files $(SignCheckInputDir)" />
-
+      
       <SignCheckArgs Include="--exclusions-file $(SignCheckExclusionsFile)" Condition="'@(SignValidationExclusionList)' != ''" />
       <SignCheckArgs Include="--verify-jar" Condition="'$(EnableJarSigningCheck)' == 'true'" />
       <SignCheckArgs Include="--verify-strongname" Condition="'$(EnableStrongNameCheck)' == 'true'" />
     </ItemGroup>
-
-    <WriteLinesToFile
+   
+    <WriteLinesToFile 
       File="$(SignCheckExclusionsFile)"
       Lines="@(SignValidationExclusionList)"
       Condition="'@(SignValidationExclusionList)' != ''"
       Overwrite="true"
       Encoding="Unicode"/>
-
+    
     <!--
       IgnoreExitCode='true' because the tool doesn't return '0' on success.
     -->
-    <Exec
+    <Exec 
       Command="&quot;$(SignCheckToolPath)&quot; @(SignCheckArgs, ' ')"
-      IgnoreExitCode='true'
-      ConsoleToMsBuild="false"
+      IgnoreExitCode='true' 
+      ConsoleToMsBuild="false" 
       StandardErrorImportance="high" />
 
-    <Error
-      Text="Signing validation failed. Check $(SignCheckErrorLog) for more information."
+    <Error 
+      Text="Signing validation failed. Check $(SignCheckErrorLog) for more information." 
       Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
 
     <Message
       Text="##vso[artifact.upload containerfolder=LogFiles;artifactname=LogFiles]{SignCheckErrorLog}"
       Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
-
+    
   </Target>
 
   <ItemGroup>

eng/common/tools.sh

@@ -389,14 +389,15 @@ function StopProcesses {
 }
 
 function MSBuild {
-  args=$@
+  local args=$@
   if [[ "$pipelines_log" == true ]]; then
     InitializeBuildTool
     InitializeToolset
-    _toolset_dir="${_InitializeToolset%/*}"
-    _loggerPath="$_toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
-    args=( "${args[@]}" "-logger:$_loggerPath" )
+    local toolset_dir="${_InitializeToolset%/*}"
+    local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
+    args=( "${args[@]}" "-logger:$logger_path" )
   fi
+
   MSBuild-Core ${args[@]}
 }
 

global.json

@@ -8,6 +8,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19273.1"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19274.6"
   }
 }