Merge branch 'main' into nagilson-breaking-auto-update

Author: nagilson

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,28 @@
+name: Copilot Setup Steps
+
+# Automatically run the setup steps when they are changed to allow for easy validation, and
+# allow manual testing through the repository's "Actions" tab
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+permissions:
+  contents: read
+
+env:
+  # Allow Copilot to access Visual Studio assets URLs needed for NuGet restore
+  COPILOT_AGENT_FIREWALL_ALLOW_LIST_ADDITIONS: "vsblob.vsassets.io"
+
+jobs:
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Do an initial build to ensure all dependencies are restored
+        run: |
+          ./build.sh

1es-azure-pipeline.yml

@@ -54,6 +54,10 @@ parameters:
   type: string
   default: Test
   values: [ 'Test', 'Real' ]
+- name: PRERELEASE
+  displayName: Prerelease
+  type: boolean
+  default: false
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
@@ -94,9 +98,9 @@ extends:
       - template: pipeline-templates/lint.yaml@self
         parameters:
           pool:
-            name: Azure Pipelines
-            image: macOS-latest
-            os: macOS
+            name: NetCore1ESPool-Internal
+            image: 1es-windows-2022
+            os: windows
           useOneEngineeringPool: true
       - template: pipeline-templates/package-vsix.yaml@self
         parameters:
@@ -106,6 +110,7 @@ extends:
             os: windows
           useOneEngineeringPool: true
           SignType: ${{ parameters.SignType }}
+          PREELEASE: ${{ parameters.PRERELEASE }}
       - template: pipeline-templates/sbom.yaml@self
         parameters:
           pool:

1pr-azure-pipeline.yml

@@ -20,21 +20,21 @@ variables:
   value: true
 
 # The public PR pool schema is different from the 1ES one. We use 'vmImage' which is a default azure pipeline schema. 'os' and 'name' have nothing to do with image selection here.
-# 1ES uses 'image' but defining an image this way using our public pools duseOneEngineeringPool not work as they aren't configured this way.
+# 1ES uses 'image' but defining an image this way using our public pools useOneEngineeringPool not work as they aren't configured this way.
 # We can later add the flag 'useOneEngineeringPool' or one engineering system: false or true in all tasks to determine if we use vmImage or a 1es pool object.
 parameters:
 - name: pools
   type: object
   default:
   - name: NetCore-Public
-    vmImage: windows-latest
+    demands: ImageOverride -equals 1es-windows-2022-open
     os: windows
     emoji: 🪟
   - name: NetCore-Public
-    vmImage: ubuntu-latest
+    demands: ImageOverride -equals 1es-ubuntu-2004-open
     os: linux
     emoji: 🐧
-  - name: NetCore-Public
+  - name: Azure Pipelines
     vmImage: macOS-latest
     os: macOS
     emoji: 🍎
@@ -46,7 +46,11 @@ stages:
     - template: pipeline-templates/build-test.yaml
       parameters:
         pool:
-          vmImage: ${{ image.vmImage }}
+          name: ${{ image.name }}
+          ${{ if image.demands }}:
+            demands: ${{ image.demands }}
+          ${{ if image.vmImage }}:
+            vmImage: ${{ image.vmImage }}
           os: ${{ image.os }}
           emoji: ${{ image.emoji }}
         useOneEngineeringPool: false
@@ -59,13 +63,16 @@ stages:
   - template: pipeline-templates/lint.yaml
     parameters:
       pool:
-        vmImage: macOS-latest
-        os: macOS
+        name: NetCore-Public
+        demands: ImageOverride -equals 1es-windows-2022-open
+        os: windows
       useOneEngineeringPool: false
   - template: pipeline-templates/package-vsix.yaml
     parameters:
       pool:
-        vmImage: windows-latest
+        name: NetCore-Public
+        demands: ImageOverride -equals 1es-windows-2022-open
         os: windows
       useOneEngineeringPool: false
       SignType: Test
+      PRERELEASE: true

Documentation/contributing-workflow.md

@@ -22,7 +22,6 @@ We use and recommend the following workflow:
     - Please follow our [Commit Messages](contributing.md#commit-messages) guidance.
 5. Add new tests corresponding to your change, if applicable.
 
-If you are having difficulty debugging changes to the library, you may want to incorporate the logging messages into your test session. To do so, set the debugOn flag to true [Here](../vscode-dotnet-runtime-library/src/Utils/Debugging.ts).
 Note that the runtime and sdk extensions can be tested (with breakpoints as well, through the .js files) using their corresponding workspace and launch profiles by opening their root folders in vscode.
 For the library, those tests are reachable by going through the runtime extension workspace and adding the runtime-library folder to the workspace. But logging may be a better approach to debug this code.
 

build.ps1

@@ -4,8 +4,8 @@ $successColor = "Green"
 
 #################### Download backup install scripts ####################
 function DownloadInstallScripts() {
-    Invoke-WebRequest https://dot.net/v1/dotnet-install.ps1 -OutFile "./vscode-dotnet-runtime-library/install scripts/dotnet-install.ps1"
-    Invoke-WebRequest https://dot.net/v1/dotnet-install.sh -OutFile "./vscode-dotnet-runtime-library/install scripts/dotnet-install.sh"
+    Invoke-WebRequest https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 -OutFile "./vscode-dotnet-runtime-library/install scripts/dotnet-install.ps1"
+    Invoke-WebRequest https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh -OutFile "./vscode-dotnet-runtime-library/install scripts/dotnet-install.sh"
 }
 
 try

build.sh

@@ -6,8 +6,8 @@ NC=`tput sgr0`
 echo ""
 echo "----------- Bundling Install Scripts -----------"
 echo ""
-curl https://dot.net/v1/dotnet-install.ps1 --retry 2 -o "./vscode-dotnet-runtime-library/install scripts/dotnet-install.ps1"
-curl https://dot.net/v1/dotnet-install.sh --retry 2 -o "./vscode-dotnet-runtime-library/install scripts/dotnet-install.sh"
+curl https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 --retry 2 -o "./vscode-dotnet-runtime-library/install scripts/dotnet-install.ps1"
+curl https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh --retry 2 -o "./vscode-dotnet-runtime-library/install scripts/dotnet-install.sh"
 if [ $? -eq 0 ];
 then
     echo ""

mock-webpack.ps1

@@ -1,4 +1,4 @@
 # The library doesn't get webpacked, but it needs the copy of items that would normally be webpacked
 # ... into the SDK or Runtime Extension for it to run in local dev scenarios.
 Copy-Item ".\vscode-dotnet-runtime-library\distro-data\" -Destination ".\vscode-dotnet-runtime-library\dist\Acquisition\" -Recurse -Force
-Copy-Item ".\vscode-dotnet-runtime-library\install scripts\" -Destination ".\vscode-dotnet-runtime-library\dist\utils\" -Recurse -Force
+Copy-Item ".\vscode-dotnet-runtime-library\install scripts\" -Destination ".\vscode-dotnet-runtime-library\dist\" -Recurse -Force

mock-webpack.sh

@@ -2,4 +2,4 @@ echo ""
 echo "----------- Copying Library Webpacked Dependencies -----------"
 echo "" # See the build.ps1 for more details on why we do this
 cp -r ./vscode-dotnet-runtime-library/distro-data ./vscode-dotnet-runtime-library/dist/Acquisition
-cp -r "./vscode-dotnet-runtime-library/install scripts" ./vscode-dotnet-runtime-library/dist/Utils
+cp -r "./vscode-dotnet-runtime-library/install scripts" ./vscode-dotnet-runtime-library/dist