Skip to content

Commit 77c2bf7

Browse files
BlackhexBlackhex
committed
Merge remote-tracking branch 'origin/main'
2 parents ba1b59f + d7ff0aa commit 77c2bf7

File tree

10 files changed

+55
-56
lines changed

10 files changed

+55
-56
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23077.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23110.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
8+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23077.1">
11+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23110.3">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
13+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23077.1">
15+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23110.3">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
17+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23077.1">
19+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23110.3">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
21+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23077.1">
23+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23110.3">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
25+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23077.1">
27+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23110.3">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
29+
<Sha>96d8be74c39a4765ec919ff9bebf9e0c875fc195</Sha>
3030
</Dependency>
3131
</ToolsetDependencies>
3232
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1818
</PropertyGroup>
1919
<PropertyGroup>
20-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23077.1</MicrosoftDotNetBuildTasksPackagingVersion>
21-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23077.1</MicrosoftDotNetBuildTasksTemplatingVersion>
22-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23077.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
23-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23077.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
20+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23110.3</MicrosoftDotNetBuildTasksPackagingVersion>
21+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23110.3</MicrosoftDotNetBuildTasksTemplatingVersion>
22+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23110.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
23+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23110.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
2626
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

‎eng/common/generate-locproject.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ $locJson = @{
137137
@{
138138
LanguageSet = $LanguageSet
139139
CloneLanguageSet = "VS_macOS_CloneLanguages"
140+
LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
140141
LocItems = @(
141142
$macosHtmlFiles | ForEach-Object {
142143
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"

‎eng/common/init-tools-native.ps1‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ try {
8383
Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue
8484
if ($NativeTools) {
8585
if ($PathPromotion -eq $True) {
86-
if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build
86+
$ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools"
87+
if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine
8788
$NativeTools.PSObject.Properties | ForEach-Object {
8889
$ToolName = $_.Name
8990
$ToolVersion = $_.Value
@@ -93,11 +94,6 @@ try {
9394
if ($ToolVersion -eq "latest") {
9495
$ToolVersion = ""
9596
}
96-
$ArcadeToolsDirectory = "C:\arcade-tools"
97-
if (-not (Test-Path $ArcadeToolsDirectory)) {
98-
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
99-
exit 1
100-
}
10197
$ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)
10298
if ($ToolDirectories -eq $null) {
10399
Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
@@ -125,6 +121,7 @@ try {
125121

126122
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
127123
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding."
124+
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image."
128125
}
129126
}
130127
exit 0

‎eng/common/loc/P22DotNetHtmlLocalization.lss‎

3.72 KB
Binary file not shown.

‎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="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="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="12 11 10 9 8 7 6 5 4.9"; fi
6868

6969
for version in $versions; do

‎eng/common/templates/job/job.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
135135
- task: NuGetAuthenticate@0
136136

137-
- ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:
137+
- ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}:
138138
- task: DownloadPipelineArtifact@2
139139
inputs:
140140
buildType: current
@@ -171,7 +171,7 @@ jobs:
171171
TeamName: $(_TeamName)
172172

173173
- ${{ if ne(parameters.artifacts.publish, '') }}:
174-
- ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}:
174+
- ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:
175175
- task: CopyFiles@2
176176
displayName: Gather binaries for publish to artifacts
177177
inputs:
@@ -192,7 +192,7 @@ jobs:
192192
ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }}
193193
continueOnError: true
194194
condition: always()
195-
- ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}:
195+
- ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
196196
- publish: artifacts/log
197197
artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
198198
displayName: Publish logs

‎eng/common/templates/job/source-build.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,12 @@ jobs:
4646
# source-build builds run in Docker, including the default managed platform.
4747
# /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
4848
pool:
49-
# Main environments
50-
${{ if and(eq(variables['System.TeamProject'], 'public'), ne(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), true)) }}:
51-
name: NetCore-Public
49+
${{ if eq(variables['System.TeamProject'], 'public') }}:
50+
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
5251
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
53-
${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), true)) }}:
54-
name: NetCore1ESPool-Internal
55-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
5652

57-
# Servicing build environments
58-
${{ if and(eq(variables['System.TeamProject'], 'public'), contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release')) }}:
59-
name: NetCore-Svc-Public
60-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
61-
${{ if and(eq(variables['System.TeamProject'], 'internal'), contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release')) }}:
62-
name: NetCore1ESPool-Svc-Internal
53+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
54+
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
6355
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
6456

6557
${{ if ne(parameters.platform.pool, '') }}:

‎eng/common/templates/variables/pool-providers.yml‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,32 @@
2626
# demands: ImageOverride -equals windows.vs2019.amd64
2727

2828
variables:
29-
# Coalesce the target and source branches so we know when a PR targets a release branch
30-
# If these variables are somehow missing, fall back to main (tends to have more capacity)
31-
- name: BranchNameForPoolSelection
32-
value: ${{ coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main') }}
29+
# Coalesce the target and source branches so we know when a PR targets a release branch
30+
# If these variables are somehow missing, fall back to main (tends to have more capacity)
3331

34-
# Any new -Svc alternative pools should have variables added here to allow for splitting work
35-
36-
# Main branch pools
37-
- ${{ if ne(contains(variables['BranchNameForPoolSelection'], 'release'), true) }}:
32+
# Any new -Svc alternative pools should have variables added here to allow for splitting work
3833
- name: DncEngPublicBuildPool
39-
value: NetCore-Public
40-
- name: DncEngInternalBuildPool
41-
value: NetCore1ESPool-Internal
34+
value: $[
35+
replace(
36+
replace(
37+
eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'),
38+
True,
39+
'NetCore-Svc-Public'
40+
),
41+
False,
42+
'NetCore-Public'
43+
)
44+
]
4245

43-
# Release branch pools
44-
- ${{ if contains(variables['BranchNameForPoolSelection'], 'release') }}:
45-
- name: DncEngPublicBuildPool
46-
value: NetCore-Svc-Public
4746
- name: DncEngInternalBuildPool
48-
value: NetCore1ESPool-Svc-Internal
47+
value: $[
48+
replace(
49+
replace(
50+
eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'),
51+
True,
52+
'NetCore1ESPool-Svc-Internal'
53+
),
54+
False,
55+
'NetCore1ESPool-Internal'
56+
)
57+
]

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "8.0.100-alpha.1.23061.8"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23077.1",
7-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23077.1"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3",
7+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23110.3"
88
}
99
}

0 commit comments

Comments
 (0)