Rchiodo/rel june update (#12356)

* Update security problems

* Update release version

* Update 3rd party notices

* Add font awesome back to third party notices

* ExP telemetry fixes (#12358)

* Use extension channel instead of VS Code channel
* Use publisher.name extension id (not just name)
* Update vscode-tas-client

Co-authored-by: Kim-Adeline Miguel <[email protected]>

Author: rchiodo

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 2020.6.0-rc (15 June 2020)
+## 2020.6.0 (15 June 2020)
 
 ### Enhancements
 

ThirdPartyNotices-Distribution.txt

@@ -1128,3 +1128,43 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 END OF enchannel-zmq-backend NOTICES, INFORMATION, AND LICENSE
 =======
 
+%% font-awesome NOTICES, INFORMATION, AND LICENSE BEGIN HERE
+=========================================
+Font Name - FontAwesome
+
+Font Awesome Free License
+-------------------------
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for
+commercial projects, open source projects, or really almost whatever you want.
+Full Font Awesome Free license: https://fontawesome.com/license/free.
+
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
+packaged as SVG and JS file types.
+
+# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
+In the Font Awesome Free download, the SIL OFL license applies to all icons
+packaged as web and desktop font files.
+
+# Code: MIT License (https://opensource.org/licenses/MIT)
+In the Font Awesome Free download, the MIT license applies to all non-font and
+non-icon files.
+
+# Attribution
+Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
+Awesome Free files already contain embedded comments with sufficient
+attribution, so you shouldn't need to do anything additional when using these
+files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work
+to remove them from files, especially code. They're a great way for folks to
+learn about Font Awesome.
+
+# Brand Icons
+All brand icons are trademarks of their respective owners. The use of these
+trademarks does not indicate endorsement of the trademark holder by Font
+Awesome, nor vice versa. **Please do not use brand logos for any purpose except
+to represent the company, product, or service to which they refer.**
+=========================================
+END OF font-awesome NOTICES, INFORMATION, AND LICENSE

ThirdPartyNotices-Repository.txt

@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Linting, Debugging (multi-threaded, remote), Intellisense, Jupyter Notebooks, code formatting, refactoring, unit tests, snippets, and more.",
-    "version": "2020.6.0-rc",
+    "version": "2020.6.0",
     "featureFlags": {
         "usingNewInterpreterStorage": true
     },
@@ -91,7 +91,6 @@
         "onCommand:python.datascience.selectJupyterInterpreter",
         "onCommand:python.datascience.selectjupytercommandline",
         "onCommand:python.enableSourceMapSupport",
-        
         "onNotebookEditor:jupyter-notebook",
         "workspaceContains:**/mspythonconfig.json"
     ],
@@ -3077,7 +3076,7 @@
         "vscode-languageclient": "^6.2.0-next.2",
         "vscode-languageserver": "^6.2.0-next.2",
         "vscode-languageserver-protocol": "^3.16.0-next.2",
-        "vscode-tas-client": "^0.0.757",
+        "vscode-tas-client": "^0.0.864",
         "vsls": "^0.3.1291",
         "winreg": "^1.2.4",
         "winston": "^3.2.1",
@@ -3305,7 +3304,7 @@
         "webpack-require-from": "^1.8.0",
         "why-is-node-running": "^2.0.3",
         "wtfnode": "^0.8.0",
-        "yargs": "^12.0.2"
+        "yargs": "^15.3.1"
     },
     "__metadata": {
         "id": "f1f59ae4-9318-4f3c-a9b5-81b2eaa5f8a5",

package-lock.json

@@ -9,6 +9,7 @@ import { getExperimentationService, IExperimentationService, TargetPopulation }
 import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { IApplicationEnvironment } from '../application/types';
+import { PVSC_EXTENSION_ID } from '../constants';
 import { GLOBAL_MEMENTO, IConfigurationService, IExperimentService, IMemento, IPythonSettings } from '../types';
 import { ExperimentationTelemetry } from './telemetry';
 
@@ -47,7 +48,7 @@ export class ExperimentService implements IExperimentService {
 
         let targetPopulation: TargetPopulation;
 
-        if (this.appEnvironment.channel === 'insiders') {
+        if (this.appEnvironment.extensionChannel === 'insiders') {
             targetPopulation = TargetPopulation.Insiders;
         } else {
             targetPopulation = TargetPopulation.Public;
@@ -56,7 +57,7 @@ export class ExperimentService implements IExperimentService {
         const telemetryReporter = new ExperimentationTelemetry();
 
         this.experimentationService = getExperimentationService(
-            this.appEnvironment.extensionName,
+            PVSC_EXTENSION_ID,
             this.appEnvironment.packageJson.version!,
             targetPopulation,
             telemetryReporter,