diff --git a/NuGet.config b/NuGet.config index 87909589d8..12ce55053a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,4 +23,5 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bd729be70..060c0b8bc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 2e804f8d57972faf64a19a7295728dc7bfcb5fce + 5f8175b1d50da9a718c81824d65d3935b4c9446a - + https://github.com/dotnet/arcade - 2e804f8d57972faf64a19a7295728dc7bfcb5fce + 5f8175b1d50da9a718c81824d65d3935b4c9446a - + https://github.com/dotnet/arcade - 2e804f8d57972faf64a19a7295728dc7bfcb5fce + 5f8175b1d50da9a718c81824d65d3935b4c9446a - + https://github.com/dotnet/arcade - 2e804f8d57972faf64a19a7295728dc7bfcb5fce + 5f8175b1d50da9a718c81824d65d3935b4c9446a - + https://github.com/dotnet/arcade - 2e804f8d57972faf64a19a7295728dc7bfcb5fce + 5f8175b1d50da9a718c81824d65d3935b4c9446a https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index c154fd1efd..f91658b23f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,8 +60,8 @@ 2.4.1 2.0.3 2.4.1 - 2.2.0-beta.20411.9 - 1.0.0-beta.20411.9 + 2.2.0-beta.20427.2 + 1.0.0-beta.20427.2 1.22.0 1.1.2 2.0.0 @@ -73,7 +73,7 @@ 1.7.0 1.1.0-beta.19556.4 1.0.0-beta2-19554-01 - 1.0.0-beta.20411.9 + 1.0.0-beta.20427.2 1.0.0-beta.20055.1 diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 242429bca6..06b6534252 100644 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,8 +2,8 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" -verbosity=m +versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +verbosity='minimal' while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" @@ -20,6 +20,10 @@ while [[ $# > 0 ]]; do verbosity=$2 shift ;; + --toolpath) + toolpath=$2 + shift + ;; *) echo "Invalid argument: $1" usage @@ -52,17 +56,27 @@ function InstallDarcCli { InitializeDotNetCli local dotnet_root=$_InitializeDotNetCli - local uninstall_command=`$dotnet_root/dotnet tool uninstall $darc_cli_package_name -g` - local tool_list=$($dotnet_root/dotnet tool list -g) - if [[ $tool_list = *$darc_cli_package_name* ]]; then - echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g) + if [ -z "$toolpath" ]; then + local tool_list=$($dotnet_root/dotnet tool list -g) + if [[ $tool_list = *$darc_cli_package_name* ]]; then + echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g) + fi + else + local tool_list=$($dotnet_root/dotnet tool list --tool-path "$toolpath") + if [[ $tool_list = *$darc_cli_package_name* ]]; then + echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name --tool-path "$toolpath") + fi fi - local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" + local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" echo "Installing Darc CLI version $darcVersion..." echo "You may need to restart your command shell if this is the first dotnet tool you have installed." - echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g) + if [ -z "$toolpath" ]; then + echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g) + else + echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath") + fi } InstallDarcCli diff --git a/global.json b/global.json index c43398e67e..9218ec224e 100644 --- a/global.json +++ b/global.json @@ -9,7 +9,7 @@ "dotnet": "5.0.100-rc.1.20380.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20411.9", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20411.9" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20427.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20427.2" } }