From 1dde69968875fc4f235e6238dfe9d819c015febd Mon Sep 17 00:00:00 2001 From: Stefan Markovic <57057282+stefansjfw@users.noreply.github.com> Date: Thu, 26 Oct 2023 12:01:26 +0200 Subject: [PATCH] [EnvVar]Do not expand variables when looking for backup variables (#29431) * [EnvVar] Do not expand when looking for backup variable * Revert unneeded change --- .../Helpers/EnvironmentVariablesHelper.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/Helpers/EnvironmentVariablesHelper.cs b/src/modules/EnvironmentVariables/EnvironmentVariables/Helpers/EnvironmentVariablesHelper.cs index 1979e9b14f..9503f9fb1b 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariables/Helpers/EnvironmentVariablesHelper.cs +++ b/src/modules/EnvironmentVariables/EnvironmentVariables/Helpers/EnvironmentVariablesHelper.cs @@ -21,25 +21,25 @@ namespace EnvironmentVariables.Helpers internal static Variable GetExisting(string variableName) { - var userVariables = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.User); + DefaultVariablesSet userSet = new DefaultVariablesSet(Guid.NewGuid(), "tmpUser", VariablesSetType.User); + GetVariables(EnvironmentVariableTarget.User, userSet); - foreach (DictionaryEntry variable in userVariables) + foreach (var variable in userSet.Variables) { - var key = variable.Key as string; - if (key.Equals(variableName, StringComparison.OrdinalIgnoreCase)) + if (variable.Name.Equals(variableName, StringComparison.OrdinalIgnoreCase)) { - return new Variable(key, userVariables[key] as string, VariablesSetType.User); + return new Variable(variable.Name, variable.Values, VariablesSetType.User); } } - var systemVariables = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.Machine); + DefaultVariablesSet systemSet = new DefaultVariablesSet(Guid.NewGuid(), "tmpSystem", VariablesSetType.System); + GetVariables(EnvironmentVariableTarget.Machine, systemSet); - foreach (DictionaryEntry variable in systemVariables) + foreach (var variable in systemSet.Variables) { - var key = variable.Key as string; - if (key.Equals(variableName, StringComparison.OrdinalIgnoreCase)) + if (variable.Name.Equals(variableName, StringComparison.OrdinalIgnoreCase)) { - return new Variable(key, systemVariables[key] as string, VariablesSetType.System); + return new Variable(variable.Name, variable.Values, VariablesSetType.System); } }