Skip to content
代码片段 群组 项目
未验证 提交 8d1fd8de 编辑于 作者: Joey Robichaud's avatar Joey Robichaud 提交者: GitHub
浏览文件

Merge pull request #61147 from dotnet/merges/release/dev17.1-to-release/dev17.2

Merge release/dev17.1 to release/dev17.2
No related branches found
No related tags found
无相关合并请求
......@@ -54,7 +54,7 @@ variables:
- name: _DevDivDropAccessToken
value: $(dn-bot-devdiv-drop-rw-code-rw)
- group: DotNet-Roslyn-Insertion-Variables
- name: BuildConfiguration
value: release
- name: Roslyn.GitHubEmail
......@@ -324,11 +324,12 @@ stages:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- download: current
artifact: VSSetup
- powershell: |
$branchName = "$(Build.SourceBranch)".Substring("refs/heads/".Length)
Write-Host "##vso[task.setvariable variable=ComponentBranchName]$branchName"
displayName: Get Branch Name
- template: eng/pipelines/insert.yml
parameters:
buildUserName: "dn-bot@microsoft.com"
......@@ -339,6 +340,7 @@ stages:
sourceBranch: "$(ComponentBranchName)"
publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
publishDataAccessToken: "$(System.AccessToken)"
dropPath: '$(Pipeline.Workspace)\VSSetup'
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: eng\common\templates\post-build\post-build.yml
......
......@@ -205,7 +205,7 @@
is expected by the NET SDK used in the Workspace.MSBuild UnitTests. In order to test against the same verion of NuGet
as our configured SDK, we must set the version to be the same.
-->
<NuGetCommonVersion>6.1.0</NuGetCommonVersion>
<NuGetCommonVersion>6.2.0-preview.2.80</NuGetCommonVersion>
<NuGetConfigurationVersion>$(NuGetCommonVersion)</NuGetConfigurationVersion>
<NuGetFrameworksVersion>$(NuGetCommonVersion)</NuGetFrameworksVersion>
<NuGetPackagingVersion>$(NuGetCommonVersion)</NuGetPackagingVersion>
......
......@@ -40,6 +40,10 @@ parameters:
- name: sourceBranch
type: string
- name: dropPath
type: string
default: ''
steps:
- checkout: none
......@@ -68,6 +72,7 @@ steps:
Write-Host "##vso[task.setvariable variable=Template.InsertToolset]$($true)"
Write-Host "##vso[task.setvariable variable=Template.ComponentAzdoUri]$('')"
Write-Host "##vso[task.setvariable variable=Template.ComponentProjectName]$('')"
Write-Host "##vso[task.setvariable variable=Template.DropPath]$('(default)')"
Write-Host "##vso[task.setvariable variable=Template.ComponentBranchName]$branchName"
Write-Host "##vso[task.setvariable variable=Template.VSBranchName]$($branchData.vsBranch)"
......@@ -98,6 +103,15 @@ steps:
PublishDataAccessToken: ${{ parameters.publishDataAccessToken }}
- powershell: |
# Set AzDO authorization template variables
Write-Host "Setting BuildUserName to $Env:BuildUserName"
Write-Host "##vso[task.setvariable variable=Template.BuildUserName]$Env:BuildUserName"
Write-Host "##vso[task.setvariable variable=Template.BuildPassword]$Env:BuildPassword"
Write-Host "Setting ComponentUserName to $Env:ComponentUserName"
Write-Host "##vso[task.setvariable variable=Template.ComponentUserName]$Env:ComponentUserName"
Write-Host "##vso[task.setvariable variable=Template.ComponentPassword]$Env:ComponentPassword"
# Overwrite template variables with values passed into this template as parameters
if ("" -ne $Env:CreateDraftPR)
{
......@@ -137,14 +151,25 @@ steps:
Write-Host "##vso[task.setvariable variable=Template.ComponentProjectName]$Env:ComponentBuildProjectName"
}
if ("" -ne $Env:DropPath)
{
Write-Host "Setting DropPath to $Env:DropPath"
Write-Host "##vso[task.setvariable variable=Template.DropPath]$Env:DropPath"
}
displayName: Set Variables from Input Parameters
env:
BuildUserName: ${{ parameters.buildUserName }}
BuildPassword: ${{ parameters.buildPassword }}
ComponentUserName: ${{ parameters.componentUserName }}
ComponentPassword: ${{ parameters.componentPassword }}
CreateDraftPR: ${{ parameters.createDraftPR }}
AutoComplete: ${{ parameters.autoComplete }}
TitlePrefix: ${{ parameters.titlePrefix }}
InsertToolset: ${{ parameters.insertToolset }}
VSBranchName: ${{ parameters.vsBranchName }}
ComponentBuildProjectName: ${{ parameters.componentBuildProjectName }}
DropPath: ${{ parameters.dropPath }}
# Now that everything is set, actually perform the insertion.
- powershell: |
......@@ -153,10 +178,10 @@ steps:
-autoComplete "$(Template.AutoComplete)" `
-buildQueueName "$(Build.DefinitionName)" `
-cherryPick "(default)" `
-userName "${{ parameters.buildUserName }}" `
-password "${{ parameters.buildPassword }}" `
-componentUserName "${{ parameters.componentUserName }}" `
-componentPassword "${{ parameters.componentPassword }}" `
-userName "$(Template.BuildUserName)" `
-password "$(Template.BuildPassword)" `
-componentUserName "$(Template.ComponentUserName)" `
-componentPassword "$(Template.ComponentPassword)" `
-componentAzdoUri "$(Template.ComponentAzdoUri)" `
-componentProjectName "$(Template.ComponentProjectName)" `
-componentName "Roslyn" `
......@@ -164,7 +189,7 @@ steps:
-componentBranchName "$(Template.ComponentBranchName)" `
-createDraftPR "$(Template.CreateDraftPR)" `
-defaultValueSentinel "(default)" `
-dropPath "(default)" `
-dropPath "$(Template.DropPath)" `
-insertCore "(default)" `
-insertDevDiv "(default)" `
-insertionCount "1" `
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册