From d6ac94d00430b03af4cea3f6f9a9bc56597dc11f Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Thu, 27 May 2021 12:43:17 -0700 Subject: [PATCH 1/4] use cibuild to upload symbols --- build/vsts-ci.yml | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 3ad6750a80..6bd8b43dd7 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -263,22 +263,31 @@ phases: nuGetFeedType: external publishFeedCredentials: machinelearning-dnceng-public-feed - - task: MSBuild@1 - displayName: Publish Symbols to SymWeb Symbol Server - inputs: - solution: build/publish.proj - msbuildArguments: /t:PublishSymbolPackages /p:SymbolServerPath=$(_SymwebSymbolServerPath) /p:SymbolServerPAT=$(SymwebSymbolServerPAT) /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages - msbuildVersion: 15.0 - continueOnError: true - - - task: MSBuild@1 - displayName: Publish Symbols to Msdl Symbol Server + # Upload symbols to symweb && MSDL + - script: eng\common\CIBuild.cmd + -configuration $(BuildConfig) + -warnAsError 0 + /bl:artifacts\log\$(BuildConfig)\uploadSymbols.binlog + /p:Build=False + /p:Test=False + /p:Pack=False + /p:Sign=False + /p:Publish=True + /p:OfficialBuildId=$(OfficialBuildId) + /p:DotNetFinalVersionKind=$(DotnetVersionKind) + /p:DotNetSymbolServerTokenMsdl=$(MsdlSymbolServerPAT) + /p:DotNetSymbolServerTokenSymWeb=$(SymwebSymbolServerPAT) + /p:PublishToSymbolServer=true + displayName: Publish to symbol server + condition: and(succeeded(), eq(variables['_SignType'], 'real'), eq(variables['BuildConfig'], 'Release')) + + - task: PublishBuildArtifacts@1 + displayName: Publish log inputs: - solution: build/publish.proj - msbuildArguments: /t:PublishSymbolPackages /p:SymbolServerPath=$(_MsdlSymbolServerPath) /p:SymbolServerPAT=$(MsdlSymbolServerPAT) /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages - msbuildVersion: 15.0 + PathtoPublish: 'artifacts\log\$(BuildConfig)' + ArtifactName: 'log' continueOnError: true - + # Terminate all dotnet build processes. - script: $(Build.SourcesDirectory)/.dotnet/dotnet.exe build-server shutdown displayName: Dotnet Server Shutdown From 31a69a7b4fabffe0b208e54f596663895f783dd2 Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Thu, 27 May 2021 17:36:08 -0700 Subject: [PATCH 2/4] add native dll& pdb --- build/vsts-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 6bd8b43dd7..3232dd0aa0 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -278,6 +278,7 @@ phases: /p:DotNetSymbolServerTokenMsdl=$(MsdlSymbolServerPAT) /p:DotNetSymbolServerTokenSymWeb=$(SymwebSymbolServerPAT) /p:PublishToSymbolServer=true + /p:ArtifactsSymStoreDirectory=$(Build.SourcesDirectory)/artifacts/pkgassets/ displayName: Publish to symbol server condition: and(succeeded(), eq(variables['_SignType'], 'real'), eq(variables['BuildConfig'], 'Release')) From 27e8d433113cadc489091a2569f73a188b9c5bf9 Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Thu, 27 May 2021 21:14:55 -0700 Subject: [PATCH 3/4] enable converting to windows pdb --- build/publish.proj | 2 +- build/vsts-ci.yml | 38 ++++++++++++++------------------------ 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/build/publish.proj b/build/publish.proj index e35ac8f123..47849ca21b 100644 --- a/build/publish.proj +++ b/build/publish.proj @@ -23,7 +23,7 @@ 180 - false + true diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 3232dd0aa0..3ad6750a80 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -263,32 +263,22 @@ phases: nuGetFeedType: external publishFeedCredentials: machinelearning-dnceng-public-feed - # Upload symbols to symweb && MSDL - - script: eng\common\CIBuild.cmd - -configuration $(BuildConfig) - -warnAsError 0 - /bl:artifacts\log\$(BuildConfig)\uploadSymbols.binlog - /p:Build=False - /p:Test=False - /p:Pack=False - /p:Sign=False - /p:Publish=True - /p:OfficialBuildId=$(OfficialBuildId) - /p:DotNetFinalVersionKind=$(DotnetVersionKind) - /p:DotNetSymbolServerTokenMsdl=$(MsdlSymbolServerPAT) - /p:DotNetSymbolServerTokenSymWeb=$(SymwebSymbolServerPAT) - /p:PublishToSymbolServer=true - /p:ArtifactsSymStoreDirectory=$(Build.SourcesDirectory)/artifacts/pkgassets/ - displayName: Publish to symbol server - condition: and(succeeded(), eq(variables['_SignType'], 'real'), eq(variables['BuildConfig'], 'Release')) - - - task: PublishBuildArtifacts@1 - displayName: Publish log + - task: MSBuild@1 + displayName: Publish Symbols to SymWeb Symbol Server inputs: - PathtoPublish: 'artifacts\log\$(BuildConfig)' - ArtifactName: 'log' + solution: build/publish.proj + msbuildArguments: /t:PublishSymbolPackages /p:SymbolServerPath=$(_SymwebSymbolServerPath) /p:SymbolServerPAT=$(SymwebSymbolServerPAT) /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages + msbuildVersion: 15.0 continueOnError: true - + + - task: MSBuild@1 + displayName: Publish Symbols to Msdl Symbol Server + inputs: + solution: build/publish.proj + msbuildArguments: /t:PublishSymbolPackages /p:SymbolServerPath=$(_MsdlSymbolServerPath) /p:SymbolServerPAT=$(MsdlSymbolServerPAT) /p:RestorePackagesPath=$(Build.SourcesDirectory)\packages /p:NUGET_PACKAGES=$(Build.SourcesDirectory)\packages + msbuildVersion: 15.0 + continueOnError: true + # Terminate all dotnet build processes. - script: $(Build.SourcesDirectory)/.dotnet/dotnet.exe build-server shutdown displayName: Dotnet Server Shutdown From d2cf215966e54dccd249669c4f29570d4928b3c8 Mon Sep 17 00:00:00 2001 From: XiaoYun Zhang Date: Fri, 28 May 2021 10:59:54 -0700 Subject: [PATCH 4/4] include pdbs in symstore --- build/publish.proj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/publish.proj b/build/publish.proj index 47849ca21b..453079ac13 100644 --- a/build/publish.proj +++ b/build/publish.proj @@ -22,16 +22,19 @@ - 180 - true + 3650 + false + - + + + \ No newline at end of file