Merge branch 'master' into eanders-ms/simx

microsoft · Oct 7, 2024 · 1204b59 · 1204b59
2 parents 21ae622 + ff073f4
commit 1204b59
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/docs/beta-ref.json b/docs/beta-ref.json
@@ -1,3 +1,3 @@
 {
-    "appref": "v7.0"
-}
+    "appref": "v"
+}
diff --git a/libs/arcadeshield/pxt.json b/libs/arcadeshield/pxt.json
@@ -24,7 +24,8 @@
     "test": [
         "test.ts"
     ],
-    "public": false,
+    "public": true,
+    "hidden": true,
     "preferredEditor": "tsprj",
     "disablesVariants": [
         "mbdal"

diff --git a/libs/fonts/pxt.json b/libs/fonts/pxt.json
@@ -4,7 +4,8 @@
     "files": [
         "font12.jres"
     ],
-    "public": false,
+    "public": true,
+    "hidden": true,
     "disablesVariants": [
         "mbdal"
     ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pxt-microbit",
-    "version": "7.1.3",
+    "version": "7.1.5",
     "description": "micro:bit target for Microsoft MakeCode (PXT)",
     "keywords": [
         "JavaScript",
@@ -46,6 +46,6 @@
     },
     "dependencies": {
         "pxt-common-packages": "12.0.4",
-        "pxt-core": "10.3.6"
+        "pxt-core": "11.2.2"
     }
 }
diff --git a/targetconfig.json b/targetconfig.json
@@ -538,6 +538,6 @@
         ]
     },
     "electronManifest": {
-        "latest": "v6.0.19"
+        "latest": "v7.0.49"
     }
 }