Skip to content

Commit 476e2aa

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240213.2 (#54040)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.24059.4 -> To Version 8.0.0-beta.24113.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 9ee54e5 commit 476e2aa

File tree

8 files changed

+54
-38
lines changed

8 files changed

+54
-38
lines changed

‎NuGet.config

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,17 @@
77
<!-- End: Package sources from dotnet-extensions -->
88
<!-- Begin: Package sources from dotnet-efcore -->
99
<add key="darc-int-dotnet-efcore-a97f6ff" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-a97f6ffc/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-efcore-a97f6ff-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-a97f6ffc-4/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-efcore-a97f6ff-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-a97f6ffc-3/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-efcore-a97f6ff-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-a97f6ffc-2/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-efcore-a97f6ff-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-a97f6ffc-1/nuget/v3/index.json" />
1014
<!-- End: Package sources from dotnet-efcore -->
1115
<!-- Begin: Package sources from dotnet-runtime -->
1216
<add key="darc-int-dotnet-runtime-1381d5e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1381d5eb/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-runtime-1381d5e-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1381d5eb-4/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-runtime-1381d5e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1381d5eb-3/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-runtime-1381d5e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1381d5eb-2/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-runtime-1381d5e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1381d5eb-1/nuget/v3/index.json" />
1321
<!-- End: Package sources from dotnet-runtime -->
1422
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1523
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -30,9 +38,17 @@
3038
<clear />
3139
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3240
<!-- Begin: Package sources from dotnet-efcore -->
41+
<add key="darc-int-dotnet-efcore-a97f6ff-1" value="true" />
42+
<add key="darc-int-dotnet-efcore-a97f6ff-2" value="true" />
43+
<add key="darc-int-dotnet-efcore-a97f6ff-3" value="true" />
44+
<add key="darc-int-dotnet-efcore-a97f6ff-4" value="true" />
3345
<add key="darc-int-dotnet-efcore-a97f6ff" value="true" />
3446
<!-- End: Package sources from dotnet-efcore -->
3547
<!-- Begin: Package sources from dotnet-runtime -->
48+
<add key="darc-int-dotnet-runtime-1381d5e-1" value="true" />
49+
<add key="darc-int-dotnet-runtime-1381d5e-2" value="true" />
50+
<add key="darc-int-dotnet-runtime-1381d5e-3" value="true" />
51+
<add key="darc-int-dotnet-runtime-1381d5e-4" value="true" />
3652
<add key="darc-int-dotnet-runtime-1381d5e" value="true" />
3753
<!-- End: Package sources from dotnet-runtime -->
3854
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -376,26 +376,26 @@
376376
<Uri>https://github.com/dotnet/winforms</Uri>
377377
<Sha>abda8e3bfa78319363526b5a5f86863ec979940e</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24059.4">
379+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24113.2">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
381+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
382382
<SourceBuild RepoName="arcade" ManagedOnly="true" />
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24059.4">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24113.2">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
386+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24059.4">
388+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24113.2">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
390+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24059.4">
392+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24113.2">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
394+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24059.4">
396+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24113.2">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>61ae141d2bf3534619265c8f691fd55dc3e75147</Sha>
398+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
399399
</Dependency>
400400
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="8.1.0-preview.23604.1">
401401
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@
161161
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
162162
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
163163
<!-- Packages from dotnet/arcade -->
164-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksInstallersVersion>
165-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24059.4</MicrosoftDotNetBuildTasksTemplatingVersion>
166-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24059.4</MicrosoftDotNetRemoteExecutorVersion>
164+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksInstallersVersion>
165+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24113.2</MicrosoftDotNetBuildTasksTemplatingVersion>
166+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24113.2</MicrosoftDotNetRemoteExecutorVersion>
167167
<!-- Packages from dotnet/source-build-externals -->
168168
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.24065.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
169169
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ param(
1212
try {
1313
. $PSScriptRoot\post-build-utils.ps1
1414

15-
$darc = Get-Darc
15+
$darc = Get-Darc
1616

1717
$optionalParams = [System.Collections.ArrayList]::new()
1818

@@ -46,7 +46,7 @@ try {
4646
}
4747

4848
Write-Host 'done.'
49-
}
49+
}
5050
catch {
5151
Write-Host $_
5252
Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."

‎eng/common/templates/job/publish-build-assets.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
demands: Cmd
5959
# If it's not devdiv, it's dnceng
6060
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
61-
name: $(DncEngInternalBuildPool)
61+
name: NetCore1ESPool-Publishing-Internal
6262
demands: ImageOverride -equals windows.vs2019.amd64
6363

6464
steps:
@@ -71,7 +71,7 @@ jobs:
7171
checkDownloadedFiles: true
7272
condition: ${{ parameters.condition }}
7373
continueOnError: ${{ parameters.continueOnError }}
74-
74+
7575
- task: NuGetAuthenticate@1
7676

7777
- task: PowerShell@2
@@ -86,7 +86,7 @@ jobs:
8686
/p:OfficialBuildId=$(Build.BuildNumber)
8787
condition: ${{ parameters.condition }}
8888
continueOnError: ${{ parameters.continueOnError }}
89-
89+
9090
- task: powershell@2
9191
displayName: Create ReleaseConfigs Artifact
9292
inputs:
@@ -95,7 +95,7 @@ jobs:
9595
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
9696
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
9797
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
98-
98+
9999
- task: PublishBuildArtifacts@1
100100
displayName: Publish ReleaseConfigs Artifact
101101
inputs:
@@ -121,7 +121,7 @@ jobs:
121121
122122
- task: PublishBuildArtifacts@1
123123
displayName: Publish SymbolPublishingExclusionsFile Artifact
124-
condition: eq(variables['SymbolExclusionFile'], 'true')
124+
condition: eq(variables['SymbolExclusionFile'], 'true')
125125
inputs:
126126
PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
127127
PublishLocation: Container
@@ -137,7 +137,7 @@ jobs:
137137
displayName: Publish Using Darc
138138
inputs:
139139
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
140-
arguments: -BuildId $(BARBuildId)
140+
arguments: -BuildId $(BARBuildId)
141141
-PublishingInfraVersion 3
142142
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
143143
-MaestroToken '$(MaestroApiAccessToken)'
@@ -148,4 +148,4 @@ jobs:
148148
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
149149
- template: /eng/common/templates/steps/publish-logs.yml
150150
parameters:
151-
JobLabel: 'Publish_Artifacts_Logs'
151+
JobLabel: 'Publish_Artifacts_Logs'

‎eng/common/templates/post-build/post-build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ parameters:
3939
displayName: Enable NuGet validation
4040
type: boolean
4141
default: true
42-
42+
4343
- name: publishInstallersAndChecksums
4444
displayName: Publish installers and checksums
4545
type: boolean
@@ -131,8 +131,8 @@ stages:
131131
displayName: Validate
132132
inputs:
133133
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
134-
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
135-
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
134+
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
135+
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
136136

137137
- job:
138138
displayName: Signing Validation
@@ -221,9 +221,9 @@ stages:
221221
displayName: Validate
222222
inputs:
223223
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
224-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
225-
-ExtractPath $(Agent.BuildDirectory)/Extract/
226-
-GHRepoName $(Build.Repository.Name)
224+
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
225+
-ExtractPath $(Agent.BuildDirectory)/Extract/
226+
-GHRepoName $(Build.Repository.Name)
227227
-GHCommit $(Build.SourceVersion)
228228
-SourcelinkCliVersion $(SourceLinkCLIVersion)
229229
continueOnError: true
@@ -258,7 +258,7 @@ stages:
258258
demands: Cmd
259259
# If it's not devdiv, it's dnceng
260260
${{ else }}:
261-
name: $(DncEngInternalBuildPool)
261+
name: NetCore1ESPool-Publishing-Internal
262262
demands: ImageOverride -equals windows.vs2019.amd64
263263
steps:
264264
- template: setup-maestro-vars.yml
@@ -272,7 +272,7 @@ stages:
272272
displayName: Publish Using Darc
273273
inputs:
274274
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
275-
arguments: -BuildId $(BARBuildId)
275+
arguments: -BuildId $(BARBuildId)
276276
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
277277
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
278278
-MaestroToken '$(MaestroApiAccessToken)'

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool,
1+
# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool,
22
# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches.
33

4-
# Motivation:
4+
# Motivation:
55
# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS
66
# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing
77
# (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
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
1010
# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming.
1111

12-
# How to use:
12+
# How to use:
1313
# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do).
1414
# If we find alternate naming conventions in broad usage it can be added to the condition below.
1515
#
@@ -54,4 +54,4 @@ variables:
5454
False,
5555
'NetCore1ESPool-Internal'
5656
)
57-
]
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.19",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24059.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24113.2"
3232
}
3333
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy