Skip to content

Commit 8950830

Browse files
WardenGnawWardenGnaw
authored
Merge pull request #1289 from microsoft/main
Merge 'main' into 'release_mdd' for Visual Studio 17.2
2 parents 274e8ff + 7714553 commit 8950830

32 files changed

+319
-116
lines changed

‎.github/workflows/Build-And-Test.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install .NET Core
3030
uses: actions/setup-dotnet@v1
3131
with:
32-
dotnet-version: 5.0.x
32+
dotnet-version: 6.0.x
3333

3434
- name: Setup MSBuild.exe
3535
uses: microsoft/setup-msbuild@v1.0.2
@@ -61,7 +61,7 @@ jobs:
6161
- name: Install .NET Core
6262
uses: actions/setup-dotnet@v1
6363
with:
64-
dotnet-version: 5.0.x
64+
dotnet-version: 6.0.x
6565

6666
- name: Setup MSBuild.exe
6767
uses: microsoft/setup-msbuild@v1.0.2
@@ -166,12 +166,13 @@ jobs:
166166
- name: Install .NET Core
167167
uses: actions/setup-dotnet@v1
168168
with:
169-
dotnet-version: 5.0.x
169+
dotnet-version: 6.0.x
170170

171171
- name: Build
172172
run: dotnet build ${{ github.workspace }}/src/MIDebugEngine-Unix.sln
173173

174174
- run: |
175+
sudo apt update
175176
sudo apt-get install gdb g++ -y
176177
which g++
177178
which gdb
@@ -206,7 +207,7 @@ jobs:
206207
- name: Install .NET Core
207208
uses: actions/setup-dotnet@v1
208209
with:
209-
dotnet-version: 5.0.x
210+
dotnet-version: 6.0.x
210211

211212
- name: Build
212213
run: dotnet build ${{ github.workspace }}/src/MIDebugEngine-Unix.sln

‎eng/pipelines/tasks/UseDotNet.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
steps:
2+
- task: UseDotNet@2
3+
displayName: 'Use .NET Core sdk'
4+
inputs:
5+
packageType: sdk
6+
version: 6.x

‎eng/pipelines/templates/Build.template.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ parameters:
55
steps:
66
- checkout: self
77

8+
- template: ../tasks/UseDotNet.yml
9+
810
- template: ../tasks/NuGetToolInstaller.yml
911

1012
- template: ../tasks/MicroBuildSigningPlugin.yml

‎eng/pipelines/templates/VS-release.template.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
steps:
33
- checkout: self
44

5-
- task: UseDotNet@2
6-
displayName: 'Use .NET Core sdk'
7-
inputs:
8-
packageType: sdk
9-
version: 5.x
5+
- template: ../tasks/UseDotNet.yml
106

117
- template: ../tasks/NuGetToolInstaller.yml
128

‎eng/pipelines/templates/VSCode-codesign-osx.template.yml‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
---
2+
parameters:
3+
rids: ["osx-x64", "osx-arm64"]
4+
25
steps:
36
- checkout: self
47

5-
- template: ../tasks/DownloadPipelineArtifact.yml
6-
parameters:
7-
displayName: 'Downloading unsigned_osx-x64_binaries'
8-
path: '$(Pipeline.Workspace)/Artifacts'
9-
artifact: 'unsigned_osx-x64_binaries'
8+
- ${{ each rid in parameters.rids }}:
9+
- template: ../tasks/DownloadPipelineArtifact.yml
10+
parameters:
11+
displayName: 'Downloading unsigned_${{ rid }}_binaries'
12+
path: '$(Pipeline.Workspace)/Artifacts/${{ rid }}'
13+
artifact: 'unsigned_${{ rid }}_binaries'
1014

11-
- script: |
12-
echo "#[command] codesign -s - -f --entitlements $(Build.SourcesDirectory)/eng/Signing/macOS/debugger-entitlements.plist $(Pipeline.Workspace)/Artifacts/debugAdapters/bin/OpenDebugAD7"
13-
codesign -s - -f --entitlements $(Build.SourcesDirectory)/eng/Signing/macOS/debugger-entitlements.plist $(Pipeline.Workspace)/Artifacts/debugAdapters/bin/OpenDebugAD7
15+
- script: |
16+
echo "#[command] codesign -s - -f --entitlements $(Build.SourcesDirectory)/eng/Signing/macOS/debugger-entitlements.plist $(Pipeline.Workspace)/Artifacts/${{ rid }}/debugAdapters/bin/OpenDebugAD7"
17+
codesign -s - -f --entitlements $(Build.SourcesDirectory)/eng/Signing/macOS/debugger-entitlements.plist $(Pipeline.Workspace)/Artifacts/${{ rid }}/debugAdapters/bin/OpenDebugAD7
1418
15-
echo "#[command] cd $(Pipeline.Workspace)/Artifacts/"
16-
cd $(Pipeline.Workspace)/Artifacts
19+
echo "#[command] cd $(Pipeline.Workspace)/Artifacts/${{ rid }}"
20+
cd $(Pipeline.Workspace)/Artifacts/${{ rid }}
1721
18-
echo "#[command] zip -r $(Pipeline.Workspace)/osx-x64.zip ./debugAdapters"
19-
zip -r $(Pipeline.Workspace)/osx-x64.zip ./debugAdapters
22+
echo "#[command] zip -r $(Pipeline.Workspace)/${{ rid }}.zip ./debugAdapters"
23+
zip -r $(Pipeline.Workspace)/${{ rid }}.zip ./debugAdapters
2024
21-
- template: ../tasks/PublishPipelineArtifact.yml
22-
parameters:
23-
displayName: 'Publish Binaries'
24-
path: '$(Pipeline.Workspace)/osx-x64.zip'
25-
artifactName: 'unsigned_osx-x64_zip'
25+
- template: ../tasks/PublishPipelineArtifact.yml
26+
parameters:
27+
displayName: 'Publish Binaries'
28+
path: '$(Pipeline.Workspace)/${{ rid }}.zip'
29+
artifactName: 'unsigned_${{ rid }}_zip'
2630
...

‎eng/pipelines/templates/VSCode-esrp-sign-osx.template.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
---
2+
parameters:
3+
rids: ["osx-x64", "osx-arm64"]
4+
25
steps:
36
- checkout: none
47

5-
- template: ../tasks/DownloadPipelineArtifact.yml
6-
parameters:
7-
displayName: 'Downloading unsigned_osx-64_zip'
8-
path: '$(Pipeline.Workspace)/Artifacts'
9-
artifact: 'unsigned_osx-x64_zip'
8+
- ${{ each rid in parameters.rids }}:
9+
- template: ../tasks/DownloadPipelineArtifact.yml
10+
parameters:
11+
displayName: 'Downloading unsigned_${{ rid }}_zip'
12+
path: '$(Pipeline.Workspace)/Artifacts'
13+
artifact: 'unsigned_${{ rid }}_zip'
1014

11-
- task: MicroBuildSignMacFiles@1
12-
displayName: 'ESRP Sign'
13-
inputs:
14-
SigningTarget: '$(Pipeline.Workspace)\Artifacts\osx-x64.zip'
15-
SigningCert: 8023
15+
- task: MicroBuildSignMacFiles@1
16+
displayName: 'ESRP Sign'
17+
inputs:
18+
SigningTarget: '$(Pipeline.Workspace)\Artifacts\${{ rid }}.zip'
19+
SigningCert: 8023
1620

17-
- template: ../tasks/PublishPipelineArtifact.yml
18-
parameters:
19-
displayName: 'Publish Binaries'
20-
path: '$(Pipeline.Workspace)\Artifacts\osx-x64.zip'
21-
artifactName: 'osx-x64_zip'
21+
- template: ../tasks/PublishPipelineArtifact.yml
22+
parameters:
23+
displayName: 'Publish Binaries'
24+
path: '$(Pipeline.Workspace)\Artifacts\${{ rid }}.zip'
25+
artifactName: '${{ rid }}_zip'
2226
...

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
parameters:
3-
rids: ["win-x86", "win10-arm64", "osx-x64", "linux-x64", "linux-arm", "linux-arm64", "linux-musl-x64", "linux-musl-arm64" ]
3+
rids: ["win-x86", "win10-arm64", "osx-x64", "osx-arm64", "linux-x64", "linux-arm", "linux-arm64", "linux-musl-x64", "linux-musl-arm64" ]
44

55
steps:
66
- checkout: self
@@ -10,11 +10,7 @@ steps:
1010

1111
- template: ../tasks/MicroBuildSigningPlugin.yml
1212

13-
- task: UseDotNet@2
14-
displayName: 'Use .NET Core sdk'
15-
inputs:
16-
packageType: sdk
17-
version: 5.x
13+
- template: ../tasks/UseDotNet.yml
1814

1915
- template: ../steps/BuildSolution.yml
2016
parameters:

‎loc/lcl/FRA/OpenFolderSchema.json.lcl‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,24 @@
865865
</Str>
866866
<Disp Icon="Str" />
867867
</Item>
868+
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.useExtendedRemote.description" ItemType="0" PsrId="306" Leaf="true">
869+
<Str Cat="Text">
870+
<Val><![CDATA[If true, use gdb extended-remote mode to connect to gdbserver.]]></Val>
871+
<Tgt Cat="Text" Stat="Loc" Orig="New">
872+
<Val><![CDATA[Si vrai, utilisez le mode distant étendu de gdb pour vous connecter à gdbserver.]]></Val>
873+
</Tgt>
874+
</Str>
875+
<Disp Icon="Str" />
876+
</Item>
877+
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.useExtendedRemote.type" ItemType="0" PsrId="306" Leaf="true">
878+
<Str Cat="Text">
879+
<Val><![CDATA[boolean]]></Val>
880+
<Tgt Cat="Text" Stat="Loc" Orig="New">
881+
<Val><![CDATA[booléen]]></Val>
882+
</Tgt>
883+
</Str>
884+
<Disp Icon="Str" />
885+
</Item>
868886
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.type" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
869887
<Str Cat="Text" UsrLk="true">
870888
<Val><![CDATA[object]]></Val>

‎loc/lcl/ITA/OpenFolderSchema.json.lcl‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,24 @@
865865
</Str>
866866
<Disp Icon="Str" />
867867
</Item>
868+
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.useExtendedRemote.description" ItemType="0" PsrId="306" Leaf="true">
869+
<Str Cat="Text">
870+
<Val><![CDATA[If true, use gdb extended-remote mode to connect to gdbserver.]]></Val>
871+
<Tgt Cat="Text" Stat="Loc" Orig="New">
872+
<Val><![CDATA[Se true, usare la modalità estesa-remota gdb per connettersi a gdbserver.]]></Val>
873+
</Tgt>
874+
</Str>
875+
<Disp Icon="Str" />
876+
</Item>
877+
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.useExtendedRemote.type" ItemType="0" PsrId="306" Leaf="true">
878+
<Str Cat="Text">
879+
<Val><![CDATA[boolean]]></Val>
880+
<Tgt Cat="Text" Stat="Loc" Orig="New">
881+
<Val><![CDATA[booleano]]></Val>
882+
</Tgt>
883+
</Str>
884+
<Disp Icon="Str" />
885+
</Item>
868886
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.type" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
869887
<Str Cat="Text" UsrLk="true">
870888
<Val><![CDATA[object]]></Val>

‎loc/lcl/PLK/OpenFolderSchema.json.lcl‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,24 @@
865865
</Str>
866866
<Disp Icon="Str" />
867867
</Item>
868+
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.useExtendedRemote.description" ItemType="0" PsrId="306" Leaf="true">
869+
<Str Cat="Text">
870+
<Val><![CDATA[If true, use gdb extended-remote mode to connect to gdbserver.]]></Val>
871+
<Tgt Cat="Text" Stat="Loc" Orig="New">
872+
<Val><![CDATA[Jeśli wartością jest true, użyj trybu rozszerzonego zdalnego gdb, aby nawiązać połączenie z serwerem gdbserver.]]></Val>
873+
</Tgt>
874+
</Str>
875+
<Disp Icon="Str" />
876+
</Item>
877+
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.useExtendedRemote.type" ItemType="0" PsrId="306" Leaf="true">
878+
<Str Cat="Text">
879+
<Val><![CDATA[boolean]]></Val>
880+
<Tgt Cat="Text" Stat="Loc" Orig="New">
881+
<Val><![CDATA[wartość logiczna]]></Val>
882+
</Tgt>
883+
</Str>
884+
<Disp Icon="Str" />
885+
</Item>
868886
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.type" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
869887
<Str Cat="Text" UsrLk="true">
870888
<Val><![CDATA[object]]></Val>

0 commit comments

Comments
 (0)