diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 902752052..a17980fc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - a858f1cb980cba38ec20cc46383ca0fce8af8fb2 + b5016f5688dc8ca9f3e4811ee7e2e86ad8907a40 diff --git a/eng/common/PublishToPackageFeed.proj b/eng/common/PublishToPackageFeed.proj index bb8ef2c53..a1b133372 100644 --- a/eng/common/PublishToPackageFeed.proj +++ b/eng/common/PublishToPackageFeed.proj @@ -1,7 +1,7 @@ - + @@ -57,8 +57,8 @@ https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json - diff --git a/eng/common/SigningValidation.proj b/eng/common/SigningValidation.proj index 99c0ecc2c..7045fb6fb 100644 --- a/eng/common/SigningValidation.proj +++ b/eng/common/SigningValidation.proj @@ -1,13 +1,13 @@ - - - + diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 34a23e947..fd26f6fbb 100644 --- a/eng/common/tools.sh +++ b/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[@]} } diff --git a/global.json b/global.json index 556d2b947..d6fce99a3 100644 --- a/global.json +++ b/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" } }