Skip to content

Commit 94ef1b0

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Update dependencies from dotnet/arcade (#2320)
* Update dependencies from https://github.com/dotnet/arcade build 20240109.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24059.1 -> To Version 8.0.0-beta.24059.4 * Update dependencies from https://github.com/dotnet/arcade build 20240110.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24059.1 -> To Version 8.0.0-beta.24060.4 * Update dependencies from https://github.com/dotnet/arcade build 20240110.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24059.1 -> To Version 8.0.0-beta.24060.4 * Minor updates * Update dependencies from https://github.com/dotnet/arcade build 20240110.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24059.1 -> To Version 8.0.0-beta.24060.4 * Update dependencies from https://github.com/dotnet/arcade build 20240125.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24059.1 -> To Version 8.0.0-beta.24075.5 * Update Version.Details.xml * Update SourceBuild.props * Update SourceBuild.props * Update dependencies from https://github.com/dotnet/arcade build 20240213.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24059.1 -> To Version 8.0.0-beta.24113.2 * Update dependencies from https://github.com/dotnet/arcade build 20240213.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24059.1 -> To Version 8.0.0-beta.24113.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent 0d37b90 commit 94ef1b0

File tree

8 files changed

+35
-33
lines changed

8 files changed

+35
-33
lines changed

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
<ItemGroup Condition="'$(DisableArcade)' == '1'">
3232
<!-- The xunit version should be kept in sync with the one that Arcade promotes -->
33-
<PackageVersion Include="xunit" Version="2.4.1" />
34-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
33+
<PackageVersion Include="xunit" Version="2.4.2" />
34+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
3535
</ItemGroup>
3636

3737
</Project>

‎eng/SourceBuild.props‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
88
</PropertyGroup>
99

10-
<Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
10+
<Target Name="ConfigureInnerBuildArg"
11+
BeforeTargets="GetSourceBuildCommandConfiguration"
12+
Condition="'$(ArcadeBuildFromSource)' == 'true'">
1113
<PropertyGroup>
12-
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\sourcebuild.slnf"</InnerBuildArgs>
14+
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)sourcebuild.slnf"</InnerBuildArgs>
1315
</PropertyGroup>
1416
</Target>
1517

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
</Dependency>
1010
</ProductDependencies>
1111
<ToolsetDependencies>
12-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24059.1">
12+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24113.2">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>8000dd1a9ad9017e0cd1e9fd079c42b6dd7e6962</Sha>
14+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
1515
</Dependency>
1616
<!-- Intermediate is necessary for source build. -->
17-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24059.1">
17+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24113.2">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>8000dd1a9ad9017e0cd1e9fd079c42b6dd7e6962</Sha>
19+
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
2020
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2121
</Dependency>
2222
<!-- Don't declare a separate xliff-tasks intermediate as Arcade 8.0 does not have xliff intermediate declared. -->

‎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
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.100",
3+
"dotnet": "8.0.101",
44
"runtimes": {
55
"dotnet": [
66
"5.0.17",
@@ -10,6 +10,6 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.1"
13+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2"
1414
}
1515
}

0 commit comments

Comments
 (0)