Skip to content

Commit abd8857

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/8.0' changes
2 parents ebbf01f + 3c612cf commit abd8857

35 files changed

+2320
-219
lines changed

‎azure-pipelines-pr.yml‎

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

‎azure-pipelines.yml‎

Lines changed: 53 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,21 @@
66
#
77

88
variables:
9-
# clean the local repo on the build agents
10-
- name: Build.Repository.Clean
9+
# clean the local repo on the build agents
10+
- name: Build.Repository.Clean
11+
value: true
12+
- name: _DotNetArtifactsCategory
13+
value: WINDOWSDESKTOP
14+
- name: _DotNetValidationArtifactsCategory
15+
value: WINDOWSDESKTOP
16+
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
17+
- name: PostBuildSign
18+
value: false
19+
- ${{ else }}:
20+
- name: PostBuildSign
1121
value: true
12-
- name: _DotNetArtifactsCategory
13-
value: WINDOWSDESKTOP
14-
- name: _DotNetValidationArtifactsCategory
15-
value: WINDOWSDESKTOP
16-
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
17-
- name: PostBuildSign
18-
value: false
19-
- ${{ else }}:
20-
- name: PostBuildSign
21-
value: true
22-
23-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
24-
- group: DotNet-Wpf-SDLValidation-Params
25-
26-
22+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
23+
- group: DotNet-Wpf-SDLValidation-Params
2724
# This is set in the pipeline directly
2825
# When set to false, CI tests will not be enabled in builds.
2926
#
@@ -35,68 +32,49 @@ variables:
3532
#
3633
# only trigger ci builds for the master and release branches
3734
trigger:
38-
batch: true
39-
branches:
40-
include:
41-
- main
42-
- release/3.*
43-
- release/5.*
44-
- release/6.*
45-
- release/7.*
46-
- release/8.*
47-
- internal/release/5.*
48-
- internal/release/6.*
49-
- internal/release/7.*
50-
- internal/release/8.*
51-
- experimental/*
52-
paths:
53-
exclude:
54-
- Documentation/*
55-
56-
pr:
57-
autoCancel: true
35+
batch: true
5836
branches:
5937
include:
6038
- main
61-
- release/3.*
62-
- internal/release/3.*
63-
- release/5.*
64-
- release/6.*
65-
- release/7.*
66-
- release/8.*
39+
- release/*
40+
- internal/release/*
6741
- experimental/*
6842
paths:
6943
exclude:
7044
- Documentation/*
71-
72-
# Call the pipeline.yml template, which does the real work
73-
stages:
74-
- stage: build
75-
displayName: Build
76-
jobs:
77-
- template: /eng/pipeline.yml
78-
parameters:
79-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
80-
runAsPublic: false
81-
82-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
83-
- template: eng\common\templates\post-build\post-build.yml
84-
parameters:
85-
publishingInfraVersion: 3
86-
enableSymbolValidation: false
87-
enableSigningValidation: false
88-
enableNugetValidation: false
89-
enableSourceLinkValidation: false
90-
# This is to enable SDL runs part of Post-Build Validation Stage
91-
SDLValidationParameters:
92-
enable: false
93-
params: ' -SourceToolsList @("policheck","credscan")
94-
-TsaInstanceURL $(_TsaInstanceURL)
95-
-TsaProjectName $(_TsaProjectName)
96-
-TsaNotificationEmail $(_TsaNotificationEmail)
97-
-TsaCodebaseAdmin $(_TsaCodebaseAdmin)
98-
-TsaBugAreaPath $(_TsaBugAreaPath)
99-
-TsaIterationPath $(_TsaIterationPath)
100-
-TsaRepositoryName "wpf"
101-
-TsaCodebaseName "wpf"
102-
-TsaPublish $True'
45+
resources:
46+
repositories:
47+
- repository: 1ESPipelineTemplates
48+
type: git
49+
name: 1ESPipelineTemplates/1ESPipelineTemplates
50+
ref: refs/tags/release
51+
extends:
52+
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
53+
parameters:
54+
featureFlags:
55+
autoBaseline: true
56+
pool:
57+
name: NetCore1ESPool-Internal
58+
image: 1es-windows-2022-pt
59+
os: windows
60+
customBuildTags:
61+
- ES365AIMigrationTooling
62+
stages:
63+
- stage: build
64+
displayName: Build
65+
jobs:
66+
- template: /eng/pipeline.yml@self
67+
parameters:
68+
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
69+
runAsPublic: false
70+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
71+
- template: /eng/common/templates-official/post-build/post-build.yml@self
72+
parameters:
73+
publishingInfraVersion: 3
74+
enableSymbolValidation: false
75+
enableSigningValidation: false
76+
enableNugetValidation: false
77+
enableSourceLinkValidation: false
78+
SDLValidationParameters:
79+
enable: false
80+
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: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
2222
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="8.0.0-rtm.23569.1">
24+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="8.0.0-rtm.24178.1">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2626
<Sha>089c9b660a07fad070d3d442b7f49c8e1001a0b3</Sha>
2727
</Dependency>
@@ -156,25 +156,25 @@
156156
</Dependency>
157157
</ProductDependencies>
158158
<ToolsetDependencies>
159-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24113.2">
159+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24179.4">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
161+
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24113.2">
163+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24179.4">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
165+
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24113.2">
167+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24179.4">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
169+
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.24113.2">
171+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.24179.4">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
173+
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24113.2">
175+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24179.4">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
177+
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
178178
</Dependency>
179179
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
180180
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎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>8</MajorVersion>
55
<MinorVersion>0</MinorVersion>
6-
<PatchVersion>4</PatchVersion>
6+
<PatchVersion>5</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>8.0.0-beta.24113.2</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.24113.2</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.24179.4</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.24179.4</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Sourcelink -->
5656
<PropertyGroup>
@@ -98,6 +98,6 @@
9898
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
9999
</PropertyGroup>
100100
<PropertyGroup>
101-
<MicrosoftDotNetWpfDncEngVersion>8.0.0-rtm.23569.1</MicrosoftDotNetWpfDncEngVersion>
101+
<MicrosoftDotNetWpfDncEngVersion>8.0.0-rtm.24178.1</MicrosoftDotNetWpfDncEngVersion>
102102
</PropertyGroup>
103103
</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','8')
@@ -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)

‎eng/common/native/init-compiler.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
6363
# Set default versions
6464
if [ -z "$majorVersion" ]; then
6565
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
66-
if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
66+
if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
6767
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
6868

6969
for version in $versions; do

0 commit comments

Comments
 (0)