Skip to content

Commit 1250971

Browse files
authored
Merge pull request #1138 from microsoft/main
Merge 'main' into 'release_mdd'
2 parents 5ab637a + 70bf82b commit 1250971

File tree

7 files changed

+154
-5
lines changed

7 files changed

+154
-5
lines changed

eng/pipelines/VS-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: $(Date:yyyMMdd).$(Rev:r)
33
jobs:
4-
- template: ./jobs/VSEng-MicroBuildVS2019.yml
4+
- template: ./jobs/VSEng-MicroBuildVS2019.job.yml
55
parameters:
66
JobName: VS_Release
77
BuildTemplate: 'VS-release'

eng/pipelines/VSCode-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: $(Date:yyyMMdd).$(Rev:r)
33
jobs:
4-
- template: ./jobs/VSEng-MicroBuildVS2019.yml
4+
- template: ./jobs/VSEng-MicroBuildVS2019.job.yml
55
parameters:
66
JobName: VSCode_Release
77
BuildTemplate: 'VSCode-release'
File renamed without changes.

eng/pipelines/steps/CopyAndPublishSymbols.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ steps:
99
TargetFolder: '$(Build.ArtifactStagingDirectory)/symbols'
1010
CleanTargetFolder: true
1111

12+
- template: ../tasks/PublishSymbols.yml
13+
parameters:
14+
IndexSources: false
15+
SymbolsFolder: '$(Build.ArtifactStagingDirectory)/symbols'
16+
SearchPattern: '**\*.pdb'
17+
SymbolServerType: TeamServices
18+
1219
- template: ../tasks/PublishPipelineArtifact.yml
1320
parameters:
1421
displayName: 'Publish Symbols'
Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
# PublishSymbols
2+
#
3+
# Index your source code and publish symbols to a file share or Azure Artifacts symbol server
4+
#
5+
# Version: 2.172.0
6+
#
7+
# Reference: https://docs.microsoft.com/azure/devops/pipelines/tasks/build/index-sources-publish-symbols
8+
# Task.json: https://raw.githubusercontent.com/microsoft/azure-pipelines-tasks/master/Tasks/PublishSymbolsV2/task.json
9+
---
10+
parameters:
11+
# region Step Configurations
12+
13+
displayName: 'Publish symbols path'
14+
enabled: true
15+
continueOnError: false
16+
condition: succeeded()
17+
timeoutInMinutes: 0
18+
19+
# endregion
20+
21+
# region Advanced
22+
23+
# Verbose logging
24+
#
25+
# Use verbose logging.
26+
DetailedLog : true # Optional
27+
28+
# Warn if not indexed
29+
#
30+
# Indicates whether to warn if sources are not indexed for a PDB file. Otherwise the messages are logged
31+
# as normal output.
32+
TreatNotIndexedAsWarning : false # Optional
33+
34+
# Max wait time (min)
35+
#
36+
# The number of minutes to wait before failing this task.
37+
SymbolsMaximumWaitTime : "" # Optional
38+
39+
# Product
40+
#
41+
# Specify the product parameter to symstore.exe. The default is $(Build.DefinitionName)
42+
SymbolsProduct : "" # Optional
43+
44+
# Version
45+
#
46+
# Specify the version parameter to symstore.exe. The default is $(Build.BuildNumber)
47+
SymbolsVersion : "" # Optional
48+
49+
# Artifact name
50+
#
51+
# Specify the artifact name to use for the Symbols artifact. The default is Symbols_$(BuildConfiguration)
52+
SymbolsArtifactName : "Symbols_$(BuildConfiguration)" # Optional
53+
54+
# endregion
55+
56+
# region Ungrouped Configurations
57+
58+
# Path to symbols folder
59+
#
60+
# The path to the folder that is searched for symbol files. The default is $(Build.SourcesDirectory).
61+
# Otherwise specify a rooted path, for example: $(Build.BinariesDirectory)/MyProject
62+
SymbolsFolder : "$(Build.SourcesDirectory)" # Optional
63+
64+
# Search pattern
65+
#
66+
# The pattern used to discover the pdb files to publish.
67+
SearchPattern : | # Required
68+
**/bin/**/*.pdb
69+
70+
# Index sources
71+
#
72+
# Indicates whether to inject source server information into the PDB files.
73+
IndexSources : true # Optional
74+
75+
# Publish symbols
76+
#
77+
# Indicates whether to publish the symbol files.
78+
PublishSymbols : true # Optional
79+
80+
# Symbol server type
81+
#
82+
# Choose where to publish symbols. Symbols published to the Azure Artifacts symbol server are accessible
83+
# by any user with access to the organization/collection. Azure DevOps Server only supports the "File share"
84+
# option. Follow [these instructions](https://go.microsoft.com/fwlink/?linkid=846265) to use Symbol Server
85+
# in Azure Artifacts.
86+
# Options:
87+
#
88+
# TeamServices
89+
# FileShare
90+
SymbolServerType : " " # Used when PublishSymbols = true
91+
92+
# Path to publish symbols
93+
#
94+
# The file share that hosts your symbols. This value will be used in the call to `symstore.exe add` as
95+
# the `/s` parameter.
96+
SymbolsPath : "" # Used when PublishSymbols = true && SymbolServerType = FileShare
97+
98+
# Compress symbols
99+
#
100+
# Compress symbols when publishing to file share.
101+
CompressSymbols : false # Used when SymbolServerType = FileShare
102+
103+
# endregion
104+
105+
steps:
106+
- task: PublishSymbols@2
107+
displayName: ${{ parameters.DisplayName }}
108+
inputs:
109+
SymbolsFolder : ${{ parameters.SymbolsFolder }}
110+
SearchPattern : ${{ parameters.SearchPattern }}
111+
IndexSources : ${{ parameters.IndexSources }}
112+
PublishSymbols : ${{ parameters.PublishSymbols }}
113+
SymbolServerType : ${{ parameters.SymbolServerType }}
114+
SymbolsPath : ${{ parameters.SymbolsPath }}
115+
CompressSymbols : ${{ parameters.CompressSymbols }}
116+
DetailedLog : ${{ parameters.DetailedLog }}
117+
TreatNotIndexedAsWarning : ${{ parameters.TreatNotIndexedAsWarning }}
118+
SymbolsMaximumWaitTime : ${{ parameters.SymbolsMaximumWaitTime }}
119+
SymbolsProduct : ${{ parameters.SymbolsProduct }}
120+
SymbolsVersion : ${{ parameters.SymbolsVersion }}
121+
SymbolsArtifactName : ${{ parameters.SymbolsArtifactName }}
122+
enabled: ${{ parameters.enabled }}
123+
condition: ${{ parameters.condition }}
124+
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
125+
continueOnError: ${{ parameters.continueOnError }}
126+
...

src/DebugEngineHost.VSCode/DebugEngineHost.VSCode.csproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,15 @@
8888

8989
<ItemGroup Label="NuGet Packages">
9090
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.Portable" Version="$(Microsoft_VisualStudio_Debugger_Interop_Portable_Version)" />
91-
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_VSCode_Version)" />
91+
<!-- This will pull in the net45 newtonsoft.json, we want the portable-net45+wp80+win8+wpa81 version. Use this to get the install path. -->
92+
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_VSCode_Version)" GeneratePathProperty="true">
93+
<IncludeAssets>none</IncludeAssets>
94+
<ExcludeAssets>all</ExcludeAssets>
95+
<PrivateAssets>none</PrivateAssets>
96+
</PackageReference>
97+
<Reference Include="Newtonsoft.Json">
98+
<HintPath>$(PkgNewtonsoft_Json)\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
99+
</Reference>
92100
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true"/>
93101
</ItemGroup>
94102

src/OpenDebugAD7/OpenDebugAD7.csproj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,16 @@
9494
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.15.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_15_0_Version)" />
9595
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.16.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_16_0_Version)" />
9696
<PackageReference Include="Microsoft.VisualStudio.Shared.VSCodeDebugProtocol" Version="$(Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version)" />
97-
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_VSCode_Version)" />
98-
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true"/>
97+
<!-- This will pull in the net45 newtonsoft.json, we want the portable-net45+wp80+win8+wpa81 version. Use this to get the install path. -->
98+
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_VSCode_Version)" GeneratePathProperty="true">
99+
<IncludeAssets>none</IncludeAssets>
100+
<ExcludeAssets>all</ExcludeAssets>
101+
<PrivateAssets>none</PrivateAssets>
102+
</PackageReference>
103+
<Reference Include="Newtonsoft.Json">
104+
<HintPath>$(PkgNewtonsoft_Json)\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
105+
</Reference>
106+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
99107
</ItemGroup>
100108

101109
<ItemGroup Label="Project References">

0 commit comments

Comments
 (0)