Skip to content

Commit 2331d16

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/7.0' changes
2 parents 71273b5 + 4d54e91 commit 2331d16

30 files changed

+2050
-131
lines changed

‎azure-pipelines-pr.yml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# This is a simple wrapper for eng/pipeline.yml to get around the limitation of
2+
# user-defined variables not being available in yaml template expressions.
3+
4+
# Parameters ARE available in template expressions, and parameters can have default values,
5+
# so they can be used to control yaml flow.
6+
#
7+
8+
variables:
9+
# clean the local repo on the build agents
10+
- name: Build.Repository.Clean
11+
value: true
12+
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}:
13+
- name: PostBuildSign
14+
value: false
15+
- ${{ else }}:
16+
- name: PostBuildSign
17+
value: true
18+
19+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
20+
- group: DotNet-Wpf-SDLValidation-Params
21+
22+
23+
# This is set in the pipeline directly
24+
# When set to false, CI tests will not be enabled in builds.
25+
#
26+
# _ContinuousIntegrationTestsEnabled: false
27+
28+
# Setting batch to true, triggers one build at a time.
29+
# if there is a push while a build in progress, it will wait,
30+
# until the running build finishes, and produce a build with all the changes
31+
#
32+
# only trigger ci builds for the master and release branches
33+
trigger:
34+
batch: true
35+
branches:
36+
include:
37+
- main
38+
- release/3.*
39+
- release/5.*
40+
- release/6.*
41+
- release/7.*
42+
- internal/release/5.*
43+
- internal/release/6.*
44+
- internal/release/7.*
45+
- internal/release/8.*
46+
- experimental/*
47+
paths:
48+
exclude:
49+
- Documentation/*
50+
51+
pr:
52+
autoCancel: true
53+
branches:
54+
include:
55+
- main
56+
- release/3.*
57+
- internal/release/3.*
58+
- release/5.*
59+
- release/6.*
60+
- release/7.*
61+
- experimental/*
62+
paths:
63+
exclude:
64+
- Documentation/*
65+
66+
# Call the pipeline-pr.yml template, which does the real work
67+
stages:
68+
- stage: build
69+
displayName: Build
70+
jobs:
71+
- template: /eng/pipeline-pr.yml
72+
parameters:
73+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
74+
runAsPublic: false
75+
76+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
77+
- template: eng\common\templates\post-build\post-build.yml
78+
parameters:
79+
publishingInfraVersion: 3
80+
enableSymbolValidation: false
81+
enableSigningValidation: false
82+
enableNugetValidation: false
83+
enableSourceLinkValidation: false
84+
# This is to enable SDL runs part of Post-Build Validation Stage
85+
SDLValidationParameters:
86+
enable: false
87+
params: ' -SourceToolsList @("policheck","credscan")
88+
-TsaInstanceURL $(_TsaInstanceURL)
89+
-TsaProjectName $(_TsaProjectName)
90+
-TsaNotificationEmail $(_TsaNotificationEmail)
91+
-TsaCodebaseAdmin $(_TsaCodebaseAdmin)
92+
-TsaBugAreaPath $(_TsaBugAreaPath)
93+
-TsaIterationPath $(_TsaIterationPath)
94+
-TsaRepositoryName "wpf"
95+
-TsaCodebaseName "wpf"
96+
-TsaPublish $True'

‎azure-pipelines.yml‎

Lines changed: 53 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,27 @@
11
# This is a simple wrapper for eng/pipeline.yml to get around the limitation of
22
# user-defined variables not being available in yaml template expressions.
33

4-
# Parameters ARE available in template expressions, and parameters can have default values,
5-
# so they can be used to control yaml flow.
6-
#
7-
4+
# Parameters ARE available in template expressions, and parameters can have default values
85
variables:
9-
# clean the local repo on the build agents
10-
- name: Build.Repository.Clean
6+
# clean the local repo on the build agents
7+
- name: Build.Repository.Clean
8+
value: true
9+
- name: _DotNetArtifactsCategory
10+
value: WINDOWSDESKTOP
11+
- name: _DotNetValidationArtifactsCategory
12+
value: WINDOWSDESKTOP
13+
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
14+
- name: PostBuildSign
15+
value: false
16+
- ${{ else }}:
17+
- name: PostBuildSign
1118
value: true
12-
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}:
13-
- name: PostBuildSign
14-
value: false
15-
- ${{ else }}:
16-
- name: PostBuildSign
17-
value: true
18-
19-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
20-
- group: DotNet-Wpf-SDLValidation-Params
21-
22-
23-
# This is set in the pipeline directly
24-
# When set to false, CI tests will not be enabled in builds.
25-
#
26-
# _ContinuousIntegrationTestsEnabled: false
27-
28-
# Setting batch to true, triggers one build at a time.
29-
# if there is a push while a build in progress, it will wait,
30-
# until the running build finishes, and produce a build with all the changes
31-
#
32-
# only trigger ci builds for the master and release branches
19+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
20+
- group: DotNet-Wpf-SDLValidation-Params
3321
trigger:
34-
batch: true
22+
batch: true
3523
branches:
36-
include:
24+
include:
3725
- main
3826
- release/3.*
3927
- release/5.*
@@ -47,50 +35,39 @@ trigger:
4735
paths:
4836
exclude:
4937
- Documentation/*
50-
51-
pr:
52-
autoCancel: true
53-
branches:
54-
include:
55-
- main
56-
- release/3.*
57-
- internal/release/3.*
58-
- release/5.*
59-
- release/6.*
60-
- release/7.*
61-
- experimental/*
62-
paths:
63-
exclude:
64-
- Documentation/*
65-
66-
# Call the pipeline.yml template, which does the real work
67-
stages:
68-
- stage: build
69-
displayName: Build
70-
jobs:
71-
- template: /eng/pipeline.yml
72-
parameters:
73-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
74-
runAsPublic: false
75-
76-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
77-
- template: eng\common\templates\post-build\post-build.yml
78-
parameters:
79-
publishingInfraVersion: 3
80-
enableSymbolValidation: false
81-
enableSigningValidation: false
82-
enableNugetValidation: false
83-
enableSourceLinkValidation: false
84-
# This is to enable SDL runs part of Post-Build Validation Stage
85-
SDLValidationParameters:
86-
enable: false
87-
params: ' -SourceToolsList @("policheck","credscan")
88-
-TsaInstanceURL $(_TsaInstanceURL)
89-
-TsaProjectName $(_TsaProjectName)
90-
-TsaNotificationEmail $(_TsaNotificationEmail)
91-
-TsaCodebaseAdmin $(_TsaCodebaseAdmin)
92-
-TsaBugAreaPath $(_TsaBugAreaPath)
93-
-TsaIterationPath $(_TsaIterationPath)
94-
-TsaRepositoryName "wpf"
95-
-TsaCodebaseName "wpf"
96-
-TsaPublish $True'
38+
resources:
39+
repositories:
40+
- repository: 1ESPipelineTemplates
41+
type: git
42+
name: 1ESPipelineTemplates/1ESPipelineTemplates
43+
ref: refs/tags/release
44+
extends:
45+
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
46+
parameters:
47+
featureFlags:
48+
autoBaseline: true
49+
pool:
50+
name: NetCore1ESPool-Internal
51+
image: 1es-windows-2022-pt
52+
os: windows
53+
customBuildTags:
54+
- ES365AIMigrationTooling
55+
stages:
56+
- stage: build
57+
displayName: Build
58+
jobs:
59+
- template: /eng/pipeline.yml@self
60+
parameters:
61+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
62+
runAsPublic: false
63+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
64+
- template: /eng/common/templates-official/post-build/post-build.yml@self
65+
parameters:
66+
publishingInfraVersion: 3
67+
enableSymbolValidation: false
68+
enableSigningValidation: false
69+
enableNugetValidation: false
70+
enableSourceLinkValidation: false
71+
SDLValidationParameters:
72+
enable: false
73+
params: ' -SourceToolsList @("policheck","credscan") -TsaInstanceURL $(_TsaInstanceURL) -TsaProjectName $(_TsaProjectName) -TsaNotificationEmail $(_TsaNotificationEmail) -TsaCodebaseAdmin $(_TsaCodebaseAdmin) -TsaBugAreaPath $(_TsaBugAreaPath) -TsaIterationPath $(_TsaIterationPath) -TsaRepositoryName "wpf" -TsaCodebaseName "wpf" -TsaPublish $True'

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
5050
<Sha>8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="7.0.0-rtm.23571.1">
52+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="7.0.0-rtm.24172.1">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
54-
<Sha>562bdf3c1209b3703fde123c03fc9a2c86002f03</Sha>
54+
<Sha>bfaadb38808e02f9a69c861f16db1acd6511753a</Sha>
5555
</Dependency>
5656
<Dependency Name="System.IO.Packaging" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -75,25 +75,25 @@
7575
</Dependency>
7676
</ProductDependencies>
7777
<ToolsetDependencies>
78-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24114.4">
78+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24171.6">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
80+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24114.4">
82+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24171.6">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
84+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24114.4">
86+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24171.6">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
88+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24114.4">
90+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24171.6">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
92+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24114.4">
94+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24171.6">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
96+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
9797
</Dependency>
9898
</ToolsetDependencies>
9999
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<MajorVersion>7</MajorVersion>
55
<MinorVersion>0</MinorVersion>
6-
<PatchVersion>18</PatchVersion>
6+
<PatchVersion>19</PatchVersion>
77
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
88
<PreReleaseVersionIteration>
99
</PreReleaseVersionIteration>
@@ -49,8 +49,8 @@
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/arcade -->
5151
<PropertyGroup>
52-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.24114.4</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.24114.4</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.24171.6</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.24171.6</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
5656
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
@@ -89,6 +89,6 @@
8989
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
9090
</PropertyGroup>
9191
<PropertyGroup>
92-
<MicrosoftDotNetWpfDncEngVersion>7.0.0-rtm.23571.1</MicrosoftDotNetWpfDncEngVersion>
92+
<MicrosoftDotNetWpfDncEngVersion>7.0.0-rtm.24172.1</MicrosoftDotNetWpfDncEngVersion>
9393
</PropertyGroup>
9494
</Project>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0
3535
. $PSScriptRoot\tools.ps1
3636

3737
# Add source entry to PackageSources
38-
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
38+
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
3939
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
4040

4141
if ($packageSource -eq $null)
@@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
4848
else {
4949
Write-Host "Package source $SourceName already present."
5050
}
51-
52-
AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
51+
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
5352
}
5453

5554
# Add a credential node for the specified source
56-
function AddCredential($creds, $source, $username, $password) {
55+
function AddCredential($creds, $source, $username, $pwd) {
5756
# Looks for credential configuration for the given SourceName. Create it if none is found.
5857
$sourceElement = $creds.SelectSingleNode($Source)
5958
if ($sourceElement -eq $null)
@@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) {
8281
$passwordElement.SetAttribute("key", "ClearTextPassword")
8382
$sourceElement.AppendChild($passwordElement) | Out-Null
8483
}
85-
$passwordElement.SetAttribute("value", $Password)
84+
85+
$passwordElement.SetAttribute("value", $pwd)
8686
}
8787

88-
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
88+
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
8989
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
9090

9191
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
9292

9393
ForEach ($PackageSource in $maestroPrivateSources) {
9494
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
95-
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
95+
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
9696
}
9797
}
9898

@@ -144,13 +144,13 @@ if ($disabledSources -ne $null) {
144144
$userName = "dn-bot"
145145

146146
# Insert credential nodes for Maestro's private feeds
147-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
147+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
148148

149149
# 3.1 uses a different feed url format so it's handled differently here
150150
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
151151
if ($dotnet31Source -ne $null) {
152-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
153-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
152+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
153+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
154154
}
155155

156156
$dotnetVersions = @('5','6','7')
@@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) {
159159
$feedPrefix = "dotnet" + $dotnetVersion;
160160
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
161161
if ($dotnetSource -ne $null) {
162-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
163-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
162+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
163+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
164164
}
165165
}
166166

167-
$doc.Save($filename)
167+
$doc.Save($filename)

0 commit comments

Comments
 (0)