From 6bdb0c6822a423673237258fac89c7fd122afba0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Sep 2021 19:54:44 +0000
Subject: [PATCH] Make `deactivate` clean x86 root (#36759)
- backport of #36717 to release/6.0
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
---
activate.ps1 | 1 +
1 file changed, 1 insertion(+)
diff --git a/activate.ps1 b/activate.ps1
index bc6f326e8b7..b1e0e8f5a19 100644
--- a/activate.ps1
+++ b/activate.ps1
@@ -25,6 +25,7 @@ function deactivate ([switch]$init) {
}
Remove-Item env:DOTNET_ROOT -ea ignore
+ Remove-Item 'env:DOTNET_ROOT(x86)' -ea Ignore
Remove-Item env:DOTNET_MULTILEVEL_LOOKUP -ea ignore
if (-not $init) {
# Remove the deactivate function
--
GitLab