Skip to content

Commit ab0cf6a

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (#63373)
* Backflow from https://github.com/dotnet/dotnet / 619d563 build 280198 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 280198 Updated Dependencies: Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.NET.Runtime.MonoAOTCompiler.Task, dotnet-ef, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Binder, Microsoft.Extensions.Configuration.CommandLine, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.FileExtensions, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration.UserSecrets, Microsoft.Extensions.Configuration.Xml, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.Diagnostics, Microsoft.Extensions.Diagnostics.Abstractions, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Composite, Microsoft.Extensions.FileProviders.Physical, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Hosting, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Http, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Options, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Collections.Immutable, System.Composition, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Diagnostics.PerformanceCounter, System.DirectoryServices.Protocols, System.Formats.Asn1, System.Formats.Cbor, System.IO.Hashing, System.IO.Pipelines, System.Memory.Data, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Numerics.Tensors, System.Reflection.Metadata, System.Resources.Extensions, System.Runtime.Caching, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encodings.Web, System.Text.Json, System.Threading.AccessControl, System.Threading.Channels, System.Threading.RateLimiting (Version 10.0.0-rc.2.25416.109 -> 10.0.0-rc.2.25420.109) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk (Version 10.0.0-beta.25416.109 -> 10.0.0-beta.25420.109) Microsoft.Web.Xdt (Version 3.2.0-preview.25416.109 -> 3.2.0-preview.25420.109) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-preview.1.41709 -> 7.0.0-preview.1.42109) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent c90d9dd commit ab0cf6a

22 files changed

+352
-335
lines changed

‎eng/Version.Details.props

Lines changed: 92 additions & 92 deletions
Large diffs are not rendered by default.

‎eng/Version.Details.xml

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

‎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)