From 49342b0d175c45908e2c88d342d474cc630015b2 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Thu, 16 Apr 2020 16:23:24 -0700 Subject: [PATCH 1/2] Set more variables in the DOTNET_CLI path - Set DOTNET_ROOT to the dotnet path - Set DOTNET_CLI_TELEMETRY_OPTOUT=1 - Set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 --- .../Sdk/tools/dotnet-cli/DotNetCli.targets | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets index b7d782bb40e..9cc261b763b 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets @@ -14,6 +14,12 @@ $(HelixPreCommands);export PATH=$HELIX_CORRELATION_PAYLOAD/dotnet:$PATH $(HelixPreCommands);set PATH=%HELIX_CORRELATION_PAYLOAD%\dotnet%3B%PATH% + $(HelixPreCommands);export DOTNET_ROOT=$HELIX_CORRELATION_PAYLOAD/dotnet + $(HelixPreCommands);set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\dotnet + $(HelixPreCommands);export DOTNET_CLI_TELEMETRY_OPTOUT=1 + $(HelixPreCommands);set DOTNET_CLI_TELEMETRY_OPTOUT=1 + $(HelixPreCommands);export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + $(HelixPreCommands);set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From 3e4a43d6a518bfbce7dd884c0d2cdeecd785a4c9 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 1 Jul 2020 13:57:15 -0700 Subject: [PATCH 2/2] Update DotNetCli.targets --- .../Sdk/tools/dotnet-cli/DotNetCli.targets | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets index 9cc261b763b..53e16d720d4 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.targets @@ -14,12 +14,8 @@ $(HelixPreCommands);export PATH=$HELIX_CORRELATION_PAYLOAD/dotnet:$PATH $(HelixPreCommands);set PATH=%HELIX_CORRELATION_PAYLOAD%\dotnet%3B%PATH% - $(HelixPreCommands);export DOTNET_ROOT=$HELIX_CORRELATION_PAYLOAD/dotnet - $(HelixPreCommands);set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\dotnet - $(HelixPreCommands);export DOTNET_CLI_TELEMETRY_OPTOUT=1 - $(HelixPreCommands);set DOTNET_CLI_TELEMETRY_OPTOUT=1 - $(HelixPreCommands);export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - $(HelixPreCommands);set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + $(HelixPreCommands);export DOTNET_ROOT=$HELIX_CORRELATION_PAYLOAD/dotnet;export DOTNET_CLI_TELEMETRY_OPTOUT=1 + $(HelixPreCommands);set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\dotnet;set DOTNET_CLI_TELEMETRY_OPTOUT=1