Merge pull request #1211 from microsoft/main

Merge 'main' into 'release_mdd'

.devcontainer/Dockerfile

@@ -0,0 +1,7 @@
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0.201.7-5.0
+
+# Install gcc, g++ and make
+RUN sudo apt update && \
+    sudo apt install build-essential -y
+
+# Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)

.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+{
+	"name": "MIEngine Codespace",
+	"settings": {
+		"workbench.colorTheme": "Default Dark+",
+		"terminal.integrated.defaultProfile.linux": "pwsh"
+	},
+	"extensions": [
+		// VS Code specific
+		"coenraads.bracket-pair-colorizer",
+		"vscode-icons-team.vscode-icons",
+		"editorconfig.editorconfig",
+		// GitHub specific
+		"eamodio.gitlens",
+		"cschleiden.vscode-github-actions",
+		"ms-azure-devops.azure-pipelines",
+		"bierner.markdown-preview-github-styles",
+		"ban.spellright",
+		// .NET specific
+		"ms-dotnettools.csharp",
+		"VisualStudioExptTeam.vscodeintellicode",
+		"ms-vscode.powershell",
+		"jmrog.vscode-nuget-package-manager"
+	],
+	"postCreateCommand": "",
+  	"build": {
+    		"dockerfile": "Dockerfile"
+  	}
+}
+
+// Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)

eng/pipelines/steps/PublishOpenDebugAD7.yml

@@ -12,12 +12,21 @@ steps:
     copy ${{ parameters.SignedBinariesFolder }}\Release\Microsoft.MICore.dll $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\.
   displayName: "Publish OpenDebugAD7 ${{ parameters.RuntimeID }}"
 
-# Windows Steps for copying over OpenDebugAD7.exe, WindowsDebugLauncher.exe, and verify the windows binaries.
+# Windows Steps for signing OpenDebugAD7.exe, copying over WindowsDebugLauncher.exe, and verify the windows binaries.
 - ${{ if startsWith(parameters.RuntimeID, 'win') }}:
+  - template: ../tasks/MSBuild.yml
+    parameters:
+      DisplayName: "Sign OpenDebugAD7.exe"
+      solution: $(Build.SourcesDirectory)\src\OpenDebugAD7\OpenDebugAD7.csproj
+      configuration: ${{ parameters.Configuration }}
+      msbuildArguments: '/t:SignPublishedFiles /p:PublishPath=$(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin'
+      env: { 
+        "SIGN_TYPE": "$(SignType)" 
+      } 
+
   - script: |
-      copy ${{ parameters.SignedBinariesFolder }}\Release\vscode\OpenDebugAD7.exe $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\.
       copy ${{ parameters.SignedBinariesFolder }}\Release\vscode\WindowsDebugLauncher.exe $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\.
-    displayName: "Copy OpenDebugAD7.exe and WindowsDebugLauncher.exe"
+    displayName: "Copy WindowsDebugLauncher.exe"
 
   - template: ../tasks/SignVerify.yml
     parameters:
@@ -26,6 +35,10 @@ steps:
 
 # macOS Steps since we need to harden and sign the binary.
 - ${{ if startsWith(parameters.RuntimeID, 'osx-') }}:
+  - script:
+      copy ${{ parameters.SignedBinariesFolder }}\Release\osxlaunchhelper.scpt $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\.
+    displayName: "Copy osxlaunchhelper.scpt"
+
   - template: ../tasks/PublishPipelineArtifact.yml
     parameters:
       displayName: 'Publish Unsigned ${{ parameters.RuntimeID }}'

eng/pipelines/templates/Build.template.yml

@@ -17,5 +17,11 @@ steps:
   parameters:
     Configuration: ${{ parameters.Configuration }}
 
+# Used for localization
+- template: ../steps/CollectAndPublishBinaries.yml
+  parameters:
+    TargetFolder: '$(Build.StagingDirectory)\drop'
+    ArtifactName: '${{ parameters.Configuration }}'
+
 - template: ../tasks/MicroBuildCleanup.yml
 ...

eng/pipelines/templates/VSCode-release.template.yml

@@ -1,6 +1,6 @@
 ---
 parameters:
-  rids: ["win7-x86", "win-x64", "win10-arm64", "osx-x64", "linux-x64", "linux-arm", "linux-arm64", "linux-musl-x64" ]
+  rids: ["win-x86", "win10-arm64", "osx-x64", "linux-x64", "linux-arm", "linux-arm64", "linux-musl-x64" ]
 
 steps:
 - checkout: self