Skip to content

Commit 72ee6eb

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#13434)
[main] Source code updates from dotnet/dotnet
1 parent dd514dc commit 72ee6eb

File tree

5 files changed

+90
-92
lines changed

5 files changed

+90
-92
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="5e6dacd4d3debda3266224b2a434811c6fa94987" BarId="267208" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="954d6157c9c22c8d8b4faddef70b2b703c65e77e" BarId="267468" />
1010
<ProductDependencies>
11-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25257.101">
11+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25257.112">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
13+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25257.101">
15+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25257.112">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
17+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25257.101">
19+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25257.112">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
21+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
2222
</Dependency>
23-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25257.101">
23+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25257.112">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
25+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.5.25257.101">
27+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.5.25257.112">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
29+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
3030
</Dependency>
31-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25257.101">
31+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25257.112">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
33+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25257.101">
35+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25257.112">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
37+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
3838
</Dependency>
39-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25257.101">
39+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25257.112">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
41+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
4242
</Dependency>
43-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25257.101">
43+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25257.112">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
45+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
4646
</Dependency>
47-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.5.25257.101">
47+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.5.25257.112">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
49+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25257.101">
51+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25257.112">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
53+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
5454
</Dependency>
55-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25257.101">
55+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25257.112">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
57+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25257.101">
59+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25257.112">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
61+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25257.101">
63+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25257.112">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
65+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
6666
</Dependency>
67-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25257.101">
67+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25257.112">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
69+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.5.25257.101">
71+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.5.25257.112">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
73+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
7474
</Dependency>
75-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25257.101">
75+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25257.112">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
77+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
7878
</Dependency>
79-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25257.101">
79+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25257.112">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
81+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
8282
</Dependency>
83-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25257.101">
83+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25257.112">
8484
<Uri>https://github.com/dotnet/dotnet</Uri>
85-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
85+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
8686
</Dependency>
87-
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.5.25257.101">
87+
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.5.25257.112">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
89+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
9090
</Dependency>
9191
</ProductDependencies>
9292
<ToolsetDependencies>
9393
<!-- Arcade -->
94-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25257.101">
94+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25257.112">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
96+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25257.101">
98+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25257.112">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
100+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25257.101">
102+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25257.112">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
104+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25257.101">
106+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25257.112">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
108+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25257.101">
110+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25257.112">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
112+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25257.101">
114+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25257.112">
115115
<Uri>https://github.com/dotnet/dotnet</Uri>
116-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
116+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</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.25257.101</SystemReflectionMetadataLoadContextVersion>
14-
<SystemTextEncodingsWebVersion>10.0.0-preview.5.25257.101</SystemTextEncodingsWebVersion>
13+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.5.25257.112</SystemReflectionMetadataLoadContextVersion>
14+
<SystemTextEncodingsWebVersion>10.0.0-preview.5.25257.112</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.25257.101</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
19-
<SystemFormatsNrbfPackageVersion>10.0.0-preview.5.25257.101</SystemFormatsNrbfPackageVersion>
20-
<SystemIOHashingPackageVersion>10.0.0-preview.5.25257.101</SystemIOHashingPackageVersion>
18+
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25257.112</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
19+
<SystemFormatsNrbfPackageVersion>10.0.0-preview.5.25257.112</SystemFormatsNrbfPackageVersion>
20+
<SystemIOHashingPackageVersion>10.0.0-preview.5.25257.112</SystemIOHashingPackageVersion>
2121
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
22-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.5.25257.101</MicrosoftNETCoreILDAsmPackageVersion>
22+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-preview.5.25257.112</MicrosoftNETCoreILDAsmPackageVersion>
2323
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.1.0-preview.1.24511.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
24-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25257.101</SystemRuntimeSerializationFormattersPackageVersion>
25-
<SystemTextJsonPackageVersion>10.0.0-preview.5.25257.101</SystemTextJsonPackageVersion>
26-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25257.101</MicrosoftNETCoreAppRefPackageVersion>
27-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.5.25257.101</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
28-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.5.25257.101</MicrosoftNETCorePlatformsPackageVersion>
29-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.5.25257.101</MicrosoftWin32SystemEventsPackageVersion>
30-
<SystemCodeDomPackageVersion>10.0.0-preview.5.25257.101</SystemCodeDomPackageVersion>
31-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25257.101</SystemConfigurationConfigurationManagerPackageVersion>
32-
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.5.25257.101</SystemResourcesExtensionsPackageVersion>
24+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.5.25257.112</SystemRuntimeSerializationFormattersPackageVersion>
25+
<SystemTextJsonPackageVersion>10.0.0-preview.5.25257.112</SystemTextJsonPackageVersion>
26+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25257.112</MicrosoftNETCoreAppRefPackageVersion>
27+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-preview.5.25257.112</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
28+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-preview.5.25257.112</MicrosoftNETCorePlatformsPackageVersion>
29+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-preview.5.25257.112</MicrosoftWin32SystemEventsPackageVersion>
30+
<SystemCodeDomPackageVersion>10.0.0-preview.5.25257.112</SystemCodeDomPackageVersion>
31+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.5.25257.112</SystemConfigurationConfigurationManagerPackageVersion>
32+
<SystemResourcesExtensionsPackageVersion>10.0.0-preview.5.25257.112</SystemResourcesExtensionsPackageVersion>
3333
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.5.25227.101</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25257.101</SystemWindowsExtensionsPackageVersion>
35-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25257.101</MicrosoftNETCoreILAsmPackageVersion>
36-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25257.101</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
37-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25257.101</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
38-
<MicrosoftNETSdkILVersion>10.0.0-preview.5.25257.101</MicrosoftNETSdkILVersion>
34+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.5.25257.112</SystemWindowsExtensionsPackageVersion>
35+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25257.112</MicrosoftNETCoreILAsmPackageVersion>
36+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25257.112</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
37+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-preview.5.25257.112</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
38+
<MicrosoftNETSdkILVersion>10.0.0-preview.5.25257.112</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.25257.101</MicrosoftDotNetGenFacadesPackageVersion>
52-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25257.101</MicrosoftDotNetRemoteExecutorVersion>
53-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25257.101</MicrosoftDotNetXUnitExtensionsPackageVersion>
51+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25257.112</MicrosoftDotNetGenFacadesPackageVersion>
52+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25257.112</MicrosoftDotNetRemoteExecutorVersion>
53+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25257.112</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: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,9 @@ steps:
3838
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
3939
fi
4040
41-
runtimeOsArgs=
42-
if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
43-
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
44-
fi
45-
46-
baseOsArgs=
47-
if [ '${{ parameters.platform.baseOS }}' != '' ]; then
48-
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
41+
baseRidArgs=
42+
if [ '${{ parameters.platform.baseRID }}' != '' ]; then
43+
baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
4944
fi
5045
5146
portableBuildArgs=
@@ -59,8 +54,7 @@ steps:
5954
${{ parameters.platform.buildArguments }} \
6055
$internalRuntimeDownloadArgs \
6156
$targetRidArgs \
62-
$runtimeOsArgs \
63-
$baseOsArgs \
57+
$baseRidArgs \
6458
$portableBuildArgs \
6559
/p:DotNetBuildSourceOnly=true \
6660
/p:DotNetBuildRepo=true \
@@ -71,7 +65,7 @@ steps:
7165
is1ESPipeline: ${{ parameters.is1ESPipeline }}
7266
args:
7367
displayName: Publish BuildLogs
74-
targetPath: artifacts/log/$[ coalesce(variables._BuildConfig, 'Release') ]/
68+
targetPath: artifacts/log/${{ coalesce(variables._BuildConfig, 'Release') }}
7569
artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
7670
continueOnError: true
7771
condition: succeededOrFailed()

‎eng/common/tools.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
# CI mode - set to true on CI server for PR validation build or official build.
66
ci=${ci:-false}
77

8+
# Build mode
9+
source_build=${source_build:-false}
10+
811
# Set to true to use the pipelines logger which will enable Azure logging output.
912
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
1013
# This flag is meant as a temporary opt-opt for the feature while validate it across
@@ -58,7 +61,8 @@ use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
5861
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5962

6063
# True to use global NuGet cache instead of restoring packages to repository-local directory.
61-
if [[ "$ci" == true ]]; then
64+
# Keep in sync with NuGetPackageroot in Arcade SDK's RepositoryLayout.props.
65+
if [[ "$ci" == true || "$source_build" == true ]]; then
6266
use_global_nuget_cache=${use_global_nuget_cache:-false}
6367
else
6468
use_global_nuget_cache=${use_global_nuget_cache:-true}

‎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.25257.101",
18-
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25257.101",
19-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25257.101",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.112",
18+
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25257.112",
19+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25257.112",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
21-
"Microsoft.NET.Sdk.IL": "10.0.0-preview.5.25257.101"
21+
"Microsoft.NET.Sdk.IL": "10.0.0-preview.5.25257.112"
2222
},
2323
"native-tools": {
2424
"cmake": "latest"

0 commit comments

Comments
 (0)