From cce13c33b85c20637bb06718f3e6bf6ac0e3f4e8 Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Thu, 21 Jan 2021 13:44:42 -0800
Subject: [PATCH 1/2] Disable windows path locator until it's fixed

---
 src/client/pythonEnvironments/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/client/pythonEnvironments/index.ts b/src/client/pythonEnvironments/index.ts
index f8f9ca00253a..d0d3e5b3514e 100644
--- a/src/client/pythonEnvironments/index.ts
+++ b/src/client/pythonEnvironments/index.ts
@@ -13,7 +13,6 @@ import { ILocator } from './base/locator';
 import { CachingLocator } from './base/locators/composite/cachingLocator';
 import { PythonEnvsReducer } from './base/locators/composite/environmentsReducer';
 import { PythonEnvsResolver } from './base/locators/composite/environmentsResolver';
-import { WindowsPathEnvVarLocator } from './base/locators/lowLevel/windowsKnownPathsLocator';
 import { WorkspaceVirtualEnvironmentLocator } from './base/locators/lowLevel/workspaceVirtualEnvLocator';
 import { getEnvs } from './base/locatorUtils';
 import { initializeExternalDependencies as initializeLegacyExternalDependencies } from './common/externalDependencies';
@@ -117,7 +116,7 @@ function createNonWorkspaceLocators(ext: ExtensionState): ILocator[] {
             // Windows specific locators go here.
             new WindowsRegistryLocator(),
             new WindowsStoreLocator(),
-            new WindowsPathEnvVarLocator(),
+            // new WindowsPathEnvVarLocator(),
         ];
     } else {
         locators = [

From c0fe6b53ced9295e46eeaee83b72bc411df8baee Mon Sep 17 00:00:00 2001
From: Karthik Nadig <kanadig@microsoft.com>
Date: Thu, 21 Jan 2021 15:40:27 -0800
Subject: [PATCH 2/2] Update version and changelog for release (#15194)

---
 CHANGELOG.md      | 2 +-
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07ac18773713..f4b09e90008d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2021.1.0-rc (12 January 2021)
+## 2021.1.0 (21 January 2021)
 
 ### Enhancements
 
diff --git a/package-lock.json b/package-lock.json
index 71828949901b..b93e3fd19dbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "python",
-    "version": "2021.1.0-rc",
+    "version": "2021.1.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/package.json b/package.json
index e334687ebfdc..8ebd6a85a44a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Linting, Debugging (multi-threaded, remote), Intellisense, Jupyter Notebooks, code formatting, refactoring, unit tests, and more.",
-    "version": "2021.1.0-rc",
+    "version": "2021.1.0",
     "featureFlags": {
         "usingNewInterpreterStorage": true
     },