Skip to content

Commit 11a70b5

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 280198 (#11067)
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25416.109 -> 10.0.0-beta.25420.109) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.2.25416.109 -> 10.0.0-rc.2.25420.109) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 175e1d9 commit 11a70b5

21 files changed

+140
-123
lines changed

‎eng/Version.Details.props‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ This file should be imported by eng/Versions.props
77
<Project>
88
<PropertyGroup>
99
<!-- dotnet/dotnet dependencies -->
10-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetArcadeSdkPackageVersion>
11-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetCodeAnalysisPackageVersion>
12-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetGenAPIPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.2.25416.109</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
15-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25416.109</MicrosoftNETCoreAppRefPackageVersion>
16-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25416.109</MicrosoftNETCorePlatformsPackageVersion>
17-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.2.25416.109</MicrosoftPrivateWinformsPackageVersion>
10+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25420.109</MicrosoftDotNetArcadeSdkPackageVersion>
11+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25420.109</MicrosoftDotNetCodeAnalysisPackageVersion>
12+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25420.109</MicrosoftDotNetGenAPIPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25420.109</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.2.25420.109</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
15+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25420.109</MicrosoftNETCoreAppRefPackageVersion>
16+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25420.109</MicrosoftNETCorePlatformsPackageVersion>
17+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.2.25420.109</MicrosoftPrivateWinformsPackageVersion>
1818
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
1919
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
20-
<SystemCodeDomPackageVersion>10.0.0-rc.2.25416.109</SystemCodeDomPackageVersion>
21-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.2.25416.109</SystemConfigurationConfigurationManagerPackageVersion>
22-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.2.25416.109</SystemDiagnosticsEventLogPackageVersion>
23-
<SystemDirectoryServicesPackageVersion>10.0.0-rc.2.25416.109</SystemDirectoryServicesPackageVersion>
24-
<SystemDrawingCommonPackageVersion>10.0.0-rc.2.25416.109</SystemDrawingCommonPackageVersion>
25-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.2.25416.109</SystemFormatsNrbfPackageVersion>
26-
<SystemIOPackagingPackageVersion>10.0.0-rc.2.25416.109</SystemIOPackagingPackageVersion>
27-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.2.25416.109</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
28-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.2.25416.109</SystemReflectionMetadataLoadContextPackageVersion>
29-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.2.25416.109</SystemResourcesExtensionsPackageVersion>
30-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.2.25416.109</SystemRuntimeSerializationFormattersPackageVersion>
31-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.2.25416.109</SystemSecurityCryptographyXmlPackageVersion>
32-
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.2.25416.109</SystemSecurityPermissionsPackageVersion>
33-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.2.25416.109</SystemWindowsExtensionsPackageVersion>
20+
<SystemCodeDomPackageVersion>10.0.0-rc.2.25420.109</SystemCodeDomPackageVersion>
21+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.2.25420.109</SystemConfigurationConfigurationManagerPackageVersion>
22+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.2.25420.109</SystemDiagnosticsEventLogPackageVersion>
23+
<SystemDirectoryServicesPackageVersion>10.0.0-rc.2.25420.109</SystemDirectoryServicesPackageVersion>
24+
<SystemDrawingCommonPackageVersion>10.0.0-rc.2.25420.109</SystemDrawingCommonPackageVersion>
25+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.2.25420.109</SystemFormatsNrbfPackageVersion>
26+
<SystemIOPackagingPackageVersion>10.0.0-rc.2.25420.109</SystemIOPackagingPackageVersion>
27+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.2.25420.109</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
28+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.2.25420.109</SystemReflectionMetadataLoadContextPackageVersion>
29+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.2.25420.109</SystemResourcesExtensionsPackageVersion>
30+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.2.25420.109</SystemRuntimeSerializationFormattersPackageVersion>
31+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.2.25420.109</SystemSecurityCryptographyXmlPackageVersion>
32+
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.2.25420.109</SystemSecurityPermissionsPackageVersion>
33+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.2.25420.109</SystemWindowsExtensionsPackageVersion>
3434
<!-- _git/dotnet-wpf-int dependencies -->
3535
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-preview.7.25317.2</MicrosoftDotNetWpfDncEngPackageVersion>
3636
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e" BarId="279809" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="619d5633513d1b31c528db4360833fce52f51829" BarId="280198" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.2.25416.109">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.2.25420.109">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
7+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.2.25416.109">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.2.25420.109">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
11+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.2.25416.109">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.2.25420.109">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
15+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.2.25416.109">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.2.25420.109">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
19+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25416.109">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25420.109">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
23+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.7.25317.2">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>8a6c1d81657ef04c040f598cafacf8f5a33abda2</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.2.25416.109">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.2.25420.109">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
31+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.2.25416.109">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.2.25420.109">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
35+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25416.109">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25420.109">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
39+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.2.25416.109">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.2.25420.109">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
43+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.2.25416.109">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.2.25420.109">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
47+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.2.25416.109">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.2.25420.109">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
51+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.2.25416.109">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.2.25420.109">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
55+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.2.25416.109">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.2.25420.109">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
59+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.2.25416.109">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.2.25420.109">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
63+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.2.25416.109">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.2.25420.109">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
67+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.2.25416.109">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.2.25420.109">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
71+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.2.25416.109">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.2.25420.109">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
75+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.2.25416.109">
79+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.2.25420.109">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
81+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25416.109">
83+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25420.109">
8484
<Uri>https://github.com/dotnet/dotnet</Uri>
85-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
85+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
8686
</Dependency>
87-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25416.109">
87+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25420.109">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
89+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25416.109">
91+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25420.109">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
93+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25416.109">
95+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25420.109">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
97+
<Sha>619d5633513d1b31c528db4360833fce52f51829</Sha>
9898
</Dependency>
9999
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
100100
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">

‎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

0 commit comments

Comments
 (0)