chore: Update appveyor image (#222)

Ash258 · Nov 22, 2021 · 8175fdb · 8175fdb
1 parent 2c43379
commit 8175fdb
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 105 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -11,7 +11,6 @@
     "containerUser": "root",
     "remoteUser": "root",
     "extensions": [
-        "CoenraadS.bracket-pair-colorizer-2",
         "DavidAnson.vscode-markdownlint",
         "EditorConfig.EditorConfig",
         "fabiospampinato.vscode-terminals",

diff --git a/.vscode/Shovel.code-workspace b/.vscode/Shovel.code-workspace
@@ -114,11 +114,10 @@
             {
                 "url": "https://raw.githubusercontent.com/Ash258/Scoop-Core/NEW/schema.json",
                 "fileMatch": [
-                    "bucket/*.json*",
-                    "bucket/old/**/*.json",
-                    "deprecated/*.json*",
-                    "TODO/*.json*",
-                    "supporting/*.json*",
+                    "bucket/**/*.json*",
+                    "deprecated/**/*.json*",
+                    "TODO/**/*.json*",
+                    "supporting/**/*.json*",
                 ],
             },
         ],
@@ -154,38 +153,6 @@
             },
         },
         "terminal.integrated.windowsEnableConpty": true,
-        "terminals.terminals": [
-            {
-                "name": "Powershell",
-                "shellPath": "powershell.exe",
-                "shellArgs": [
-                    "-NoLogo",
-                    "-NoExit",
-                ],
-                "focus": true,
-                "open": true,
-            },
-            {
-                "name": "Powershell Core",
-                "shellPath": "pwsh.exe",
-                "shellArgs": [
-                    "-NoLogo",
-                    "-NoExit",
-                ],
-                "focus": true,
-                "open": true,
-            },
-            {
-                "name": "Powershell Core Preview",
-                "shellPath": "pwsh-preview.exe",
-                "shellArgs": [
-                    "-NoLogo",
-                    "-NoExit",
-                ],
-                "focus": true,
-                "open": true,
-            },
-        ],
         // #region Language Specific settings
         "markdown.extension.italic.indicator": "_",
         "markdown.extension.list.indentationSize": "inherit",
@@ -234,17 +201,16 @@
         "yaml.hover": true,
         "yaml.schemas": {
             "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json": [
-                "github/workflows/*",
+                "github/workflows/**/*",
             ],
             "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/appveyor.json": [
-                "appveyor.y*(a)ml",
+                "*appveyor.y*(a)ml",
             ],
             "https://raw.githubusercontent.com/Ash258/Scoop-Core/NEW/schema.json": [
-                "bucket/*.y*ml",
-                "bucket/old/**/*.y*ml",
-                "deprecated/*.y*ml",
-                "TODO/*.y*ml",
-                "supporting/*.y*ml",
+                "bucket/**/*.y*ml",
+                "deprecated/**/*.y*ml",
+                "TODO/**/*.y*ml",
+                "supporting/**/*.y*ml",
             ],
         },
         "yaml.schemaStore.enable": true,

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,9 +1,7 @@
 {
     "recommendations": [
-        "CoenraadS.bracket-pair-colorizer-2",
         "DavidAnson.vscode-markdownlint",
         "EditorConfig.EditorConfig",
-        "fabiospampinato.vscode-terminals",
         "ms-vscode.powershell-preview",
         "ms-vscode-remote.remote-ssh",
         "ms-vscode-remote.remote-containers",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -31,52 +31,45 @@
         {
             "url": "https://raw.githubusercontent.com/Ash258/Scoop-Core/NEW/schema.json",
             "fileMatch": [
-                "bucket/*.json*",
-                "deprecated/*.json*",
-                "TODO/*.json*",
-                "supporting/*.json*",
+                "bucket/**/*.json*",
+                "deprecated/**/*.json*",
+                "TODO/**/*.json*",
+                "supporting/**/*.json*",
             ],
         },
     ],
     "task.autoDetect": "off",
-    "terminal.integrated.shell.windows": "powershell.exe",
-    "terminal.integrated.shellArgs.windows": [
-        "-NoLogo",
-        "-NoExit",
-    ],
-    "terminal.integrated.windowsEnableConpty": true,
-    "terminals.terminals": [
-        {
-            "name": "Powershell",
-            "shellPath": "powershell.exe",
-            "shellArgs": [
+    "terminal.integrated.defaultProfile.windows": "PowerShell",
+    "terminal.integrated.profiles.windows": {
+        "PowerShell": {
+            "path": "powershell.exe",
+            "args": [
                 "-NoLogo",
                 "-NoExit",
             ],
-            "focus": true,
-            "open": true,
         },
-        {
-            "name": "Powershell Core",
-            "shellPath": "pwsh.exe",
-            "shellArgs": [
+        "PowerShell Core": {
+            "path": [
+                "${env:SCOOP_GLOBAL}\\apps\\pwsh\\current\\pwsh.exe",
+                "${env:SCOOP}\\apps\\pwsh\\current\\pwsh.exe",
+            ],
+            "args": [
                 "-NoLogo",
                 "-NoExit",
             ],
-            "focus": true,
-            "open": true,
         },
-        {
-            "name": "Powershell Core Preview",
-            "shellPath": "pwsh-preview.exe",
-            "shellArgs": [
+        "PowerShell Core (Preview)": {
+            "path": [
+                "${env:SCOOP_GLOBAL}\\apps\\pwsh-preview\\current\\pwsh.exe",
+                "${env:SCOOP}\\apps\\pwsh-preview\\current\\pwsh.exe",
+            ],
+            "args": [
                 "-NoLogo",
                 "-NoExit",
             ],
-            "focus": true,
-            "open": true,
         },
-    ],
+    },
+    "terminal.integrated.windowsEnableConpty": true,
     // #region Language Specific settings
     "markdown.extension.italic.indicator": "_",
     "markdown.extension.list.indentationSize": "inherit",
@@ -125,16 +118,16 @@
     "yaml.hover": true,
     "yaml.schemas": {
         "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json": [
-            "github/workflows/*",
+            "github/workflows/**/*",
         ],
         "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/appveyor.json": [
-            "appveyor.y*(a)ml",
+            "*appveyor.y*(a)ml",
         ],
         "https://raw.githubusercontent.com/Ash258/Scoop-Core/NEW/schema.json": [
-            "bucket/*.y*ml",
-            "deprecated/*.y*ml",
-            "TODO/*.y*ml",
-            "supporting/*.y*ml",
+            "bucket/**/*.y*ml",
+            "deprecated/**/*.y*ml",
+            "TODO/**/*.y*ml",
+            "supporting/**/*.y*ml",
         ],
     },
     "yaml.schemaStore.enable": true,

diff --git a/.vscode/setupEcosystem.ps1 b/.vscode/setupEcosystem.ps1
@@ -17,7 +17,7 @@ $REPOSITORIES = @(
     @('Ash258/Scoop-Shim.git', 'Shim'),
     @('ScoopInstaller/PHP.git', 'PHP', 'Ash258/Scoop-PHP.git'),
     @('ScoopInstaller/Main.git', 'Main', 'Ash258/Scoop-Main.git'),
-    @('lukesampson/scoop-extras.git', 'Extras', 'Ash258/Scoop-Extras.git'),
+    @('ScoopInstaller/Extras.git', 'Extras', 'Ash258/Scoop-Extras.git'),
     @('Ash258/GithubActionsBucketForTesting', 'GithubActionsBucketForTesting')
 )
 
@@ -27,7 +27,7 @@ if ($Https) { $GH = 'https://github.com/' }
 $ind = 0
 foreach ($repo in $REPOSITORIES) {
     ++$ind
-    Write-Progress -Activity 'Clonning' -Status $repo[0] -PercentComplete ($ind * (100 / $REPOSITORIES.Count))
+    Write-Progress -Id 1 -Activity 'Clonning' -Status $repo[0] -PercentComplete ($ind * (100 / $REPOSITORIES.Count))
     $origin = $targetname = $Ash = $target = $null
 
     $origin = $GH + $repo[0]

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
-version: "{build}-{branch}"
-image: Visual Studio 2019
+version: '{build}-{branch}'
+image: Visual Studio 2022
 build: off
 deploy: off
 clone_folder: C:\projects\scoop
@@ -10,25 +10,25 @@ environment:
   lessmsi: '%scoop_helpers%\lessmsi\lessmsi.exe'
   innounp: '%scoop_helpers%\innounp\innounp.exe'
   matrix:
-    - PowerShell: 5
-    - PowerShell: 7
+  - PowerShell: 5
+  - PowerShell: 7
 cache:
-  - '%USERPROFILE%\Documents\WindowsPowerShell\Modules -> appveyor.yml, test\bin\*.ps1'
-  - C:\projects\helpers  -> appveyor.yml, test\bin\*.ps1
+- '%USERPROFILE%\Documents\WindowsPowerShell\Modules -> appveyor.yml, test\bin\*.ps1'
+- C:\projects\helpers  -> appveyor.yml, test\bin\*.ps1
 matrix:
   fast_finish: true
 for:
-  - matrix:
-      only:
-        - PowerShell: 5
-    install:
-      - ps: . "$env:SCOOP_HOME\test\bin\init.ps1"
-    test_script:
-      - ps: . "$env:SCOOP_HOME\test\bin\test.ps1"
-  - matrix:
-      only:
-        - PowerShell: 7
-    install:
-      - pwsh: . "$env:SCOOP_HOME\test\bin\init.ps1"
-    test_script:
-      - pwsh: . "$env:SCOOP_HOME\test\bin\test.ps1"
+- matrix:
+    only:
+    - PowerShell: 5
+  install:
+  - ps: . "$env:SCOOP_HOME\test\bin\init.ps1"
+  test_script:
+  - ps: . "$env:SCOOP_HOME\test\bin\test.ps1"
+- matrix:
+    only:
+    - PowerShell: 7
+  install:
+  - pwsh: . "$env:SCOOP_HOME\test\bin\init.ps1"
+  test_script:
+  - pwsh: . "$env:SCOOP_HOME\test\bin\test.ps1"