Skip to content

Commit fed627b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0.1xx] Source code updates from dotnet/efcore (#4814)
[release/10.0.1xx] Source code updates from dotnet/efcore
1 parent 8f353e6 commit fed627b

File tree

6 files changed

+38
-38
lines changed

6 files changed

+38
-38
lines changed

‎src/efcore/NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-7768201" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-77682011/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-3628157" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-36281576/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!-- Begin: Package sources from dotnet-runtime -->
1010
<!-- End: Package sources from dotnet-runtime -->

‎src/efcore/eng/Version.Details.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26109.113</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26109.113</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26109.113</MicrosoftDotNetHelixSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26110.106</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26110.106</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26110.106</MicrosoftDotNetHelixSdkPackageVersion>
1212
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.4</MicrosoftExtensionsCachingMemoryPackageVersion>
1313
<MicrosoftExtensionsConfigurationPackageVersion>10.0.4</MicrosoftExtensionsConfigurationPackageVersion>
1414
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.4</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
1515
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.4</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
1616
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.4</MicrosoftExtensionsConfigurationJsonPackageVersion>
1717
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.4</MicrosoftExtensionsDependencyInjectionPackageVersion>
1818
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.4</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.4-servicing.26109.113</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.4-servicing.26110.106</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
2020
<MicrosoftExtensionsLoggingPackageVersion>10.0.4</MicrosoftExtensionsLoggingPackageVersion>
2121
<MicrosoftNETCoreAppRefPackageVersion>10.0.4</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>10.0.4-servicing.26109.113</MicrosoftNETCorePlatformsPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>10.0.4-servicing.26110.106</MicrosoftNETCorePlatformsPackageVersion>
2323
<SystemFormatsAsn1PackageVersion>10.0.4</SystemFormatsAsn1PackageVersion>
2424
<SystemRuntimeCachingPackageVersion>10.0.4</SystemRuntimeCachingPackageVersion>
2525
<SystemTextEncodingsWebPackageVersion>10.0.4</SystemTextEncodingsWebPackageVersion>

‎src/efcore/eng/Version.Details.xml‎

Lines changed: 24 additions & 24 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="77682011166986a06fe5ad024536202551c1db39" BarId="301118" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="36281576f371e437e9fafe7ac0732979a2c2ba30" BarId="301172" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.4">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
7+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
88
</Dependency>
99
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.4">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
11+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.4">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
15+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
1616
</Dependency>
1717
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.4">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
19+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
2020
</Dependency>
2121
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.4">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
23+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.4">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
27+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.4">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
31+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.4-servicing.26109.113">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.4-servicing.26110.106">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
35+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
3636
</Dependency>
3737
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.4">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
39+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
4040
</Dependency>
4141
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.4">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
43+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.4-servicing.26109.113">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.4-servicing.26110.106">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
47+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
4848
</Dependency>
4949
<Dependency Name="System.Text.Json" Version="10.0.4">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
51+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
5252
</Dependency>
5353
<Dependency Name="System.Text.Encodings.Web" Version="10.0.4">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
55+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
5656
</Dependency>
5757
<Dependency Name="System.Formats.Asn1" Version="10.0.4">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
59+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
6060
</Dependency>
6161
<Dependency Name="System.Runtime.Caching" Version="10.0.4">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
63+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26109.113">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26110.106">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
69+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26109.113">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26110.106">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
73+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26109.113">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26110.106">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>77682011166986a06fe5ad024536202551c1db39</Sha>
77+
<Sha>36281576f371e437e9fafe7ac0732979a2c2ba30</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

‎src/efcore/eng/common/core-templates/job/source-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,19 @@ jobs:
6060
pool:
6161
${{ if eq(variables['System.TeamProject'], 'public') }}:
6262
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
63-
demands: ImageOverride -equals Azure-Linux-3-Amd64-Public
63+
demands: ImageOverride -equals build.azurelinux.3.amd64.open
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
66-
image: Azure-Linux-3-Amd64
66+
image: build.azurelinux.3.amd64
6767
os: linux
6868
${{ else }}:
6969
pool:
7070
${{ if eq(variables['System.TeamProject'], 'public') }}:
7171
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
72-
demands: ImageOverride -equals Azure-Linux-3-Amd64-Public
72+
demands: ImageOverride -equals build.azurelinux.3.amd64.open
7373
${{ if eq(variables['System.TeamProject'], 'internal') }}:
7474
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
75-
demands: ImageOverride -equals Azure-Linux-3-Amd64
75+
demands: ImageOverride -equals build.azurelinux.3.amd64
7676
${{ if ne(parameters.platform.pool, '') }}:
7777
pool: ${{ parameters.platform.pool }}
7878

‎src/efcore/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.26109.113",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26109.113"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26110.106",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26110.106"
2323
}
2424
}

‎src/source-manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
"commitSha": "73f1fdca8d9fb191297a7e687790b804f4e78ef5"
3838
},
3939
{
40-
"barId": 301150,
40+
"barId": 301428,
4141
"path": "efcore",
4242
"remoteUri": "https://github.com/dotnet/efcore",
43-
"commitSha": "dffd57b4c9aaf5fa91de23133cf9da8605b92c17"
43+
"commitSha": "8267e9401871484321fdced77dfd85c84767e0b4"
4444
},
4545
{
4646
"barId": 298197,

0 commit comments

Comments
 (0)