Merge pull request #422 from microsoftgraph/ci/fix-symbol-embedding

ci: fix symbol embedding

Author: baywet

.azure-pipelines/ci-build.yml

@@ -7,6 +7,7 @@ trigger:
     branches:
         include:
             - main
+            - refs/tags/v*
 pr: none
 
 pool:
@@ -103,13 +104,13 @@ stages:
 
                 - task: UseDotNet@2
                   displayName: "Add .NET 2"
-                  condition: and(contains(variables['build.sourceBranch'], 'refs/heads/main'), succeeded())
+                  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
                   inputs:
                       version: 2.x
 
                 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
                   displayName: "ESRP DLL Strong Name"
-                  condition: and(contains(variables['build.sourceBranch'], 'refs/heads/main'), succeeded())
+                  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
                   inputs:
                       ConnectedServiceName: "microsoftgraph ESRP CodeSign DLL and NuGet (AKV)"
                       FolderPath: $(ProductBinPath)
@@ -136,7 +137,7 @@ stages:
 
                 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
                   displayName: "ESRP DLL CodeSigning"
-                  condition: and(contains(variables['build.sourceBranch'], 'refs/heads/main'), succeeded())
+                  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
                   inputs:
                       ConnectedServiceName: "microsoftgraph ESRP CodeSign DLL and NuGet (AKV)"
                       FolderPath: src
@@ -183,14 +184,14 @@ stages:
 
                 # arguments are not parsed in DotNetCoreCLI@2 task for `pack` command, that's why we have a custom pack command here
                 - pwsh: dotnet pack "$(ProjectFile)" /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg --no-build --output $env:BUILD_ARTIFACTSTAGINGDIRECTORY/Nugets --configuration $env:BUILD_CONFIGURATION
-                  condition: and(contains(variables['build.sourceBranch'], 'refs/heads/main'), succeeded())
+                  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
                   env:
                       BUILD_CONFIGURATION: $(BuildConfiguration)
                   displayName: Dotnet pack
 
                 - task: PowerShell@2
                   displayName: "Validate project version has been incremented"
-                  condition: and(contains(variables['build.sourceBranch'], 'refs/heads/main'), succeeded())
+                  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
                   inputs:
                       targetType: "filePath"
                       filePath: $(System.DefaultWorkingDirectory)\scripts\ValidateProjectVersionUpdated.ps1
@@ -199,7 +200,7 @@ stages:
 
                 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
                   displayName: "ESRP CodeSigning Nuget Packages"
-                  condition: and(contains(variables['build.sourceBranch'], 'refs/heads/main'), succeeded())
+                  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
                   inputs:
                       ConnectedServiceName: "microsoftgraph ESRP CodeSign DLL and NuGet (AKV)"
                       FolderPath: "$(Build.ArtifactStagingDirectory)/Nugets"
@@ -226,21 +227,21 @@ stages:
 
                 - task: CopyFiles@2
                   displayName: "Copy release scripts to artifact staging directory"
-                  condition: and(contains(variables['build.sourceBranch'], 'refs/heads/main'), succeeded())
+                  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
                   inputs:
                       SourceFolder: "$(Build.SourcesDirectory)"
                       Contents: 'scripts\**'
                       TargetFolder: "$(Build.ArtifactStagingDirectory)/Nugets"
 
                 - task: PublishPipelineArtifact@1
                   displayName: "Upload Artifact: Nugets"
-                  condition: and(contains(variables['build.sourceBranch'], 'refs/heads/main'), succeeded())
+                  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
                   inputs:
                       artifactName: Nugets
                       targetPath: $(Build.ArtifactStagingDirectory)/Nugets
 
     - stage: deploy
-      condition: and(contains(variables['build.sourceBranch'], 'refs/heads/main'), succeeded())
+      condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
       dependsOn: build
       jobs:
           - deployment: deploy_cli_core

.github/release-please.yml

@@ -1,3 +1,3 @@
 manifest: true
-primaryBranch: dev
+primaryBranch: main
 handleGHRelease: true

src/Microsoft.Graph.Cli.Core/Microsoft.Graph.Cli.Core.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
-    <DebugType>embedded</DebugType>
+    <DebugType>portable</DebugType>
     <Version>1.2.1</Version>
     <IsTrimmable>true</IsTrimmable>