Skip to content

Commit c216ec2

Browse files
dibarbetdibarbet
authored
[release/dev17.12] Update dependencies to ensure coherency (#79852)
Coherency update: Failed to perform coherency update for one or more dependencies. Please review the GitHub checks or run `darc update-dependencies --coherency-only` locally against darc-release/dev17.12-d2023233-dbb5-42ae-8a64-7e4cd4376e11 for more information.
2 parents 4d68ef5 + 0b19150 commit c216ec2

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,19 @@
122122
</Dependency>
123123
</ProductDependencies>
124124
<ToolsetDependencies>
125-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25380.1">
125+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25407.2">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
127+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
128128
</Dependency>
129129
<!-- Intermediate is necessary for source build. -->
130-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25380.1">
130+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25407.2">
131131
<Uri>https://github.com/dotnet/arcade</Uri>
132-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
132+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
133133
<SourceBuild RepoName="arcade" ManagedOnly="true" />
134134
</Dependency>
135-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25380.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
135+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25407.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
136136
<Uri>https://github.com/dotnet/arcade</Uri>
137-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
137+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
138138
</Dependency>
139139
<!-- Intermediate is necessary for source build. -->
140140
<Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.23475.1">
@@ -156,9 +156,9 @@
156156
<Uri>https://github.com/dotnet/roslyn</Uri>
157157
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25380.1">
159+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25407.2">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>7e67a7b4b62513a475afe46c4cd74d54b68f65c9</Sha>
161+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
162162
</Dependency>
163163
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
164164
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
6666
<SystemIdentityModelTokensJwtVersion>6.34.0</SystemIdentityModelTokensJwtVersion>
6767
<!-- TODO: remove https://github.com/dotnet/roslyn/issues/71827 -->
68-
<MicrosoftDotNetXliffTasksVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">9.0.0-beta.25380.1</MicrosoftDotNetXliffTasksVersion>
68+
<MicrosoftDotNetXliffTasksVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">9.0.0-beta.25407.2</MicrosoftDotNetXliffTasksVersion>
6969
<MicrosoftIdentityClientVersion>4.61.3</MicrosoftIdentityClientVersion>
7070
<SystemIdentityModelTokensJwtVersion>6.34.0</SystemIdentityModelTokensJwtVersion>
7171
</PropertyGroup>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
microbuildUseESRP: true
2223
enablePublishBuildArtifacts: false
2324
enablePublishBuildAssets: false
2425
enablePublishTestResults: false
@@ -134,10 +135,11 @@ jobs:
134135
signType: $(_SignType)
135136
zipSources: false
136137
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137-
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
138-
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
139-
${{ else }}:
140-
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
138+
${{ if eq(parameters.microbuildUseESRP, true) }}:
139+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
140+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
141+
${{ else }}:
142+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
141143
env:
142144
TeamName: $(_TeamName)
143145
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"sdk": {
3-
"version": "9.0.107",
3+
"version": "9.0.109",
44
"allowPrerelease": false,
55
"rollForward": "patch"
66
},
77
"tools": {
8-
"dotnet": "9.0.107",
8+
"dotnet": "9.0.109",
99
"vs": {
1010
"version": "17.8.0"
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1",
15-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1",
14+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2",
15+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25407.2",
1616
"Microsoft.Build.Traversal": "3.4.0"
1717
}
1818
}

0 commit comments

Comments
 (0)