Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20201…
Browse files Browse the repository at this point in the history
…026.10 (#649)

[master] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Oct 28, 2020
1 parent 26d7c5d commit 311df24
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 1,982 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20525.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20526.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a77062f9cdaf07cbaf8d19941d079837844f69ca</Sha>
<Sha>c0f916d7f45834c080bf6cce60cf2bcfa00bc0a7</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 0 additions & 2 deletions eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Param(
[string] $msbuildEngine = $null,
[bool] $warnAsError = $true,
[bool] $nodeReuse = $true,
[bool] $useDefaultDotnetInstall = $false,
[switch][Alias('r')]$restore,
[switch] $deployDeps,
[switch][Alias('b')]$build,
Expand Down Expand Up @@ -66,7 +65,6 @@ function Print-Usage() {
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
Write-Host " -useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
Write-Host ""

Write-Host "Command line arguments not listed above are passed thru to msbuild."
Expand Down
9 changes: 1 addition & 8 deletions eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ usage()
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
echo " --useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"

echo ""
echo "Command line arguments not listed above are passed thru to msbuild."
echo "Arguments can also be passed in with a single hyphen."
Expand Down Expand Up @@ -80,7 +78,6 @@ prepare_machine=false
verbosity='minimal'
runtime_source_feed=''
runtime_source_feed_key=''
use_default_dotnet_install=false

properties=''
while [[ $# > 0 ]]; do
Expand Down Expand Up @@ -159,14 +156,10 @@ while [[ $# > 0 ]]; do
runtime_source_feed=$2
shift
;;
-runtimesourcefeedkey)
-runtimesourcefeedkey)
runtime_source_feed_key=$2
shift
;;
-usedefaultdotnetinstall)
use_default_dotnet_install=$2
shift
;;
*)
properties="$properties $1"
;;
Expand Down
Loading

0 comments on commit 311df24

Please sign in to comment.