From 27b6661ce31434055287d802929c5ba61c82ddb4 Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Sun, 12 Sep 2021 16:18:05 -0400 Subject: [PATCH] remove unused env var * DOTNET_SKIP_FIRST_TIME_EXPERIENCE --- eng/common/tools.ps1 | 4 ---- eng/common/tools.sh | 4 ---- eng/restore-toolset.ps1 | 1 - eng/restore-toolset.sh | 1 - src/Tests/Microsoft.NET.TestFramework/TestContext.cs | 2 -- src/Tests/dotnet-watch.Tests/Utilities/AwaitableProcess.cs | 1 - src/WebSdk/Publish/Tasks/Tasks/GenerateEFSQLScripts.cs | 4 ---- 7 files changed, 17 deletions(-) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 02347914f5db..67eca67b0456 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -157,9 +157,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism $env:DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we do not need all ASP.NET packages restored. - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - # Disable telemetry on CI. if ($ci) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -231,7 +228,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' - Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6a4871ef72b7..6ddf2fea1cf3 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -111,9 +111,6 @@ function InitializeDotNetCli { # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism export DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we want to control all package sources - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - # Disable telemetry on CI if [[ $ci == true ]]; then export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -165,7 +162,6 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" - Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" # return value _InitializeDotNetCli="$dotnet_root" diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1 index 5ed3053e9860..e3167d3a7766 100644 --- a/eng/restore-toolset.ps1 +++ b/eng/restore-toolset.ps1 @@ -43,7 +43,6 @@ function CreateBuildEnvScript() $scriptContents = @" @echo off title SDK Build ($RepoRoot) -set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 set DOTNET_MULTILEVEL_LOOKUP=0 set DOTNET_ROOT=$env:DOTNET_INSTALL_DIR diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh index c5e939fb808f..60515eafc72f 100644 --- a/eng/restore-toolset.sh +++ b/eng/restore-toolset.sh @@ -57,7 +57,6 @@ function CreateBuildEnvScript { scriptPath="$artifacts_dir/sdk-build-env.sh" scriptContents=" #!/bin/bash -export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 export DOTNET_MULTILEVEL_LOOKUP=0 export DOTNET_ROOT=$DOTNET_INSTALL_DIR diff --git a/src/Tests/Microsoft.NET.TestFramework/TestContext.cs b/src/Tests/Microsoft.NET.TestFramework/TestContext.cs index 9ada95fc7b50..57c33f37a61a 100644 --- a/src/Tests/Microsoft.NET.TestFramework/TestContext.cs +++ b/src/Tests/Microsoft.NET.TestFramework/TestContext.cs @@ -61,8 +61,6 @@ public void AddTestEnvironmentVariables(SdkCommandSpec command) // Set NUGET_PACKAGES environment variable to match value from build.ps1 command.Environment["NUGET_PACKAGES"] = NuGetCachePath; - command.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; - command.Environment["GenerateResourceMSBuildArchitecture"] = "CurrentArchitecture"; command.Environment["GenerateResourceMSBuildRuntime"] = "CurrentRuntime"; diff --git a/src/Tests/dotnet-watch.Tests/Utilities/AwaitableProcess.cs b/src/Tests/dotnet-watch.Tests/Utilities/AwaitableProcess.cs index 184560d02f63..527d7eb198c9 100644 --- a/src/Tests/dotnet-watch.Tests/Utilities/AwaitableProcess.cs +++ b/src/Tests/dotnet-watch.Tests/Utilities/AwaitableProcess.cs @@ -51,7 +51,6 @@ public void Start() var processStartInfo = _spec.GetProcessStartInfo(); processStartInfo.RedirectStandardOutput = true; processStartInfo.RedirectStandardError = true; - processStartInfo.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "true"; _process = new Process { diff --git a/src/WebSdk/Publish/Tasks/Tasks/GenerateEFSQLScripts.cs b/src/WebSdk/Publish/Tasks/Tasks/GenerateEFSQLScripts.cs index ddbd0ed43332..21da72891633 100644 --- a/src/WebSdk/Publish/Tasks/Tasks/GenerateEFSQLScripts.cs +++ b/src/WebSdk/Publish/Tasks/Tasks/GenerateEFSQLScripts.cs @@ -76,13 +76,10 @@ private void InitializeProperties() private int _processExitCode; private StringBuilder _standardOut = new StringBuilder(); private StringBuilder _standardError = new StringBuilder(); - private const string SkipFirstTimeEnvironmentVariable = "DOTNET_SKIP_FIRST_TIME_EXPERIENCE"; private const string AspNetCoreEnvironment = "ASPNETCORE_ENVIRONMENT"; private bool GenerateSQLScript(string sqlFileFullPath, string dbContextName, bool isLoggingEnabled = true) { - string previousSkipValue = Environment.GetEnvironmentVariable(SkipFirstTimeEnvironmentVariable); string previousAspNetCoreEnvironment = Environment.GetEnvironmentVariable(AspNetCoreEnvironment); - Environment.SetEnvironmentVariable(SkipFirstTimeEnvironmentVariable, "true"); Environment.SetEnvironmentVariable(AspNetCoreEnvironment, "Development"); ProcessStartInfo psi = new ProcessStartInfo("dotnet", $@"ef migrations script --no-build --idempotent --configuration {Configuration} --output ""{sqlFileFullPath}"" --context {dbContextName} {EFMigrationsAdditionalArgs}") { @@ -128,7 +125,6 @@ private bool GenerateSQLScript(string sqlFileFullPath, string dbContextName, boo isProcessExited = proc.WaitForExit(300000); } - Environment.SetEnvironmentVariable(SkipFirstTimeEnvironmentVariable, previousSkipValue); Environment.SetEnvironmentVariable(AspNetCoreEnvironment, previousAspNetCoreEnvironment); if (!isProcessExited || _processExitCode != 0) {