Merge pull request #244 from dotnet/darc-master-b8fd3f6b-60bd-4016-bd31-a296c282529b

Update dependency files
This commit is contained in:
Livar 2019-01-07 09:59:09 -08:00 committed by GitHub
commit 84b4077e3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions

View file

@ -24,9 +24,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19053.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19055.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7acae668c8dd3efc4b0e18946982d7ddee3e5591</Sha>
<Sha>b43f8c50d78c00d33f0b31a666b46ce5e9bcbe3d</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

View file

@ -130,6 +130,9 @@ while [[ $# > 0 ]]; do
/p:*)
properties="$properties $1"
;;
/m:*)
properties="$properties $1"
;;
*)
echo "Invalid argument: $1"
usage

View file

@ -189,8 +189,9 @@ function InitializeBuildTool {
InitializeDotNetCli $restore
# return value
# return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild"
}
function GetNuGetPackageCachePath {
@ -283,7 +284,7 @@ function MSBuild {
warnaserror_switch="/warnaserror"
fi
"$_InitializeBuildTool" msbuild /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error "$@"
"$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error "$@"
lastexitcode=$?
if [[ $lastexitcode != 0 ]]; then

View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview-009812"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19053.2"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19055.1"
}
}