Merge branch 'master' into dev

csu-anzai · Jul 23, 2019 · 91c0dd1 · 91c0dd1
2 parents 85eca81 + 3dcce29
commit 91c0dd1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/WebJobs.Script/BindingExtensions/ExtensionsManager.cs b/src/WebJobs.Script/BindingExtensions/ExtensionsManager.cs
@@ -201,7 +201,7 @@ internal virtual Task ProcessExtensionsProject(string projectFolder)
 
         private void SetupProcessEnvironment(ProcessStartInfo startInfo)
         {
-            TryAdd(startInfo.Environment, "DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "true");
+            TryAdd(startInfo.Environment, EnvironmentSettingNames.DotnetSkipFirstTimeExperience, "true");
             TryAdd(startInfo.Environment, NugetXmlDocModeSettingName, NugetXmlDocSkipMode);
         }
 

diff --git a/src/WebJobs.Script/Description/DotNet/PackageManager.cs b/src/WebJobs.Script/Description/DotNet/PackageManager.cs
@@ -71,6 +71,8 @@ public Task<PackageRestoreResult> RestorePackagesAsync()
                     Arguments = string.Format(CultureInfo.InvariantCulture, "restore \"{0}\" --packages \"{1}\"", restoreProjectPath, nugetHome)
                 };
 
+                startInfo.Environment.Add(EnvironmentSettingNames.DotnetSkipFirstTimeExperience, "true");
+
                 var process = new Process { StartInfo = startInfo };
                 process.ErrorDataReceived += ProcessDataReceived;
                 process.OutputDataReceived += ProcessDataReceived;

diff --git a/src/WebJobs.Script/Environment/EnvironmentSettingNames.cs b/src/WebJobs.Script/Environment/EnvironmentSettingNames.cs
@@ -38,6 +38,7 @@ public static class EnvironmentSettingNames
         public const string MountEnabled = "WEBSITE_MOUNT_ENABLED";
         public const string MsiEndpoint = "MSI_ENDPOINT";
         public const string MsiSecret = "MSI_SECRET";
+        public const string DotnetSkipFirstTimeExperience = "DOTNET_SKIP_FIRST_TIME_EXPERIENCE";
 
         /// <summary>
         /// Environment variable dynamically set by the platform when it is safe to