Merge branch 'main' into dev/bemcmorr/add-prerelease

benmcmorran · web-flow · commit fd2a3be3ef04 · 2023-02-23T07:36:30.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Unreleased
+
+- Release date: TBD
+
+### Changed
+
+- The bundled version of the Arduino CLI was updated to [version 0.31.0](https://github.com/arduino/arduino-cli/releases/tag/0.31.0). [#1606](https://github.com/microsoft/vscode-arduino/pull/1606)
+
+### Fixed
+
+- When using the bundled Arduino CLI, the extension will no longer attempt to make the CLI executable if it is already executable. Additionally, any errors that occur while attempting to make the CLI executable are shown in a notification. [#1601](https://github.com/microsoft/vscode-arduino/pull/1601)
+
 ## Version 0.5.0
 
 - Release date: February 16, 2023
diff --git a/build/assets.json b/build/assets.json
@@ -1,32 +1,32 @@
 {
-  "version": "0.30.0",
+  "version": "0.31.0",
   "assets": {
-    "arduino-cli_0.30.0_Linux_64bit.tar.gz": {
-      "hash": "f6b1cddf3459b1b6ca9dafe36315c2fa1f6f77386ab3795bbad6a117cbe4230b",
+    "arduino-cli_0.31.0_Linux_64bit.tar.gz": {
+      "hash": "9659820fd6b1078e006b674f5865134363378f1f7a37400b67e26f44fd95722d",
       "platforms": ["linux-x64"]
     },
-    "arduino-cli_0.30.0_Linux_ARM64.tar.gz": {
-      "hash": "20d2d036a5af4586b5a046f65d926ed012f7fd85469b484a5fc57ef9ef72fb4b",
+    "arduino-cli_0.31.0_Linux_ARM64.tar.gz": {
+      "hash": "7424766d20eb6bbcf7e1fc6359c41d8a7ea00b6334a1042639f74feb332a78d8",
       "platforms": ["linux-arm64"]
     },
-    "arduino-cli_0.30.0_Linux_ARMv7.tar.gz": {
-      "hash": "1d873f3cb2b939b2df5a7d25e998bded9a4f0c8ac1226d1d5f9abc2bd95a66c3",
+    "arduino-cli_0.31.0_Linux_ARMv7.tar.gz": {
+      "hash": "bef464b6c6c445b766a00d39bcd8507a2fd66a880d9878b7bbbed479a0f3f8c5",
       "platforms": ["linux-armhf"]
     },
-    "arduino-cli_0.30.0_macOS_64bit.tar.gz": {
-      "hash": "ece83e0bd15813e728d07ce584388a278d62e54529deb84ad07d1521bfe74748",
+    "arduino-cli_0.31.0_macOS_64bit.tar.gz": {
+      "hash": "bd968c364212f99795930c1129cec019a39de6bf5a8ed337b5e9ba2c40f2678b",
       "platforms": ["darwin-x64"]
     },
-    "arduino-cli_0.30.0_macOS_ARM64.tar.gz": {
-      "hash": "e6c1a35df995ecb464ffa85fe8a96b82bd06135ea5ae961cb34d9c9e99e6c2fa",
+    "arduino-cli_0.31.0_macOS_ARM64.tar.gz": {
+      "hash": "fff28ea8e1475bac2c24f65611e8116b22fb5206f283fdaa4a6c6ff9927c5ee6",
       "platforms": ["darwin-arm64"]
     },
-    "arduino-cli_0.30.0_Windows_32bit.zip": {
-      "hash": "cccd4b90524581783cf78a3e4942a5c6bf7508a2a5ec4e008bb9c43f1cdb5dbe",
+    "arduino-cli_0.31.0_Windows_32bit.zip": {
+      "hash": "be98351586bf07ea61ab3bf497d4b01616fc74d2e12b9922e09d7cf574622bd6",
       "platforms": ["win32-ia32"]
     },
-    "arduino-cli_0.30.0_Windows_64bit.zip": {
-      "hash": "1808d288382f16594ad73f4797303058b2074b1b375fbb19fca0978033a633af",
+    "arduino-cli_0.31.0_Windows_64bit.zip": {
+      "hash": "dfafc6f793b4b7906df4ea5fb9cd6a92bbc367b6ee30ce82bc5ec492bf4bc7d4",
       "platforms": ["win32-x64"]
     }
   }
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -7,8 +7,8 @@
         "type": "other",
         "other": {
           "name": "arduino-cli (Linux x64)",
-          "version": "0.30.0",
-          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Linux_64bit.tar.gz",
+          "version": "0.31.0",
+          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_Linux_64bit.tar.gz",
         }
       }
     },
@@ -17,8 +17,8 @@
         "type": "other",
         "other": {
           "name": "arduino-cli (Linux ARM64)",
-          "version": "0.30.0",
-          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Linux_ARM64.tar.gz",
+          "version": "0.31.0",
+          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_Linux_ARM64.tar.gz",
         }
       }
     },
@@ -27,8 +27,8 @@
         "type": "other",
         "other": {
           "name": "arduino-cli (Linux ARMv7)",
-          "version": "0.30.0",
-          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Linux_ARMv7.tar.gz",
+          "version": "0.31.0",
+          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_Linux_ARMv7.tar.gz",
         }
       }
     },
@@ -37,8 +37,8 @@
         "type": "other",
         "other": {
           "name": "arduino-cli (macOS x64)",
-          "version": "0.30.0",
-          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_macOS_64bit.tar.gz",
+          "version": "0.31.0",
+          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_macOS_64bit.tar.gz",
         }
       }
     },
@@ -47,8 +47,8 @@
         "type": "other",
         "other": {
           "name": "arduino-cli (macOS ARM64)",
-          "version": "0.30.0",
-          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_macOS_ARM64.tar.gz",
+          "version": "0.31.0",
+          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_macOS_ARM64.tar.gz",
         }
       }
     },
@@ -57,8 +57,8 @@
         "type": "other",
         "other": {
           "name": "arduino-cli (Windows x86)",
-          "version": "0.30.0",
-          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Windows_32bit.zip",
+          "version": "0.31.0",
+          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_Windows_32bit.zip",
         }
       }
     },
@@ -67,8 +67,8 @@
         "type": "other",
         "other": {
           "name": "arduino-cli (Windows x64)",
-          "version": "0.30.0",
-          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Windows_64bit.zip",
+          "version": "0.31.0",
+          "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_Windows_64bit.zip",
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`"type": "other",`
`8`	`8`	`"other": {`
`9`	`9`	`"name": "arduino-cli (Linux x64)",`
`10`		`- "version": "0.30.0",`
`11`		`- "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Linux_64bit.tar.gz",`
	`10`	`+ "version": "0.31.0",`
	`11`	`+ "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_Linux_64bit.tar.gz",`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`},`
`@@ -17,8 +17,8 @@`
`17`	`17`	`"type": "other",`
`18`	`18`	`"other": {`
`19`	`19`	`"name": "arduino-cli (Linux ARM64)",`
`20`		`- "version": "0.30.0",`
`21`		`- "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Linux_ARM64.tar.gz",`
	`20`	`+ "version": "0.31.0",`
	`21`	`+ "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_Linux_ARM64.tar.gz",`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`},`
`@@ -27,8 +27,8 @@`
`27`	`27`	`"type": "other",`
`28`	`28`	`"other": {`
`29`	`29`	`"name": "arduino-cli (Linux ARMv7)",`
`30`		`- "version": "0.30.0",`
`31`		`- "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Linux_ARMv7.tar.gz",`
	`30`	`+ "version": "0.31.0",`
	`31`	`+ "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_Linux_ARMv7.tar.gz",`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`},`
`@@ -37,8 +37,8 @@`
`37`	`37`	`"type": "other",`
`38`	`38`	`"other": {`
`39`	`39`	`"name": "arduino-cli (macOS x64)",`
`40`		`- "version": "0.30.0",`
`41`		`- "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_macOS_64bit.tar.gz",`
	`40`	`+ "version": "0.31.0",`
	`41`	`+ "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_macOS_64bit.tar.gz",`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`},`
`@@ -47,8 +47,8 @@`
`47`	`47`	`"type": "other",`
`48`	`48`	`"other": {`
`49`	`49`	`"name": "arduino-cli (macOS ARM64)",`
`50`		`- "version": "0.30.0",`
`51`		`- "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_macOS_ARM64.tar.gz",`
	`50`	`+ "version": "0.31.0",`
	`51`	`+ "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_macOS_ARM64.tar.gz",`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`},`
`@@ -57,8 +57,8 @@`
`57`	`57`	`"type": "other",`
`58`	`58`	`"other": {`
`59`	`59`	`"name": "arduino-cli (Windows x86)",`
`60`		`- "version": "0.30.0",`
`61`		`- "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Windows_32bit.zip",`
	`60`	`+ "version": "0.31.0",`
	`61`	`+ "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_Windows_32bit.zip",`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`},`
`@@ -67,8 +67,8 @@`
`67`	`67`	`"type": "other",`
`68`	`68`	`"other": {`
`69`	`69`	`"name": "arduino-cli (Windows x64)",`
`70`		`- "version": "0.30.0",`
`71`		`- "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.30.0/arduino-cli_0.30.0_Windows_64bit.zip",`
	`70`	`+ "version": "0.31.0",`
	`71`	`+ "downloadUrl": "https://github.com/arduino/arduino-cli/releases/download/0.31.0/arduino-cli_0.31.0_Windows_64bit.zip",`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`