Skip to content

Commit 7d809e7

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/dotnet build 267468
1 parent a72632d commit 7d809e7

File tree

5 files changed

+65
-67
lines changed

5 files changed

+65
-67
lines changed

‎eng/Version.Details.xml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,84 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="5e6dacd4d3debda3266224b2a434811c6fa94987" BarId="267208" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="954d6157c9c22c8d8b4faddef70b2b703c65e77e" BarId="267468" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.5.25257.101">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.5.25257.112">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
7+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.5.25257.101">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.5.25257.112">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
11+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.5.25257.101">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.5.25257.112">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
15+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.5.25257.101">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.5.25257.112">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
19+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.5.25257.101">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.5.25257.112">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
23+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.5.25257.101">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.5.25257.112">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
27+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.5.25257.101">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.5.25257.112">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
31+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.5.25257.101">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.5.25257.112">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
35+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.5.25257.101">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.5.25257.112">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
39+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25257.101">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25257.112">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
43+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
4444
</Dependency>
4545
<!--
4646
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
4747
All Runtime.$rid packages should have the same version.
4848
-->
49-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25257.101">
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25257.112">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
51+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25257.101">
53+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25257.112">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
55+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25257.101">
57+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25257.112">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
59+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.5.25257.101">
61+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.5.25257.112">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
63+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.5.25257.101">
65+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.5.25257.112">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
67+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
6868
</Dependency>
6969
</ProductDependencies>
7070
<ToolsetDependencies>
71-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25257.101">
71+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25257.112">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
73+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25257.101">
75+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25257.112">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
77+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
7878
</Dependency>
79-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25257.101">
79+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25257.112">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>5e6dacd4d3debda3266224b2a434811c6fa94987</Sha>
81+
<Sha>954d6157c9c22c8d8b4faddef70b2b703c65e77e</Sha>
8282
</Dependency>
8383
</ToolsetDependencies>
8484
</Dependencies>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
<UsingToolXliff>False</UsingToolXliff>
1717
</PropertyGroup>
1818
<PropertyGroup Label="Dependencies from dotnet/runtime">
19-
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.5.25257.101</MicrosoftExtensionsCachingMemoryVersion>
20-
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.5.25257.101</MicrosoftExtensionsConfigurationVersion>
21-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.5.25257.101</MicrosoftExtensionsConfigurationAbstractionsVersion>
22-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.5.25257.101</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.5.25257.101</MicrosoftExtensionsConfigurationJsonVersion>
24-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.5.25257.101</MicrosoftExtensionsDependencyInjectionVersion>
25-
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.5.25257.101</MicrosoftExtensionsDependencyModelVersion>
26-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.5.25257.101</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27-
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.5.25257.101</MicrosoftExtensionsLoggingVersion>
28-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.5.25257.101</MicrosoftNETCoreAppRefVersion>
29-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25257.101</MicrosoftNETCoreAppRuntimewinx64Version>
30-
<SystemTextEncodingsWebVersion>10.0.0-preview.5.25257.101</SystemTextEncodingsWebVersion>
31-
<SystemTextJsonVersion>10.0.0-preview.5.25257.101</SystemTextJsonVersion>
32-
<SystemFormatsAsn1Version>10.0.0-preview.5.25257.101</SystemFormatsAsn1Version>
33-
<SystemRuntimeCachingVersion>10.0.0-preview.5.25257.101</SystemRuntimeCachingVersion>
19+
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.5.25257.112</MicrosoftExtensionsCachingMemoryVersion>
20+
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.5.25257.112</MicrosoftExtensionsConfigurationVersion>
21+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.5.25257.112</MicrosoftExtensionsConfigurationAbstractionsVersion>
22+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.5.25257.112</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.5.25257.112</MicrosoftExtensionsConfigurationJsonVersion>
24+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.5.25257.112</MicrosoftExtensionsDependencyInjectionVersion>
25+
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.5.25257.112</MicrosoftExtensionsDependencyModelVersion>
26+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.5.25257.112</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.5.25257.112</MicrosoftExtensionsLoggingVersion>
28+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.5.25257.112</MicrosoftNETCoreAppRefVersion>
29+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25257.112</MicrosoftNETCoreAppRuntimewinx64Version>
30+
<SystemTextEncodingsWebVersion>10.0.0-preview.5.25257.112</SystemTextEncodingsWebVersion>
31+
<SystemTextJsonVersion>10.0.0-preview.5.25257.112</SystemTextJsonVersion>
32+
<SystemFormatsAsn1Version>10.0.0-preview.5.25257.112</SystemFormatsAsn1Version>
33+
<SystemRuntimeCachingVersion>10.0.0-preview.5.25257.112</SystemRuntimeCachingVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25257.101</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25257.112</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<MicrosoftBuildFrameworkVersion>17.13.9</MicrosoftBuildFrameworkVersion>

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.101",
17-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25257.101"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.112",
17+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25257.112"
1818
}
1919
}

0 commit comments

Comments
 (0)