Skip to content

Commit 5d0edff

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build (#54679)
[release/7.0] Update dependencies from dotnet/arcade
1 parent 0000c6d commit 5d0edff

File tree

4 files changed

+57
-12
lines changed

4 files changed

+57
-12
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303303
<Sha>8587d13a2764c025277d628471984bae8e16427c</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24171.2">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24171.6">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>bc35747acd136d5aca170df4ec527c346db76c8e</Sha>
307+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24171.2">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24171.6">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>bc35747acd136d5aca170df4ec527c346db76c8e</Sha>
312+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24171.2">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24171.6">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>bc35747acd136d5aca170df4ec527c346db76c8e</Sha>
316+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24171.2">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24171.6">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>bc35747acd136d5aca170df4ec527c346db76c8e</Sha>
320+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
<MicrosoftEntityFrameworkCoreVersion>7.0.17</MicrosoftEntityFrameworkCoreVersion>
135135
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.17</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24171.2</MicrosoftDotNetBuildTasksInstallersVersion>
138-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24171.2</MicrosoftDotNetBuildTasksTemplatingVersion>
137+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24171.6</MicrosoftDotNetBuildTasksInstallersVersion>
138+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24171.6</MicrosoftDotNetBuildTasksTemplatingVersion>
139139
<!-- Packages from dotnet/source-build-externals -->
140140
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.24162.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
141141
<!-- Packages from dotnet/xdt -->

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool,
2+
# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches.
3+
4+
# Motivation:
5+
# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS
6+
# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing
7+
# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS.
8+
# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services
9+
# team needs to move resources around and create new and potentially differently-named pools. Using this template
10+
# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming.
11+
12+
# How to use:
13+
# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do).
14+
# If we find alternate naming conventions in broad usage it can be added to the condition below.
15+
#
16+
# First, import the template in an arcade-ified repo to pick up the variables, e.g.:
17+
#
18+
# variables:
19+
# - template: /eng/common/templates-official/variables/pool-providers.yml
20+
#
21+
# ... then anywhere specifying the pool provider use the runtime variables,
22+
# $(DncEngInternalBuildPool)
23+
#
24+
# pool:
25+
# name: $(DncEngInternalBuildPool)
26+
# image: 1es-windows-2022-pt
27+
28+
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+
32+
# Any new -Svc alternative pools should have variables added here to allow for splitting work
33+
34+
- name: DncEngInternalBuildPool
35+
value: $[
36+
replace(
37+
replace(
38+
eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'),
39+
True,
40+
'NetCore1ESPool-Svc-Internal'
41+
),
42+
False,
43+
'NetCore1ESPool-Internal'
44+
)
45+
]

‎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.19",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.2",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24171.2"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24171.6"
3232
}
3333
}

0 commit comments

Comments
 (0)