Skip to content

Commit 7c6d80e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build (#8948)
[release/7.0] Update dependencies from dotnet/arcade
1 parent e8a2b61 commit 7c6d80e

File tree

4 files changed

+59
-14
lines changed

4 files changed

+59
-14
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,25 @@
7575
</Dependency>
7676
</ProductDependencies>
7777
<ToolsetDependencies>
78-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24171.2">
78+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24171.6">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>bc35747acd136d5aca170df4ec527c346db76c8e</Sha>
80+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24171.2">
82+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24171.6">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>bc35747acd136d5aca170df4ec527c346db76c8e</Sha>
84+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24171.2">
86+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24171.6">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>bc35747acd136d5aca170df4ec527c346db76c8e</Sha>
88+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24171.2">
90+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24171.6">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>bc35747acd136d5aca170df4ec527c346db76c8e</Sha>
92+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24171.2">
94+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24171.6">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>bc35747acd136d5aca170df4ec527c346db76c8e</Sha>
96+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
9797
</Dependency>
9898
</ToolsetDependencies>
9999
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/arcade -->
5151
<PropertyGroup>
52-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.24171.2</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.24171.2</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 -->

‎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
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.2",
16-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24171.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24171.6",
16+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24171.6"
1717
},
1818
"sdk": {
1919
"version": "7.0.117"

0 commit comments

Comments
 (0)