Skip to content

Commit 26a0c76

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 20250821.20 (#8548)
Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-rc.1.25420.111 -> To Version 10.0.0-rc.1.25421.120 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent dc4dc21 commit 26a0c76

25 files changed

+166
-106
lines changed

‎eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-rc.1.25420.111">
3+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-rc.1.25421.120">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
5+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.637302">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
@@ -12,55 +12,55 @@
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
1313
<Sha>eab990eafdd479265f78855d72e6afa3ee0813c7</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25420.111">
15+
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25421.120">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
17+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25420.111">
21+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100-rc.1.25421.120">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
23+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25420.111">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25421.120">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
27+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25420.111">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25421.120">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
31+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25420.111">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25421.120">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
35+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25420.111">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25421.120">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
39+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25420.111">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25421.120">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
43+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.637302">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
4747
<Sha>eab990eafdd479265f78855d72e6afa3ee0813c7</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-rc.1.25420.111">
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-rc.1.25421.120">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
51+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
5252
</Dependency>
53-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.1.25420.111">
53+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.1.25421.120">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
55+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
5656
</Dependency>
57-
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-rc.1.25420.111">
57+
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-rc.1.25421.120">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
59+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
6060
</Dependency>
61-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.1.25420.111">
61+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.1.25421.120">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>6218c7cdc745d1633718b5474be71b4ddb2cedf2</Sha>
63+
<Sha>d5539bb825f9d1376b6002463dd26f9e8c5a570f</Sha>
6464
</Dependency>
6565
</ToolsetDependencies>
6666
</Dependencies>

‎eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@
5252
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.637302</MicrosoftDiagnosticsMonitoringEventPipeVersion>
5353
<MicrosoftFileFormatsVersion>1.0.637302</MicrosoftFileFormatsVersion>
5454
<!-- dotnet/dotnet references -->
55-
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-rc.1.25420.111</MicrosoftAspNetCoreAppRuntimewinx64Version>
56-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25420.111</MicrosoftCodeAnalysisNetAnalyzersVersion>
57-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25420.111</MicrosoftDotNetBuildTasksArchivesVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25420.111</MicrosoftDotNetCodeAnalysisVersion>
59-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25420.111</MicrosoftDotNetXUnitExtensionsVersion>
60-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-rc.1.25420.111</MicrosoftNETCoreAppRuntimewinx64Version>
61-
<SystemCommandLineVersion>2.0.0-rc.1.25420.111</SystemCommandLineVersion>
62-
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rc.1.25420.111</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
63-
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-rc.1.25420.111</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
64-
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-rc.1.25420.111</VSRedistCommonNetCoreSharedFrameworkx64100Version>
55+
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-rc.1.25421.120</MicrosoftAspNetCoreAppRuntimewinx64Version>
56+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.100-rc.1.25421.120</MicrosoftCodeAnalysisNetAnalyzersVersion>
57+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25421.120</MicrosoftDotNetBuildTasksArchivesVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25421.120</MicrosoftDotNetCodeAnalysisVersion>
59+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25421.120</MicrosoftDotNetXUnitExtensionsVersion>
60+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-rc.1.25421.120</MicrosoftNETCoreAppRuntimewinx64Version>
61+
<SystemCommandLineVersion>2.0.0-rc.1.25421.120</SystemCommandLineVersion>
62+
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rc.1.25421.120</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
63+
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-rc.1.25421.120</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
64+
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-rc.1.25421.120</VSRedistCommonNetCoreSharedFrameworkx64100Version>
6565
</PropertyGroup>
6666
<PropertyGroup Label="Runtime Versions">
6767
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>

‎eng/common/SetupNugetSources.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# displayName: Setup Private Feeds Credentials
1111
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1212
# inputs:
13-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
14-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
13+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
14+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
1515
# env:
1616
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
1717
#

‎eng/common/SetupNugetSources.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# - task: Bash@3
1212
# displayName: Setup Internal Feeds
1313
# inputs:
14-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
15-
# arguments: $(Build.SourcesDirectory)/NuGet.config
14+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
15+
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config
1616
# condition: ne(variables['Agent.OS'], 'Windows_NT')
1717
# - task: NuGetAuthenticate@1
1818
#

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
inputs:
164164
testResultsFormat: 'xUnit'
165165
testResultsFiles: '*.xml'
166-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
166+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
167167
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
168168
mergeTestResults: ${{ parameters.mergeTestResults }}
169169
continueOnError: true
@@ -174,7 +174,7 @@ jobs:
174174
inputs:
175175
testResultsFormat: 'VSTest'
176176
testResultsFiles: '*.trx'
177-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
177+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
178178
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
179179
mergeTestResults: ${{ parameters.mergeTestResults }}
180180
continueOnError: true
@@ -218,7 +218,7 @@ jobs:
218218
- task: CopyFiles@2
219219
displayName: Gather buildconfiguration for build retry
220220
inputs:
221-
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
221+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
222222
Contents: '**'
223223
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
224224
continueOnError: true

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
99
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1010

11-
SourcesDirectory: $(Build.SourcesDirectory)
11+
SourcesDirectory: $(System.DefaultWorkingDirectory)
1212
CreatePr: true
1313
AutoCompletePr: false
1414
ReusePr: true
@@ -68,7 +68,7 @@ jobs:
6868
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
6969
- task: Powershell@2
7070
inputs:
71-
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
71+
filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
7272
arguments: $(_GenerateLocProjectArguments)
7373
displayName: Generate LocProject.json
7474
condition: ${{ parameters.condition }}
@@ -103,7 +103,7 @@ jobs:
103103
- task: CopyFiles@2
104104
displayName: Copy LocProject.json
105105
inputs:
106-
SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/'
106+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/Localize/'
107107
Contents: 'LocProject.json'
108108
TargetFolder: '$(Build.ArtifactStagingDirectory)/loc'
109109
condition: ${{ parameters.condition }}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ parameters:
3838
# Optional: A minimatch pattern for the asset manifests to publish to BAR
3939
assetManifestsPattern: '*/manifests/**/*.xml'
4040

41+
repositoryAlias: self
42+
4143
jobs:
4244
- job: Asset_Registry_Publish
4345

@@ -78,7 +80,7 @@ jobs:
7880
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
7981

8082
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
81-
- checkout: self
83+
- checkout: ${{ parameters.repositoryAlias }}
8284
fetchDepth: 3
8385
clean: true
8486

@@ -117,7 +119,7 @@ jobs:
117119
azureSubscription: "Darc: Maestro Production"
118120
scriptType: ps
119121
scriptLocation: scriptPath
120-
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
122+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
121123
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
122124
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
123125
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
@@ -137,7 +139,7 @@ jobs:
137139
Add-Content -Path $filePath -Value "$(DefaultChannels)"
138140
Add-Content -Path $filePath -Value $(IsStableBuild)
139141
140-
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
142+
$symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
141143
if (Test-Path -Path $symbolExclusionfile)
142144
{
143145
Write-Host "SymbolExclusionFile exists"
@@ -177,7 +179,7 @@ jobs:
177179
azureSubscription: "Darc: Maestro Production"
178180
scriptType: ps
179181
scriptLocation: scriptPath
180-
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
182+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
181183
arguments: >
182184
-BuildId $(BARBuildId)
183185
-PublishingInfraVersion 3

‎eng/common/core-templates/jobs/codeql-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: DefaultGuardianVersion
2525
value: 0.109.0
2626
- name: GuardianPackagesConfigFile
27-
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
27+
value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config
2828
- name: GuardianVersion
2929
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
3030

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ parameters:
4343

4444
artifacts: {}
4545
is1ESPipeline: ''
46+
repositoryAlias: self
4647

4748
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4849
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -114,3 +115,4 @@ jobs:
114115
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
115116
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
116117
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
118+
repositoryAlias: ${{ parameters.repositoryAlias }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ stages:
154154
- task: PowerShell@2
155155
displayName: Validate
156156
inputs:
157-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
157+
filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1
158158
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
159159

160160
- job:
@@ -208,7 +208,7 @@ stages:
208208
filePath: eng\common\sdk-task.ps1
209209
arguments: -task SigningValidation -restore -msbuildEngine vs
210210
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
211-
/p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
211+
/p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt'
212212
${{ parameters.signingValidationAdditionalParameters }}
213213

214214
- template: /eng/common/core-templates/steps/publish-logs.yml
@@ -258,7 +258,7 @@ stages:
258258
- task: PowerShell@2
259259
displayName: Validate
260260
inputs:
261-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
261+
filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1
262262
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
263263
-ExtractPath $(Agent.BuildDirectory)/Extract/
264264
-GHRepoName $(Build.Repository.Name)
@@ -313,7 +313,7 @@ stages:
313313
azureSubscription: "Darc: Maestro Production"
314314
scriptType: ps
315315
scriptLocation: scriptPath
316-
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
316+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
317317
arguments: >
318318
-BuildId $(BARBuildId)
319319
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}

0 commit comments

Comments
 (0)