diff --git a/.github/dev.yml b/.github/dev.yml index 5a5a3c5..ed68f82 100644 --- a/.github/dev.yml +++ b/.github/dev.yml @@ -1,6 +1,5 @@ pr: none -trigger: none -#- master +trigger: master name: 3.5.6-dev.$(Rev:r) @@ -9,8 +8,7 @@ pool: variables: buildConfiguration: 'Release' - rn: $[replace(variables.releaseNotes, '"', '''''')] -# releaseNotes: $[replace(variables['Build.SourceVersionMessage'], '"', '''''')] + Release_Notes: $[replace(variables['Build.SourceVersionMessage'], '"', '''''')] steps: - task: UseDotNet@2 @@ -27,12 +25,12 @@ steps: includesymbols: true versioningScheme: 'byEnvVar' versionEnvVar: 'Build.BuildNumber' - buildProperties: NoWarn="0419;1573;1591";ContinuousIntegrationBuild=true;Version=$(Build.BuildNumber);"ReleaseNotes=$(rn)" + buildProperties: NoWarn="0419;1573;1591";ContinuousIntegrationBuild=true;Version=$(Build.BuildNumber);"ReleaseNotes=$(Release_Notes)" -# - task: NuGetCommand@2 -# inputs: -# command: 'push' -# packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg' -# publishPackageMetadata: true -# nuGetFeedType: 'external' -# publishFeedCredentials: 'nuget.org' +- task: NuGetCommand@2 + inputs: + command: 'push' + packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg' + publishPackageMetadata: true + nuGetFeedType: 'external' + publishFeedCredentials: 'nuget.org' diff --git a/.github/release.yml b/.github/release.yml index 4ad1c8b..7b1774a 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -8,6 +8,7 @@ pool: variables: buildConfiguration: 'Release' + Release_Notes: $[replace(variables['releaseNotes'], '"', '''''')] stages: - stage: publish @@ -25,15 +26,13 @@ stages: includePreviewVersions: true - task: DotNetCoreCLI@2 - variables: - Release_Notes: $[replace($(releaseNotes), '"', '''''')] inputs: command: 'pack' packagesToPack: '**/*.csproj' includesymbols: true versioningScheme: 'byEnvVar' versionEnvVar: 'Build.BuildNumber' - buildProperties: 'NoWarn="0419;1573;1591";ContinuousIntegrationBuild=true;Version=$(Build.BuildNumber);ReleaseNotes="$(Release_Notes)"' + buildProperties: NoWarn="0419;1573;1591";ContinuousIntegrationBuild=true;Version=$(Build.BuildNumber);"ReleaseNotes=$(Release_Notes)" - task: NuGetCommand@2 inputs: