Skip to content

Commit 050591e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 283828 (#36826)
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25467.107 -> 10.0.0-beta.25468.104) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.2.25467.107 -> 10.0.0-rc.2.25468.104) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 327fe2c commit 050591e

File tree

5 files changed

+67
-58
lines changed

5 files changed

+67
-58
lines changed

‎eng/Version.Details.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25467.107</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25467.107</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25467.107</MicrosoftDotNetHelixSdkPackageVersion>
12-
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.2.25467.107</MicrosoftExtensionsCachingMemoryPackageVersion>
13-
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.2.25467.107</MicrosoftExtensionsConfigurationPackageVersion>
14-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.2.25467.107</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.2.25467.107</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16-
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.2.25467.107</MicrosoftExtensionsConfigurationJsonPackageVersion>
17-
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.2.25467.107</MicrosoftExtensionsDependencyInjectionPackageVersion>
18-
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.2.25467.107</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.2.25467.107</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20-
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.2.25467.107</MicrosoftExtensionsLoggingPackageVersion>
21-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25467.107</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25467.107</MicrosoftNETCorePlatformsPackageVersion>
23-
<SystemFormatsAsn1PackageVersion>10.0.0-rc.2.25467.107</SystemFormatsAsn1PackageVersion>
24-
<SystemRuntimeCachingPackageVersion>10.0.0-rc.2.25467.107</SystemRuntimeCachingPackageVersion>
25-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.2.25467.107</SystemTextEncodingsWebPackageVersion>
26-
<SystemTextJsonPackageVersion>10.0.0-rc.2.25467.107</SystemTextJsonPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25468.104</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25468.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25468.104</MicrosoftDotNetHelixSdkPackageVersion>
12+
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.2.25468.104</MicrosoftExtensionsCachingMemoryPackageVersion>
13+
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.2.25468.104</MicrosoftExtensionsConfigurationPackageVersion>
14+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.2.25468.104</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.2.25468.104</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16+
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.2.25468.104</MicrosoftExtensionsConfigurationJsonPackageVersion>
17+
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.2.25468.104</MicrosoftExtensionsDependencyInjectionPackageVersion>
18+
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.2.25468.104</MicrosoftExtensionsDependencyModelPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.2.25468.104</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20+
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.2.25468.104</MicrosoftExtensionsLoggingPackageVersion>
21+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25468.104</MicrosoftNETCoreAppRefPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25468.104</MicrosoftNETCorePlatformsPackageVersion>
23+
<SystemFormatsAsn1PackageVersion>10.0.0-rc.2.25468.104</SystemFormatsAsn1PackageVersion>
24+
<SystemRuntimeCachingPackageVersion>10.0.0-rc.2.25468.104</SystemRuntimeCachingPackageVersion>
25+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.2.25468.104</SystemTextEncodingsWebPackageVersion>
26+
<SystemTextJsonPackageVersion>10.0.0-rc.2.25468.104</SystemTextJsonPackageVersion>
2727
</PropertyGroup>
2828
<!--Property group for alternate package version names-->
2929
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="e533cfad385ba4f0ec96e35ad3d485dc13581906" BarId="283666" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="2dea164f01d307c409cfe0d0ee5cb8a0691e3c94" BarId="283828" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.2.25467.107">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.2.25468.104">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
7+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.2.25467.107">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.2.25468.104">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
11+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.2.25467.107">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.2.25468.104">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
15+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.2.25467.107">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.2.25468.104">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
19+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25467.107">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25468.104">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
23+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25467.107">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25468.104">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
27+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.2.25467.107">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.2.25468.104">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
31+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.2.25467.107">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.2.25468.104">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
35+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.2.25467.107">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.2.25468.104">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
39+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25467.107">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25468.104">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
43+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25467.107">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25468.104">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
47+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.2.25467.107">
49+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.2.25468.104">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
51+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.2.25467.107">
53+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.2.25468.104">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
55+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.2.25467.107">
57+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.2.25468.104">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
59+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.2.25467.107">
61+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.2.25468.104">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
63+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25467.107">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25468.104">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
69+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25467.107">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25468.104">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
73+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25467.107">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25468.104">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>e533cfad385ba4f0ec96e35ad3d485dc13581906</Sha>
77+
<Sha>2dea164f01d307c409cfe0d0ee5cb8a0691e3c94</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ parameters:
4040

4141
repositoryAlias: self
4242

43+
officialBuildId: ''
44+
4345
jobs:
4446
- job: Asset_Registry_Publish
4547

@@ -62,6 +64,11 @@ jobs:
6264
value: false
6365
# unconditional - needed for logs publishing (redactor tool version)
6466
- template: /eng/common/core-templates/post-build/common-variables.yml
67+
- name: OfficialBuildId
68+
${{ if ne(parameters.officialBuildId, '') }}:
69+
value: ${{ parameters.officialBuildId }}
70+
${{ else }}:
71+
value: $(Build.BuildNumber)
6572

6673
pool:
6774
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -124,7 +131,7 @@ jobs:
124131
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
125132
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
126133
/p:MaestroApiEndpoint=https://maestro.dot.net
127-
/p:OfficialBuildId=$(Build.BuildNumber)
134+
/p:OfficialBuildId=$(OfficialBuildId)
128135
condition: ${{ parameters.condition }}
129136
continueOnError: ${{ parameters.continueOnError }}
130137

‎eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ parameters:
4444
artifacts: {}
4545
is1ESPipeline: ''
4646
repositoryAlias: self
47+
officialBuildId: ''
4748

4849
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4950
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -116,3 +117,4 @@ jobs:
116117
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
117118
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
118119
repositoryAlias: ${{ parameters.repositoryAlias }}
120+
officialBuildId: ${{ parameters.officialBuildId }}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25467.107",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25467.107"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25468.104"
2323
}
2424
}

0 commit comments

Comments
 (0)