From 63e01cd969c15d20deb70e6e0296088bbdfb4ba3 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 2 Jul 2019 21:27:37 +0000 Subject: [PATCH 1/5] Initial test: pushing VS NuPkgs to an external feed: "CrossTest" --- eng/build.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index 92add5df4..bf21ee127 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -98,6 +98,15 @@ phases: $(_AdditionalBuildParameters) displayName: Build + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - task: NuGetCommand@2 + displayName: 'Push Visual Studio NuPkgs' + inputs: + command: push + packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' + nuGetFeedType: external + publishFeedCredentials: CrossTest + - task: PublishTestResults@1 displayName: Publish Test Results inputs: @@ -143,4 +152,4 @@ phases: PublishLocation: Container ArtifactName: AssetManifests continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'), eq(variables['_PublishBuildAssetManifest'], 'true')) \ No newline at end of file + condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'), eq(variables['_PublishBuildAssetManifest'], 'true')) From c6f6541c4d8459a5abc4777010a026d911981329 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 2 Jul 2019 22:04:56 +0000 Subject: [PATCH 2/5] Formatting... --- eng/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index bf21ee127..766fa8ee8 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -99,13 +99,13 @@ phases: displayName: Build - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: - - task: NuGetCommand@2 - displayName: 'Push Visual Studio NuPkgs' + - task: NuGetCommand@2 + displayName: 'Push Visual Studio NuPkgs' inputs: - command: push - packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' - nuGetFeedType: external - publishFeedCredentials: CrossTest + command: push + packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' + nuGetFeedType: external + publishFeedCredentials: CrossTest - task: PublishTestResults@1 displayName: Publish Test Results From dde78f901ff14bd23f7cf08531cd0ea1a725115b Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 2 Jul 2019 22:15:10 +0000 Subject: [PATCH 3/5] Correcting logic... --- eng/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index 766fa8ee8..fd22d08e4 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -98,7 +98,7 @@ phases: $(_AdditionalBuildParameters) displayName: Build - - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - task: NuGetCommand@2 displayName: 'Push Visual Studio NuPkgs' inputs: From 6d2034efa9f3297b015ae055782a6a3506b141a6 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 2 Jul 2019 23:34:59 +0000 Subject: [PATCH 4/5] Repositioning the NuGet push --- eng/build.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index fd22d08e4..11d6e3cbd 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -98,18 +98,9 @@ phases: $(_AdditionalBuildParameters) displayName: Build - - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - - task: NuGetCommand@2 - displayName: 'Push Visual Studio NuPkgs' - inputs: - command: push - packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' - nuGetFeedType: external - publishFeedCredentials: CrossTest - - task: PublishTestResults@1 displayName: Publish Test Results - inputs: + inputs: testRunner: XUnit testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml' testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' @@ -119,7 +110,7 @@ phases: - task: CopyFiles@2 displayName: Gather Logs - inputs: + inputs: SourceFolder: '$(Build.SourcesDirectory)/artifacts' Contents: | log/$(_BuildConfig)/**/* @@ -130,7 +121,7 @@ phases: - task: PublishBuildArtifacts@1 displayName: Publish Logs to VSTS - inputs: + inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' publishLocation: Container @@ -138,6 +129,14 @@ phases: condition: not(succeeded()) - ${{ if and(eq(parameters.enablePublishBuildAssets, true), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - task: NuGetCommand@2 + displayName: 'Push Visual Studio NuPkgs' + inputs: + command: push + packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' + nuGetFeedType: external + publishFeedCredentials: CrossTest - task: CopyFiles@2 displayName: Gather Asset Manifests inputs: From 389f97841add1f0925fb6f9ed49394c53ca8e12b Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 9 Jul 2019 00:37:27 +0000 Subject: [PATCH 5/5] =?UTF-8?q?Use=20the=20permanent=20communication=20ser?= =?UTF-8?q?vice=20for=20the=20VS=20feed=20in=20=E2=80=98dnceng=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eng/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index 11d6e3cbd..63169ce5b 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -136,7 +136,7 @@ phases: command: push packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg' nuGetFeedType: external - publishFeedCredentials: CrossTest + publishFeedCredentials: 'DevDiv - VS package feed' - task: CopyFiles@2 displayName: Gather Asset Manifests inputs: