Skip to content

Commit

Permalink
Merge pull request #1138 from microsoft/main
Browse files Browse the repository at this point in the history
Merge 'main' into 'release_mdd'
  • Loading branch information
WardenGnaw authored May 5, 2021
2 parents 5ab637a + 70bf82b commit 1250971
Show file tree
Hide file tree
Showing 7 changed files with 154 additions and 5 deletions.
2 changes: 1 addition & 1 deletion eng/pipelines/VS-release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: $(Date:yyyMMdd).$(Rev:r)
jobs:
- template: ./jobs/VSEng-MicroBuildVS2019.yml
- template: ./jobs/VSEng-MicroBuildVS2019.job.yml
parameters:
JobName: VS_Release
BuildTemplate: 'VS-release'
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/VSCode-release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: $(Date:yyyMMdd).$(Rev:r)
jobs:
- template: ./jobs/VSEng-MicroBuildVS2019.yml
- template: ./jobs/VSEng-MicroBuildVS2019.job.yml
parameters:
JobName: VSCode_Release
BuildTemplate: 'VSCode-release'
Expand Down
7 changes: 7 additions & 0 deletions eng/pipelines/steps/CopyAndPublishSymbols.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ steps:
TargetFolder: '$(Build.ArtifactStagingDirectory)/symbols'
CleanTargetFolder: true

- template: ../tasks/PublishSymbols.yml
parameters:
IndexSources: false
SymbolsFolder: '$(Build.ArtifactStagingDirectory)/symbols'
SearchPattern: '**\*.pdb'
SymbolServerType: TeamServices

- template: ../tasks/PublishPipelineArtifact.yml
parameters:
displayName: 'Publish Symbols'
Expand Down
126 changes: 126 additions & 0 deletions eng/pipelines/tasks/PublishSymbols.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
# PublishSymbols
#
# Index your source code and publish symbols to a file share or Azure Artifacts symbol server
#
# Version: 2.172.0
#
# Reference: https://docs.microsoft.com/azure/devops/pipelines/tasks/build/index-sources-publish-symbols
# Task.json: https://raw.githubusercontent.com/microsoft/azure-pipelines-tasks/master/Tasks/PublishSymbolsV2/task.json
---
parameters:
# region Step Configurations

displayName: 'Publish symbols path'
enabled: true
continueOnError: false
condition: succeeded()
timeoutInMinutes: 0

# endregion

# region Advanced

# Verbose logging
#
# Use verbose logging.
DetailedLog : true # Optional

# Warn if not indexed
#
# Indicates whether to warn if sources are not indexed for a PDB file. Otherwise the messages are logged
# as normal output.
TreatNotIndexedAsWarning : false # Optional

# Max wait time (min)
#
# The number of minutes to wait before failing this task.
SymbolsMaximumWaitTime : "" # Optional

# Product
#
# Specify the product parameter to symstore.exe. The default is $(Build.DefinitionName)
SymbolsProduct : "" # Optional

# Version
#
# Specify the version parameter to symstore.exe. The default is $(Build.BuildNumber)
SymbolsVersion : "" # Optional

# Artifact name
#
# Specify the artifact name to use for the Symbols artifact. The default is Symbols_$(BuildConfiguration)
SymbolsArtifactName : "Symbols_$(BuildConfiguration)" # Optional

# endregion

# region Ungrouped Configurations

# Path to symbols folder
#
# The path to the folder that is searched for symbol files. The default is $(Build.SourcesDirectory).
# Otherwise specify a rooted path, for example: $(Build.BinariesDirectory)/MyProject
SymbolsFolder : "$(Build.SourcesDirectory)" # Optional

# Search pattern
#
# The pattern used to discover the pdb files to publish.
SearchPattern : | # Required
**/bin/**/*.pdb
# Index sources
#
# Indicates whether to inject source server information into the PDB files.
IndexSources : true # Optional

# Publish symbols
#
# Indicates whether to publish the symbol files.
PublishSymbols : true # Optional

# Symbol server type
#
# Choose where to publish symbols. Symbols published to the Azure Artifacts symbol server are accessible
# by any user with access to the organization/collection. Azure DevOps Server only supports the "File share"
# option. Follow [these instructions](https://go.microsoft.com/fwlink/?linkid=846265) to use Symbol Server
# in Azure Artifacts.
# Options:
#
# TeamServices
# FileShare
SymbolServerType : " " # Used when PublishSymbols = true

# Path to publish symbols
#
# The file share that hosts your symbols. This value will be used in the call to `symstore.exe add` as
# the `/s` parameter.
SymbolsPath : "" # Used when PublishSymbols = true && SymbolServerType = FileShare

# Compress symbols
#
# Compress symbols when publishing to file share.
CompressSymbols : false # Used when SymbolServerType = FileShare

# endregion

steps:
- task: PublishSymbols@2
displayName: ${{ parameters.DisplayName }}
inputs:
SymbolsFolder : ${{ parameters.SymbolsFolder }}
SearchPattern : ${{ parameters.SearchPattern }}
IndexSources : ${{ parameters.IndexSources }}
PublishSymbols : ${{ parameters.PublishSymbols }}
SymbolServerType : ${{ parameters.SymbolServerType }}
SymbolsPath : ${{ parameters.SymbolsPath }}
CompressSymbols : ${{ parameters.CompressSymbols }}
DetailedLog : ${{ parameters.DetailedLog }}
TreatNotIndexedAsWarning : ${{ parameters.TreatNotIndexedAsWarning }}
SymbolsMaximumWaitTime : ${{ parameters.SymbolsMaximumWaitTime }}
SymbolsProduct : ${{ parameters.SymbolsProduct }}
SymbolsVersion : ${{ parameters.SymbolsVersion }}
SymbolsArtifactName : ${{ parameters.SymbolsArtifactName }}
enabled: ${{ parameters.enabled }}
condition: ${{ parameters.condition }}
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
continueOnError: ${{ parameters.continueOnError }}
...
10 changes: 9 additions & 1 deletion src/DebugEngineHost.VSCode/DebugEngineHost.VSCode.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,15 @@

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

Expand Down
12 changes: 10 additions & 2 deletions src/OpenDebugAD7/OpenDebugAD7.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,16 @@
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.15.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_15_0_Version)" />
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.16.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_16_0_Version)" />
<PackageReference Include="Microsoft.VisualStudio.Shared.VSCodeDebugProtocol" Version="$(Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version)" />
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_VSCode_Version)" />
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true"/>
<!-- This will pull in the net45 newtonsoft.json, we want the portable-net45+wp80+win8+wpa81 version. Use this to get the install path. -->
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_VSCode_Version)" GeneratePathProperty="true">
<IncludeAssets>none</IncludeAssets>
<ExcludeAssets>all</ExcludeAssets>
<PrivateAssets>none</PrivateAssets>
</PackageReference>
<Reference Include="Newtonsoft.Json">
<HintPath>$(PkgNewtonsoft_Json)\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
</Reference>
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
</ItemGroup>

<ItemGroup Label="Project References">
Expand Down

0 comments on commit 1250971

Please sign in to comment.