Merge branch 'main' into connor4312/cli-self-update

sashidhar · Oct 17, 2022 · 75dfb89 · 75dfb89
2 parents cb1b7ec + b4e1d3b
commit 75dfb89
Show file tree

Hide file tree

Showing 100 changed files with 2,799 additions and 2,505 deletions.
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
@@ -12,7 +12,7 @@ If you already have VS Code and Docker installed, you can click the badge above
 
 1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
 
-2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
+2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build with **9 GB of RAM** being recommended. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
 
     > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
 

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -6,9 +6,18 @@
 	"overrideCommand": false,
 	"runArgs": [ "--init", "--security-opt", "seccomp=unconfined", "--shm-size=1g"],
 
-	"settings": {
-		"resmon.show.battery": false,
-		"resmon.show.cpufreq": false
+	// VS Code extensions and settings
+	"customizations": {
+		"vscode": {
+			"settings": {
+				"resmon.show.battery": false,
+				"resmon.show.cpufreq": false
+			},
+			"extensions": [
+				"dbaeumer.vscode-eslint",
+				"mutantdino.resourcemonitor"
+			]
+		}
 	},
 
 	// noVNC, VNC
@@ -24,17 +33,12 @@
 		}
 	},
 
-	"extensions": [
-		"dbaeumer.vscode-eslint",
-		"mutantdino.resourcemonitor"
-	],
-
 	// Optionally loads a cached yarn install for the repo
 	"postCreateCommand": ".devcontainer/cache/restore-diff.sh",
 
 	"remoteUser": "node",
 
 	"hostRequirements": {
-		"memory": "8gb"
+		"memory": "9gb"
 	}
 }
diff --git a/.vscode/cglicenses.schema.json b/.vscode/cglicenses.schema.json
@@ -55,6 +55,31 @@
 						}
 					}
 				}
+			},
+			{
+				"type": "object",
+				"required": [
+					"name",
+					"fullLicenseTextUri"
+				],
+				"properties": {
+					"name": {
+						"type": "string",
+						"description": "The name of the dependency"
+					},
+					"fullLicenseTextUri": {
+						"type": "string",
+						"description": "The URI to the license text of this repository",
+						"format": "uri"
+					},
+					"prependLicenseText": {
+						"type": "array",
+						"description": "A piece of text to prepend to the auto-detected license text of the dependency",
+						"items": {
+							"type": "string"
+						}
+					}
+				}
 			}
 		]
 	}

diff --git a/build/azure-pipelines/product-build-pr.yml b/build/azure-pipelines/product-build-pr.yml
@@ -89,6 +89,13 @@ jobs:
             VSCODE_RUN_INTEGRATION_TESTS: false
             VSCODE_RUN_SMOKE_TESTS: true
 
+    - job: LinuxCLI
+      displayName: Linux (CLI)
+      pool: vscode-1es-vscode-linux-20.04
+      timeoutInMinutes: 30
+      steps:
+        - template: cli/test.yml
+
   - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
     - job: Linuxx64MaintainNodeModulesCache
       displayName: Linux (Maintain node_modules cache)
@@ -99,14 +106,6 @@ jobs:
       steps:
         - template: product-build-pr-cache.yml
 
-  - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
-    - job: LinuxCLI
-      displayName: Linux (CLI)
-      pool: vscode-1es-vscode-linux-20.04
-      timeoutInMinutes: 30
-      steps:
-        - template: cli/test.yml
-
   # - job: macOSUnitTest
   #   displayName: macOS (Unit Tests)
   #   pool:

diff --git a/cglicenses.json b/cglicenses.json
@@ -258,5 +258,62 @@
 			"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN",
 			"THE SOFTWARE."
 		]
+	},
+	{
+		// Reason: The crate is old and has been deleted from GH
+		"name": "block-modes",
+		"fullLicenseText": [
+			"Copyright (c) 2018 The RustCrypto Project Developers",
+			"Copyright (c) 2018 Artyom Pavlov",
+			"",
+			"Permission is hereby granted, free of charge, to any",
+			"person obtaining a copy of this software and associated",
+			"documentation files (the \"Software\"), to deal in the",
+			"Software without restriction, including without",
+			"limitation the rights to use, copy, modify, merge,",
+			"publish, distribute, sublicense, and/or sell copies of",
+			"the Software, and to permit persons to whom the Software",
+			"is furnished to do so, subject to the following",
+			"conditions:",
+			"",
+			"The above copyright notice and this permission notice",
+			"shall be included in all copies or substantial portions",
+			"of the Software.",
+			"",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF",
+			"ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED",
+			"TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A",
+			"PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT",
+			"SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY",
+			"CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR",
+			"IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+			"DEALINGS IN THE SOFTWARE."
+		]
+	},
+	{
+		// Reason: repo URI is wrong on crate, pending https://github.com/warp-tech/russh/pull/53
+		"name": "russh-cryptovec",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/warp-tech/russh/1da80d0d599b6ee2d257c544c0d6af4f649c9029/LICENSE-2.0.txt"
+	},
+	{
+		// Reason: repo URI is wrong on crate, pending https://github.com/warp-tech/russh/pull/53
+		"name": "russh-keys",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/warp-tech/russh/1da80d0d599b6ee2d257c544c0d6af4f649c9029/LICENSE-2.0.txt"
+	},
+	{
+		// Reason: license is in a subdirectory in repo
+		"name": "dirs-next",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/xdg-rs/dirs/af4aa39daba0ac68e222962a5aca17360158b7cc/dirs/LICENSE-MIT"
+	},
+	{
+		// Reason: license is in a subdirectory in repo
+		"name": "openssl",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/sfackler/rust-openssl/e43eb58540b27a17f8029c397e3edc12bbc9011f/openssl/LICENSE"
+	},
+	{
+		// Reason: license is in a subdirectory in repo
+		"name": "openssl-sys",
+		"fullLicenseTextUri": "https://raw.githubusercontent.com/sfackler/rust-openssl/e43eb58540b27a17f8029c397e3edc12bbc9011f/openssl-sys/LICENSE-MIT"
 	}
 ]
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -57,7 +57,7 @@ tar = { version = "0.4" }
 russh = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
 russh-cryptovec = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
 russh-keys = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
-# secret-service = { git = "https://github.com/microsoft/vscode-secret-service-rs", rev = "ccef335714cdf3744ff85f812b8fba5b6194dcfa" }
+secret-service = { git = "https://github.com/microsoft/vscode-secret-service-rs", rev = "30f0414108a122d6f2bfc28a5425d0dac9738518" }
 
 [profile.release]
 strip = true

diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -19,7 +19,8 @@
     "scmValidation",
     "tabInputTextMerge",
     "timeline",
-    "contribMergeEditorMenus"
+    "contribMergeEditorMenus",
+    "extensionLog"
   ],
   "categories": [
     "Other"
@@ -49,11 +50,6 @@
   },
   "contributes": {
     "commands": [
-      {
-        "command": "git.setLogLevel",
-        "title": "%command.setLogLevel%",
-        "category": "Git"
-      },
       {
         "command": "git.clone",
         "title": "%command.clone%",
@@ -651,10 +647,6 @@
     ],
     "menus": {
       "commandPalette": [
-        {
-          "command": "git.setLogLevel",
-          "when": "config.git.enabled && !git.missing"
-        },
         {
           "command": "git.clone",
           "when": "config.git.enabled && !git.missing"
@@ -2546,30 +2538,6 @@
           "default": [],
           "markdownDescription": "%config.commandsToLog%"
         },
-        "git.logLevel": {
-          "type": "string",
-          "default": "Info",
-          "enum": [
-            "Trace",
-            "Debug",
-            "Info",
-            "Warning",
-            "Error",
-            "Critical",
-            "Off"
-          ],
-          "enumDescriptions": [
-            "%config.logLevel.trace%",
-            "%config.logLevel.debug%",
-            "%config.logLevel.info%",
-            "%config.logLevel.warn%",
-            "%config.logLevel.error%",
-            "%config.logLevel.critical%",
-            "%config.logLevel.off%"
-          ],
-          "markdownDescription": "%config.logLevel%",
-          "scope": "window"
-        },
         "git.mergeEditor": {
           "type": "boolean",
           "default": false,

diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
@@ -1,7 +1,6 @@
 {
 	"displayName": "Git",
 	"description": "Git SCM Integration",
-	"command.setLogLevel": "Set Log Level...",
 	"command.clone": "Clone",
 	"command.cloneRecursive": "Clone (Recursive)",
 	"command.init": "Initialize Repository",
@@ -236,21 +235,6 @@
 	"config.repositoryScanIgnoredFolders": "List of folders that are ignored while scanning for Git repositories when `#git.autoRepositoryDetection#` is set to `true` or `subFolders`.",
 	"config.repositoryScanMaxDepth": "Controls the depth used when scanning workspace folders for Git repositories when `#git.autoRepositoryDetection#` is set to `true` or `subFolders`. Can be set to `-1` for no limit.",
 	"config.useIntegratedAskPass": "Controls whether GIT_ASKPASS should be overwritten to use the integrated version.",
-	"config.logLevel": {
-		"message": "Specifies how much information (if any) to log to the [git output](command:git.showOutput).",
-		"comment": [
-			"{Locked='](command:git.showOutput'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
-			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-		]
-	},
-	"config.logLevel.trace": "Log all information",
-	"config.logLevel.debug": "Log only debug, information, warning, error, and critical information",
-	"config.logLevel.info": "Log only information, warning, error, and critical information",
-	"config.logLevel.warn": "Log only warning, error, and critical information",
-	"config.logLevel.error": "Log only error, and critical information",
-	"config.logLevel.critical": "Log only critical information",
-	"config.logLevel.off": "Log nothing",
 	"config.mergeEditor": "Open the merge editor for files that are currently under conflict.",
 	"submenu.explorer": "Git",
 	"submenu.commit": "Commit",