Skip to content

Commit 71a8e95

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#13415)
[main] Source code updates from dotnet/dotnet
1 parent fc5d461 commit 71a8e95

File tree

4 files changed

+81
-98
lines changed

4 files changed

+81
-98
lines changed

‎eng/Version.Details.xml

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,114 +6,114 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="3b83017bbef1dd0918f7c2f894cfd07f56bcd689" BarId="266652" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="86c2177121ebf8d49b372dd7232588ceaae6c7cb" BarId="266849" />
1010
<ProductDependencies>
11-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25251.105">
11+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25252.107">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
13+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25251.105">
15+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25252.107">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
17+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25251.105">
19+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25252.107">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
21+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
2222
</Dependency>
23-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25251.105">
23+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25252.107">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
25+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.5.25251.105">
27+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.5.25252.107">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
29+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
3030
</Dependency>
31-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25251.105">
31+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25252.107">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
33+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25251.105">
35+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25252.107">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
37+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
3838
</Dependency>
39-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25251.105">
39+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25252.107">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
41+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
4242
</Dependency>
43-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25251.105">
43+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25252.107">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
45+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
4646
</Dependency>
47-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.5.25251.105">
47+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.5.25252.107">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
49+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25251.105">
51+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25252.107">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
53+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
5454
</Dependency>
55-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25251.105">
55+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25252.107">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
57+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25251.105">
59+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25252.107">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
61+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25251.105">
63+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25252.107">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
65+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
6666
</Dependency>
67-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25251.105">
67+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25252.107">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
69+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.5.25251.105">
71+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.5.25252.107">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
73+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
7474
</Dependency>
75-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25251.105">
75+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25252.107">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
77+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
7878
</Dependency>
79-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25251.105">
79+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25252.107">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
81+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
8282
</Dependency>
83-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25251.105">
83+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25252.107">
8484
<Uri>https://github.com/dotnet/dotnet</Uri>
85-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
85+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
8686
</Dependency>
87-
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.5.25251.105">
87+
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.5.25252.107">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
89+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
9090
</Dependency>
9191
</ProductDependencies>
9292
<ToolsetDependencies>
9393
<!-- Arcade -->
94-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25251.105">
94+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25252.107">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
96+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25251.105">
98+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25252.107">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
100+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25251.105">
102+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25252.107">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
104+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25251.105">
106+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25252.107">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
108+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25251.105">
110+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25252.107">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
112+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25251.105">
114+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25252.107">
115115
<Uri>https://github.com/dotnet/dotnet</Uri>
116-
<Sha>3b83017bbef1dd0918f7c2f894cfd07f56bcd689</Sha>
116+
<Sha>86c2177121ebf8d49b372dd7232588ceaae6c7cb</Sha>
117117
</Dependency>
118118
</ToolsetDependencies>
119119
</Dependencies>

‎eng/Versions.props

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,32 @@
1010
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1111
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1212
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
13-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.5.25251.105</SystemReflectionMetadataLoadContextVersion>
14-
<SystemTextEncodingsWebVersion>10.0.0-preview.5.25251.105</SystemTextEncodingsWebVersion>
13+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.5.25252.107</SystemReflectionMetadataLoadContextVersion>
14+
<SystemTextEncodingsWebVersion>10.0.0-preview.5.25252.107</SystemTextEncodingsWebVersion>
1515
</PropertyGroup>
1616
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
1717
<PropertyGroup>
18-
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25251.105</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
19-
<SystemFormatsNrbfPackageVersion>10.0.0-preview.5.25251.105</SystemFormatsNrbfPackageVersion>
20-
<SystemIOHashingPackageVersion>10.0.0-preview.5.25251.105</SystemIOHashingPackageVersion>
18+
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25252.107</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
19+
<SystemFormatsNrbfPackageVersion>10.0.0-preview.5.25252.107</SystemFormatsNrbfPackageVersion>
20+
<SystemIOHashingPackageVersion>10.0.0-preview.5.25252.107</SystemIOHashingPackageVersion>
2121
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
22-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.5.25251.105</MicrosoftNETCoreILDAsmPackageVersion>
22+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.5.25252.107</MicrosoftNETCoreILDAsmPackageVersion>
2323
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0-preview.1.24511.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
24-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25251.105</SystemRuntimeSerializationFormattersPackageVersion>
25-
<SystemTextJsonPackageVersion>10.0.0-preview.5.25251.105</SystemTextJsonPackageVersion>
26-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25251.105</MicrosoftNETCoreAppRefPackageVersion>
27-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.5.25251.105</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
28-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.5.25251.105</MicrosoftNETCorePlatformsPackageVersion>
29-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.5.25251.105</MicrosoftWin32SystemEventsPackageVersion>
30-
<SystemCodeDomPackageVersion>10.0.0-preview.5.25251.105</SystemCodeDomPackageVersion>
31-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25251.105</SystemConfigurationConfigurationManagerPackageVersion>
32-
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.5.25251.105</SystemResourcesExtensionsPackageVersion>
24+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25252.107</SystemRuntimeSerializationFormattersPackageVersion>
25+
<SystemTextJsonPackageVersion>10.0.0-preview.5.25252.107</SystemTextJsonPackageVersion>
26+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25252.107</MicrosoftNETCoreAppRefPackageVersion>
27+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.5.25252.107</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
28+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.5.25252.107</MicrosoftNETCorePlatformsPackageVersion>
29+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.5.25252.107</MicrosoftWin32SystemEventsPackageVersion>
30+
<SystemCodeDomPackageVersion>10.0.0-preview.5.25252.107</SystemCodeDomPackageVersion>
31+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25252.107</SystemConfigurationConfigurationManagerPackageVersion>
32+
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.5.25252.107</SystemResourcesExtensionsPackageVersion>
3333
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25227.101</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25251.105</SystemWindowsExtensionsPackageVersion>
35-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25251.105</MicrosoftNETCoreILAsmPackageVersion>
36-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25251.105</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
37-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25251.105</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
38-
<MicrosoftNETSdkILVersion>10.0.0-preview.5.25251.105</MicrosoftNETSdkILVersion>
34+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25252.107</SystemWindowsExtensionsPackageVersion>
35+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25252.107</MicrosoftNETCoreILAsmPackageVersion>
36+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25252.107</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
37+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25252.107</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
38+
<MicrosoftNETSdkILVersion>10.0.0-preview.5.25252.107</MicrosoftNETSdkILVersion>
3939
<!--
4040
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
4141
-->
@@ -48,9 +48,9 @@
4848
</PropertyGroup>
4949
<!-- Arcade -->
5050
<PropertyGroup>
51-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25251.105</MicrosoftDotNetGenFacadesPackageVersion>
52-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25251.105</MicrosoftDotNetRemoteExecutorVersion>
53-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25251.105</MicrosoftDotNetXUnitExtensionsPackageVersion>
51+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25252.107</MicrosoftDotNetGenFacadesPackageVersion>
52+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25252.107</MicrosoftDotNetRemoteExecutorVersion>
53+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25252.107</MicrosoftDotNetXUnitExtensionsPackageVersion>
5454
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
5555
</PropertyGroup>
5656
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ steps:
4646
buildConfig='$(_BuildConfig)'
4747
fi
4848
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-
5449
targetRidArgs=
5550
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
5651
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
@@ -66,26 +61,15 @@ steps:
6661
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
6762
fi
6863
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-
7964
portableBuildArgs=
8065
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
8166
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
8267
fi
8368
8469
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8570
--configuration $buildConfig \
86-
--restore --build --pack $publishArgs -bl \
71+
--restore --build --pack -bl \
8772
${{ parameters.platform.buildArguments }} \
88-
$officialBuildArgs \
8973
$internalRuntimeDownloadArgs \
9074
$internalRestoreArgs \
9175
$targetRidArgs \
@@ -94,7 +78,6 @@ steps:
9478
$portableBuildArgs \
9579
/p:DotNetBuildSourceOnly=true \
9680
/p:DotNetBuildRepo=true \
97-
/p:AssetManifestFileName=$assetManifestFileName
9881
displayName: Build
9982

10083
# Upload build logs for diagnosis.

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
"version": "10.0.100-preview.3.25201.16"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25251.105",
18-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25251.105",
19-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25251.105",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25252.107",
18+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25252.107",
19+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25252.107",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
21-
"Microsoft.NET.Sdk.IL": "10.0.0-preview.5.25251.105"
21+
"Microsoft.NET.Sdk.IL": "10.0.0-preview.5.25252.107"
2222
},
2323
"native-tools": {
2424
"cmake": "latest"

0 commit comments

Comments
 (0)