Skip to content

Commit 0103132

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into dev/Jason/mergeToMain
2 parents 5161a4c + 572a433 commit 0103132

File tree

90 files changed

+893
-839
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+893
-839
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.24609.2",
6+
"version": "1.1.0-beta.24613.2",
77
"commands": [
88
"darc"
99
]

‎documentation/package-table.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -163,21 +163,6 @@ Reference notes:
163163
[linux-arm64-targz-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz
164164
[linux-arm64-targz-checksum-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha512
165165

166-
[rhel-6-badge-main]: https://aka.ms/dotnet/10.0.1xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache
167-
[rhel-6-version-main]: https://aka.ms/dotnet/10.0.1xx/daily/productCommit-rhel.6-x64.txt
168-
[rhel-6-targz-main]: https://aka.ms/dotnet/10.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
169-
[rhel-6-targz-checksum-main]: https://aka.ms/dotnet/10.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha512
170-
171-
[rhel-6-badge-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache
172-
[rhel-6-version-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/productCommit-rhel.6-x64.txt
173-
[rhel-6-targz-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
174-
[rhel-6-targz-checksum-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha512
175-
176-
[rhel-6-badge-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache
177-
[rhel-6-version-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/productCommit-rhel.6-x64.txt
178-
[rhel-6-targz-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
179-
[rhel-6-targz-checksum-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha512
180-
181166
[linux-musl-x64-badge-main]: https://aka.ms/dotnet/10.0.1xx/daily/linux_musl_x64_Release_version_badge.svg?no-cache
182167
[linux-musl-x64-version-main]: https://aka.ms/dotnet/10.0.1xx/daily/productCommit-linux-musl-x64.txt
183168
[linux-musl-x64-targz-main]: https://aka.ms/dotnet/10.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz

‎eng/Version.Details.xml

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

‎eng/Versions.props

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</PropertyGroup>
7676
<PropertyGroup>
7777
<!-- Dependency from https://github.com/dotnet/arcade-services -->
78-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24609.2</MicrosoftDotNetDarcLibVersion>
78+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24613.2</MicrosoftDotNetDarcLibVersion>
7979
</PropertyGroup>
8080
<PropertyGroup>
8181
<!-- Dependency from https://github.com/dotnet/aspire -->
@@ -87,43 +87,43 @@
8787
</PropertyGroup>
8888
<PropertyGroup>
8989
<!-- Dependencies from https://github.com/dotnet/runtime -->
90-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24612.1</MicrosoftNETCoreAppRefPackageVersion>
91-
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24612.1</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
92-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24612.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
93-
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-alpha.1.24612.1</MicrosoftExtensionsDependencyModelPackageVersion>
94-
<MicrosoftNETHostModelVersion>10.0.0-alpha.1.24612.1</MicrosoftNETHostModelVersion>
95-
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-alpha.1.24612.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
96-
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-alpha.1.24612.1</MicrosoftExtensionsLoggingAbstractionsVersion>
97-
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-alpha.1.24612.1</MicrosoftExtensionsLoggingConsoleVersion>
98-
<MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24612.1</MicrosoftExtensionsLoggingVersion>
99-
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24612.1</MicrosoftNETILLinkTasksPackageVersion>
100-
<SystemServiceProcessServiceControllerVersion>10.0.0-alpha.1.24612.1</SystemServiceProcessServiceControllerVersion>
90+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24616.1</MicrosoftNETCoreAppRefPackageVersion>
91+
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24616.1</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
92+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24616.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
93+
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-alpha.1.24616.1</MicrosoftExtensionsDependencyModelPackageVersion>
94+
<MicrosoftNETHostModelVersion>10.0.0-alpha.1.24616.1</MicrosoftNETHostModelVersion>
95+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-alpha.1.24616.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
96+
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-alpha.1.24616.1</MicrosoftExtensionsLoggingAbstractionsVersion>
97+
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-alpha.1.24616.1</MicrosoftExtensionsLoggingConsoleVersion>
98+
<MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24616.1</MicrosoftExtensionsLoggingVersion>
99+
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24616.1</MicrosoftNETILLinkTasksPackageVersion>
100+
<SystemServiceProcessServiceControllerVersion>10.0.0-alpha.1.24616.1</SystemServiceProcessServiceControllerVersion>
101101
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
102-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-alpha.1.24612.1</MicrosoftNETCorePlatformsPackageVersion>
103-
<VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-alpha.1.24612.1</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
104-
<MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-alpha.1.24612.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
105-
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-alpha.1.24612.1</MicrosoftBclAsyncInterfacesPackageVersion>
106-
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-alpha.1.24612.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
107-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-alpha.1.24612.1</MicrosoftWin32SystemEventsPackageVersion>
102+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-alpha.1.24616.1</MicrosoftNETCorePlatformsPackageVersion>
103+
<VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-alpha.1.24616.1</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
104+
<MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-alpha.1.24616.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
105+
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-alpha.1.24616.1</MicrosoftBclAsyncInterfacesPackageVersion>
106+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-alpha.1.24616.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
107+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-alpha.1.24616.1</MicrosoftWin32SystemEventsPackageVersion>
108108
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
109-
<SystemCodeDomPackageVersion>10.0.0-alpha.1.24612.1</SystemCodeDomPackageVersion>
110-
<SystemCompositionAttributedModelPackageVersion>10.0.0-alpha.1.24612.1</SystemCompositionAttributedModelPackageVersion>
111-
<SystemCompositionConventionPackageVersion>10.0.0-alpha.1.24612.1</SystemCompositionConventionPackageVersion>
112-
<SystemCompositionHostingPackageVersion>10.0.0-alpha.1.24612.1</SystemCompositionHostingPackageVersion>
113-
<SystemCompositionRuntimePackageVersion>10.0.0-alpha.1.24612.1</SystemCompositionRuntimePackageVersion>
114-
<SystemCompositionTypedPartsPackageVersion>10.0.0-alpha.1.24612.1</SystemCompositionTypedPartsPackageVersion>
115-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-alpha.1.24612.1</SystemConfigurationConfigurationManagerPackageVersion>
116-
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.24612.1</SystemReflectionMetadataLoadContextVersion>
117-
<SystemResourcesExtensionsPackageVersion>10.0.0-alpha.1.24612.1</SystemResourcesExtensionsPackageVersion>
118-
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0-alpha.1.24612.1</SystemSecurityCryptographyPkcsPackageVersion>
119-
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-alpha.1.24612.1</SystemSecurityCryptographyProtectedDataPackageVersion>
120-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24612.1</SystemSecurityCryptographyXmlPackageVersion>
121-
<SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24612.1</SystemSecurityPermissionsPackageVersion>
122-
<SystemTextEncodingCodePagesPackageVersion>10.0.0-alpha.1.24612.1</SystemTextEncodingCodePagesPackageVersion>
123-
<SystemTextJsonPackageVersion>10.0.0-alpha.1.24612.1</SystemTextJsonPackageVersion>
124-
<SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24612.1</SystemWindowsExtensionsPackageVersion>
125-
<SystemIOHashingPackageVersion>10.0.0-alpha.1.24612.1</SystemIOHashingPackageVersion>
126-
<SystemFormatsAsn1Version>10.0.0-alpha.1.24612.1</SystemFormatsAsn1Version>
109+
<SystemCodeDomPackageVersion>10.0.0-alpha.1.24616.1</SystemCodeDomPackageVersion>
110+
<SystemCompositionAttributedModelPackageVersion>10.0.0-alpha.1.24616.1</SystemCompositionAttributedModelPackageVersion>
111+
<SystemCompositionConventionPackageVersion>10.0.0-alpha.1.24616.1</SystemCompositionConventionPackageVersion>
112+
<SystemCompositionHostingPackageVersion>10.0.0-alpha.1.24616.1</SystemCompositionHostingPackageVersion>
113+
<SystemCompositionRuntimePackageVersion>10.0.0-alpha.1.24616.1</SystemCompositionRuntimePackageVersion>
114+
<SystemCompositionTypedPartsPackageVersion>10.0.0-alpha.1.24616.1</SystemCompositionTypedPartsPackageVersion>
115+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-alpha.1.24616.1</SystemConfigurationConfigurationManagerPackageVersion>
116+
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.24616.1</SystemReflectionMetadataLoadContextVersion>
117+
<SystemResourcesExtensionsPackageVersion>10.0.0-alpha.1.24616.1</SystemResourcesExtensionsPackageVersion>
118+
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0-alpha.1.24616.1</SystemSecurityCryptographyPkcsPackageVersion>
119+
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-alpha.1.24616.1</SystemSecurityCryptographyProtectedDataPackageVersion>
120+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24616.1</SystemSecurityCryptographyXmlPackageVersion>
121+
<SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24616.1</SystemSecurityPermissionsPackageVersion>
122+
<SystemTextEncodingCodePagesPackageVersion>10.0.0-alpha.1.24616.1</SystemTextEncodingCodePagesPackageVersion>
123+
<SystemTextJsonPackageVersion>10.0.0-alpha.1.24616.1</SystemTextJsonPackageVersion>
124+
<SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24616.1</SystemWindowsExtensionsPackageVersion>
125+
<SystemIOHashingPackageVersion>10.0.0-alpha.1.24616.1</SystemIOHashingPackageVersion>
126+
<SystemFormatsAsn1Version>10.0.0-alpha.1.24616.1</SystemFormatsAsn1Version>
127127
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
128128
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
129129
<MicrosoftBclAsyncInterfacesToolsetPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetPackageVersion>
@@ -163,8 +163,8 @@
163163
</PropertyGroup>
164164
<PropertyGroup>
165165
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
166-
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24605.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
167-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.24605.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
166+
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24616.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
167+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.24616.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
168168
</PropertyGroup>
169169
<PropertyGroup>
170170
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -205,7 +205,7 @@
205205
</PropertyGroup>
206206
<PropertyGroup>
207207
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
208-
<MicrosoftFSharpCompilerPackageVersion>13.9.200-beta.24612.2</MicrosoftFSharpCompilerPackageVersion>
208+
<MicrosoftFSharpCompilerPackageVersion>13.9.200-beta.24616.2</MicrosoftFSharpCompilerPackageVersion>
209209
</PropertyGroup>
210210
<PropertyGroup>
211211
<!-- Dependencies from https://github.com/dotnet/roslyn -->
@@ -220,19 +220,19 @@
220220
</PropertyGroup>
221221
<PropertyGroup>
222222
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
223-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRefPackageVersion>
224-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
225-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
226-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
227-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
228-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
229-
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreTestHostPackageVersion>
230-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
231-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
232-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24611.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
233-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24611.1</dotnetdevcertsPackageVersion>
234-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24611.1</dotnetuserjwtsPackageVersion>
235-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24611.1</dotnetusersecretsPackageVersion>
223+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreAppRefPackageVersion>
224+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
225+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
226+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
227+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
228+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
229+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreTestHostPackageVersion>
230+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
231+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
232+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24614.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
233+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24614.1</dotnetdevcertsPackageVersion>
234+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24614.1</dotnetuserjwtsPackageVersion>
235+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24614.1</dotnetusersecretsPackageVersion>
236236
</PropertyGroup>
237237
<PropertyGroup>
238238
<!-- Dependencies from https://github.com/dotnet/razor -->

‎eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 31 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,13 @@ jobs:
432432
displayName: Build
433433
workingDirectory: $(sourcesPath)
434434
435+
- ${{ if ne(parameters.runOnline, 'True' )}}:
436+
- script: |
437+
set -ex
438+
# Update the owner of the staging directory to the current user
439+
sudo chown -R $(whoami) $(artifactsStagingDir)
440+
displayName: Update owner of artifacts staging directory
441+
435442
# Only run tests if enabled
436443
- ${{ if eq(parameters.runTests, 'True') }}:
437444
# Setup the NuGet sources used by the tests to use private feeds. This is necessary when testing internal-only product
@@ -496,70 +503,30 @@ jobs:
496503
displayName: Run Tests
497504
timeoutInMinutes: ${{ variables.runTestsTimeout }}
498505
499-
- ${{ if eq(parameters.targetOS, 'windows') }}:
500-
501-
# Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph.
502-
- powershell: |
503-
function CopyWithRelativeFolders($sourcePath, $targetFolder, $filter) {
504-
Get-ChildItem -Path $sourcePath -Filter $filter -Recurse | ForEach-Object {
505-
$targetPath = Join-Path $targetFolder (Resolve-Path -Relative $_.FullName)
506-
New-Item -ItemType Directory -Path (Split-Path -Parent $targetPath) -Force | Out-Null
507-
Copy-Item $_.FullName -Destination $targetPath -Force
508-
Write-Host "Copied $_ to $targetPath"
509-
}
510-
}
511-
512-
$targetFolder = "$(Build.ArtifactStagingDirectory)/BuildLogs/"
513-
New-Item -ItemType Directory -Path $targetFolder -Force | Out-Null
514-
515-
cd "$(sourcesPath)"
516-
517-
CopyWithRelativeFolders "artifacts/log/" $targetFolder "*"
518-
519-
if (Test-Path "artifacts/scenario-tests/") {
520-
CopyWithRelativeFolders "artifacts/scenario-tests/" $targetFolder "*.binlog"
521-
echo "##vso[task.setvariable variable=hasScenarioTestResults]true"
522-
}
523-
524-
if (Test-Path "artifacts/TestResults/*") {
525-
CopyWithRelativeFolders "artifacts/TestResults/" $targetFolder "*.binlog"
526-
CopyWithRelativeFolders "artifacts/TestResults/" $targetFolder "*.diff"
527-
CopyWithRelativeFolders "artifacts/TestResults/" $targetFolder "Updated*.txt"
528-
CopyWithRelativeFolders "artifacts/TestResults/" $targetFolder "*.trx"
529-
}
530-
displayName: Prepare BuildLogs staging directory and check assets
531-
continueOnError: true
532-
condition: succeededOrFailed()
533-
534-
- ${{ else }}:
535-
536-
# Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph.
537-
- script: |
538-
set -ex
539-
540-
targetFolder=$(Build.ArtifactStagingDirectory)/BuildLogs/
541-
mkdir -p ${targetFolder}
542-
543-
cd "$(sourcesPath)"
544-
545-
find artifacts/log/ -exec cp --parents {} ${targetFolder} \;
546-
547-
if [ -d "artifacts/scenario-tests/" ]; then
548-
find artifacts/scenario-tests/ -type f -name "*.binlog" -exec cp --parents {} ${targetFolder} \;
549-
echo "##vso[task.setvariable variable=hasScenarioTestResults]true"
550-
fi
551-
552-
if [ -d "artifacts/TestResults/" ]; then
553-
find artifacts/TestResults/ -type f -name "*.binlog" -exec cp --parents {} ${targetFolder} \;
554-
find artifacts/TestResults/ -type f -name "*.diff" -exec cp --parents {} ${targetFolder} \;
555-
find artifacts/TestResults/ -type f -name "Updated*.txt" -exec cp --parents {} ${targetFolder} \;
556-
find artifacts/TestResults/ -type f -name "*.trx" -exec cp --parents {} ${targetFolder} \;
557-
fi
558-
559-
if [[ "${{ parameters.buildSourceOnly }}" == "True" ]]; then
560-
find artifacts/prebuilt-report/ -exec cp --parents {} ${targetFolder} \;
561-
fi
562-
displayName: Prepare BuildLogs staging directory and check assets
506+
- task: CopyFiles@2
507+
displayName: Prepare BuildLogs staging directory
508+
inputs:
509+
SourceFolder: '$(sourcesPath)'
510+
Contents: |
511+
artifacts/log/**
512+
artifacts/scenario-tests/**/*.binlog
513+
artifacts/TestResults/**/*.binlog
514+
artifacts/TestResults/**/*.diff
515+
artifacts/TestResults/**/Updated*.txt
516+
artifacts/TestResults/**/*.trx
517+
artifacts/TestResults/**/*.xml
518+
TargetFolder: '$(Build.ArtifactStagingDirectory)/BuildLogs'
519+
CleanTargetFolder: true
520+
continueOnError: true
521+
condition: succeededOrFailed()
522+
523+
- ${{ if eq(parameters.buildSourceOnly, 'True') }}:
524+
- task: CopyFiles@2
525+
displayName: Copy prebuilt-report to BuildLogs
526+
inputs:
527+
SourceFolder: '$(sourcesPath)'
528+
Contents: artifacts/prebuilt-report/**
529+
TargetFolder: '$(Build.ArtifactStagingDirectory)/BuildLogs'
563530
continueOnError: true
564531
condition: succeededOrFailed()
565532

0 commit comments

Comments
 (0)