Skip to content

Commit 8846c0f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#10831)
* Update dependencies from https://github.com/dotnet/dotnet build 266849 * Update dependencies from https://github.com/dotnet/dotnet build 267041 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent e188e35 commit 8846c0f

File tree

4 files changed

+78
-123
lines changed

4 files changed

+78
-123
lines changed

‎eng/Version.Details.xml

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="3b83017bbef1dd0918f7c2f894cfd07f56bcd689" BarId="266652" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="025e4e597746eafc5a736195b66aeb321455d64c" BarId="267041" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.5.25251.105">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.5.25256.101">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
7+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.5.25251.105">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.5.25256.101">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
11+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25251.105">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25256.101">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
15+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25251.105">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25256.101">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
19+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25251.105">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25256.101">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
23+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.5.25222.1">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>462eb030906d5cfcbcbbe22126855da1073cda15</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25251.105">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25256.101">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
31+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25251.105">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25256.101">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
35+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25251.105">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25256.101">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
39+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25251.105">
41+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25256.101">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
43+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
4444
</Dependency>
45-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25251.105">
45+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25256.101">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
47+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
4848
</Dependency>
49-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25251.105">
49+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25256.101">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
51+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25251.105">
53+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25256.101">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
55+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.5.25251.105">
57+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.5.25256.101">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
59+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
6060
</Dependency>
61-
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.5.25251.105">
61+
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.5.25256.101">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
63+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25251.105">
65+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25256.101">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
67+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
6868
</Dependency>
69-
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.5.25251.105">
69+
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.5.25256.101">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
71+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.5.25251.105">
73+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.5.25256.101">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
75+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
7676
</Dependency>
77-
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.5.25251.105">
77+
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.5.25256.101">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
79-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
79+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
8080
</Dependency>
81-
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.5.25251.105">
81+
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.5.25256.101">
8282
<Uri>https://github.com/dotnet/dotnet</Uri>
83-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
83+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25251.105">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25256.101">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
89+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25251.105">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25256.101">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
93+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25251.105">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25256.101">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
97+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25251.105">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25256.101">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
101+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
102102
</Dependency>
103-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25251.105">
103+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25256.101">
104104
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
105+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
106106
</Dependency>
107-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25251.105">
107+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25256.101">
108108
<Uri>https://github.com/dotnet/dotnet</Uri>
109-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
109+
<Sha>025e4e597746eafc5a736195b66aeb321455d64c</Sha>
110110
</Dependency>
111111
</ToolsetDependencies>
112112
</Dependencies>

‎eng/Versions.props

+23-23
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,35 @@
1919
dotnet/winforms is handling versions for the analyzers.
2020
-->
2121
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
22-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25251.105</MicrosoftDotNetCodeAnalysisVersion>
23-
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25251.105</MicrosoftSourceLinkAzureReposGitVersion>
24-
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25251.105</MicrosoftSourceLinkGitHubVersion>
22+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25256.101</MicrosoftDotNetCodeAnalysisVersion>
23+
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25256.101</MicrosoftSourceLinkAzureReposGitVersion>
24+
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25256.101</MicrosoftSourceLinkGitHubVersion>
2525
</PropertyGroup>
2626
<!-- Packages that come from https://github.com/dotnet/winforms -->
2727
<PropertyGroup>
28-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.5.25251.105</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29-
<MicrosoftPrivateWinformsVersion>10.0.0-preview.5.25251.105</MicrosoftPrivateWinformsVersion>
30-
<SystemDrawingCommonVersion>10.0.0-preview.5.25251.105</SystemDrawingCommonVersion>
28+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.5.25256.101</MicrosoftDotnetWinFormsProjectTemplatesVersion>
29+
<MicrosoftPrivateWinformsVersion>10.0.0-preview.5.25256.101</MicrosoftPrivateWinformsVersion>
30+
<SystemDrawingCommonVersion>10.0.0-preview.5.25256.101</SystemDrawingCommonVersion>
3131
</PropertyGroup>
3232
<!-- Packages that come from https://github.com/dotnet/runtime -->
3333
<PropertyGroup>
34-
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25251.105</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
35-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.5.25251.105</MicrosoftNETCoreAppRefVersion>
36-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25251.105</MicrosoftNETCoreAppRuntimewinx64Version>
37-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.5.25251.105</MicrosoftNETCorePlatformsVersion>
38-
<SystemCodeDomPackageVersion>10.0.0-preview.5.25251.105</SystemCodeDomPackageVersion>
39-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25251.105</SystemConfigurationConfigurationManagerPackageVersion>
40-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.5.25251.105</SystemDiagnosticsEventLogPackageVersion>
41-
<SystemDirectoryServicesVersion>10.0.0-preview.5.25251.105</SystemDirectoryServicesVersion>
42-
<SystemFormatsNrbfVersion>10.0.0-preview.5.25251.105</SystemFormatsNrbfVersion>
43-
<SystemIOPackagingVersion>10.0.0-preview.5.25251.105</SystemIOPackagingVersion>
44-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.5.25251.105</SystemReflectionMetadataLoadContextVersion>
34+
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25256.101</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
35+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.5.25256.101</MicrosoftNETCoreAppRefVersion>
36+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25256.101</MicrosoftNETCoreAppRuntimewinx64Version>
37+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.5.25256.101</MicrosoftNETCorePlatformsVersion>
38+
<SystemCodeDomPackageVersion>10.0.0-preview.5.25256.101</SystemCodeDomPackageVersion>
39+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25256.101</SystemConfigurationConfigurationManagerPackageVersion>
40+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.5.25256.101</SystemDiagnosticsEventLogPackageVersion>
41+
<SystemDirectoryServicesVersion>10.0.0-preview.5.25256.101</SystemDirectoryServicesVersion>
42+
<SystemFormatsNrbfVersion>10.0.0-preview.5.25256.101</SystemFormatsNrbfVersion>
43+
<SystemIOPackagingVersion>10.0.0-preview.5.25256.101</SystemIOPackagingVersion>
44+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.5.25256.101</SystemReflectionMetadataLoadContextVersion>
4545
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
46-
<SystemResourcesExtensionsVersion>10.0.0-preview.5.25251.105</SystemResourcesExtensionsVersion>
47-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25251.105</SystemRuntimeSerializationFormattersPackageVersion>
48-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.5.25251.105</SystemSecurityCryptographyXmlPackageVersion>
49-
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25251.105</SystemSecurityPermissionsPackageVersion>
50-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25251.105</SystemWindowsExtensionsPackageVersion>
46+
<SystemResourcesExtensionsVersion>10.0.0-preview.5.25256.101</SystemResourcesExtensionsVersion>
47+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25256.101</SystemRuntimeSerializationFormattersPackageVersion>
48+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.5.25256.101</SystemSecurityCryptographyXmlPackageVersion>
49+
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25256.101</SystemSecurityPermissionsPackageVersion>
50+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25256.101</SystemWindowsExtensionsPackageVersion>
5151
</PropertyGroup>
5252
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
5353
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
@@ -61,7 +61,7 @@
6161
<!-- Packages that come from https://github.com/dotnet/arcade -->
6262
<PropertyGroup>
6363
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
64-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25251.105</MicrosoftDotNetGenAPIVersion>
64+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25256.101</MicrosoftDotNetGenAPIVersion>
6565
</PropertyGroup>
6666
<!-- Sourcelink -->
6767
<PropertyGroup>

‎eng/common/core-templates/steps/source-build.yml

+2-47
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ steps:
1919
set -x
2020
df -h
2121
22-
# If file changes are detected, set CopyWipIntoInnerSourceBuildRepo to copy the WIP changes into the inner source build repo.
23-
internalRestoreArgs=
24-
if ! git diff --quiet; then
25-
internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true'
26-
# The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo.
27-
# This only works if there is a username/email configured, which won't be the case in most CI runs.
28-
git config --get user.email
29-
if [ $? -ne 0 ]; then
30-
git config user.email dn-bot@microsoft.com
31-
git config user.name dn-bot
32-
fi
33-
fi
34-
3522
# If building on the internal project, the internal storage variable may be available (usually only if needed)
3623
# In that case, add variables to allow the download of internal runtimes if the specified versions are not found
3724
# in the default public locations.
@@ -46,11 +33,6 @@ steps:
4633
buildConfig='$(_BuildConfig)'
4734
fi
4835
49-
officialBuildArgs=
50-
if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then
51-
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
52-
fi
53-
5436
targetRidArgs=
5537
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
5638
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
@@ -66,57 +48,30 @@ steps:
6648
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
6749
fi
6850
69-
publishArgs=
70-
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
71-
publishArgs='--publish'
72-
fi
73-
74-
assetManifestFileName=SourceBuild_RidSpecific.xml
75-
if [ '${{ parameters.platform.name }}' != '' ]; then
76-
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
77-
fi
78-
7951
portableBuildArgs=
8052
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
8153
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
8254
fi
8355
8456
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8557
--configuration $buildConfig \
86-
--restore --build --pack $publishArgs -bl \
58+
--restore --build --pack -bl \
8759
${{ parameters.platform.buildArguments }} \
88-
$officialBuildArgs \
8960
$internalRuntimeDownloadArgs \
90-
$internalRestoreArgs \
9161
$targetRidArgs \
9262
$runtimeOsArgs \
9363
$baseOsArgs \
9464
$portableBuildArgs \
9565
/p:DotNetBuildSourceOnly=true \
9666
/p:DotNetBuildRepo=true \
97-
/p:AssetManifestFileName=$assetManifestFileName
9867
displayName: Build
9968

100-
# Upload build logs for diagnosis.
101-
- task: CopyFiles@2
102-
displayName: Prepare BuildLogs staging directory
103-
inputs:
104-
SourceFolder: '$(Build.SourcesDirectory)'
105-
Contents: |
106-
**/*.log
107-
**/*.binlog
108-
artifacts/sb/prebuilt-report/**
109-
TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
110-
CleanTargetFolder: true
111-
continueOnError: true
112-
condition: succeededOrFailed()
113-
11469
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
11570
parameters:
11671
is1ESPipeline: ${{ parameters.is1ESPipeline }}
11772
args:
11873
displayName: Publish BuildLogs
119-
targetPath: '$(Build.StagingDirectory)/BuildLogs'
74+
targetPath: artifacts/log/$[ coalesce(variables._BuildConfig, 'Release') ]/
12075
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
12176
continueOnError: true
12277
condition: succeededOrFailed()

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25251.105",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25251.105",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25256.101",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25256.101",
1919
"Microsoft.Build.NoTargets": "3.7.56"
2020
},
2121
"sdk": {

0 commit comments

Comments
 (0)