Skip to content

Commit 249dfcb

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20230203.1 (dotnet#46478)
[main] Update dependencies from dotnet/arcade
1 parent ce4fa26 commit 249dfcb

8 files changed

+46
-44
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -302,26 +302,26 @@
302302
<Uri>https://github.com/dotnet/runtime</Uri>
303303
<Sha>58719ec90b3bbae527dd81685bf8670b993fe8f9</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23077.1">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23103.1">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
307+
<Sha>c453dfef2f41533de5cb03b2115aab9d0dfc74c6</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23077.1">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23103.1">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
312+
<Sha>c453dfef2f41533de5cb03b2115aab9d0dfc74c6</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23077.1">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23103.1">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
316+
<Sha>c453dfef2f41533de5cb03b2115aab9d0dfc74c6</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23077.1">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23103.1">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
320+
<Sha>c453dfef2f41533de5cb03b2115aab9d0dfc74c6</Sha>
321321
</Dependency>
322-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23077.1">
322+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23103.1">
323323
<Uri>https://github.com/dotnet/arcade</Uri>
324-
<Sha>691fd54681d10eef3c2681fceb8b09b9f9ba9bb0</Sha>
324+
<Sha>c453dfef2f41533de5cb03b2115aab9d0dfc74c6</Sha>
325325
</Dependency>
326326
</ToolsetDependencies>
327327
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@
135135
<MicrosoftEntityFrameworkCoreVersion>8.0.0-preview.2.23106.4</MicrosoftEntityFrameworkCoreVersion>
136136
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-preview.2.23106.4</MicrosoftEntityFrameworkCoreDesignVersion>
137137
<!-- Packages from dotnet/arcade -->
138-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23077.1</MicrosoftDotNetBuildTasksInstallersVersion>
139-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23077.1</MicrosoftDotNetBuildTasksTemplatingVersion>
140-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23077.1</MicrosoftDotNetRemoteExecutorVersion>
138+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23103.1</MicrosoftDotNetBuildTasksInstallersVersion>
139+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23103.1</MicrosoftDotNetBuildTasksTemplatingVersion>
140+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23103.1</MicrosoftDotNetRemoteExecutorVersion>
141141
<!-- Packages from dotnet/source-build-externals -->
142142
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23102.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
143143
<!-- Packages from dotnet/xdt -->

‎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/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/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
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23077.1",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23077.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23103.1",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23103.1"
3232
}
3333
}

0 commit comments

Comments
 (0)