Skip to content

Commit 202d207

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#36263)
[main] Source code updates from dotnet/dotnet
1 parent c8edcc8 commit 202d207

File tree

5 files changed

+58
-59
lines changed

5 files changed

+58
-59
lines changed

‎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="5b760569449a2770617df7a5f0b7e8cbf54f054c" BarId="272212" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="9bcfe617e4f615d6931e2eec47767c3f15116d1d" BarId="272322" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.6.25317.107">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25318.104">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
7+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.6.25317.107">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.7.25318.104">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
11+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.6.25317.107">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25318.104">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
15+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.6.25317.107">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25318.104">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
19+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.6.25317.107">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25318.104">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
23+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.6.25317.107">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25318.104">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
27+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.6.25317.107">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.7.25318.104">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
31+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.6.25317.107">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.7.25318.104">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
35+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.6.25317.107">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25318.104">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
39+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25317.107">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25318.104">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
43+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25317.107">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25318.104">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
47+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.6.25317.107">
49+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25318.104">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
51+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.6.25317.107">
53+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.7.25318.104">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
55+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.6.25317.107">
57+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.7.25318.104">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
59+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.6.25317.107">
61+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.7.25318.104">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
63+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25317.107">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25318.104">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
69+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25317.107">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25318.104">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
73+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25317.107">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25318.104">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>5b760569449a2770617df7a5f0b7e8cbf54f054c</Sha>
77+
<Sha>9bcfe617e4f615d6931e2eec47767c3f15116d1d</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</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.6.25317.107</MicrosoftExtensionsCachingMemoryVersion>
20-
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.6.25317.107</MicrosoftExtensionsConfigurationVersion>
21-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.6.25317.107</MicrosoftExtensionsConfigurationAbstractionsVersion>
22-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.6.25317.107</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.6.25317.107</MicrosoftExtensionsConfigurationJsonVersion>
24-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.6.25317.107</MicrosoftExtensionsDependencyInjectionVersion>
25-
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.6.25317.107</MicrosoftExtensionsDependencyModelVersion>
26-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.6.25317.107</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27-
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25317.107</MicrosoftExtensionsLoggingVersion>
28-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25317.107</MicrosoftNETCoreAppRefVersion>
29-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25317.107</MicrosoftNETCorePlatformsVersion>
30-
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25317.107</SystemTextEncodingsWebVersion>
31-
<SystemTextJsonVersion>10.0.0-preview.6.25317.107</SystemTextJsonVersion>
32-
<SystemFormatsAsn1Version>10.0.0-preview.6.25317.107</SystemFormatsAsn1Version>
33-
<SystemRuntimeCachingVersion>10.0.0-preview.6.25317.107</SystemRuntimeCachingVersion>
19+
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsCachingMemoryVersion>
20+
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsConfigurationVersion>
21+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsConfigurationAbstractionsVersion>
22+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsConfigurationJsonVersion>
24+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsDependencyInjectionVersion>
25+
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsDependencyModelVersion>
26+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.7.25318.104</MicrosoftExtensionsLoggingVersion>
28+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25318.104</MicrosoftNETCoreAppRefVersion>
29+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.7.25318.104</MicrosoftNETCorePlatformsVersion>
30+
<SystemTextEncodingsWebVersion>10.0.0-preview.7.25318.104</SystemTextEncodingsWebVersion>
31+
<SystemTextJsonVersion>10.0.0-preview.7.25318.104</SystemTextJsonVersion>
32+
<SystemFormatsAsn1Version>10.0.0-preview.7.25318.104</SystemFormatsAsn1Version>
33+
<SystemRuntimeCachingVersion>10.0.0-preview.7.25318.104</SystemRuntimeCachingVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25317.107</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25318.104</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.6.25302.104",
3+
"version": "10.0.100-preview.6.25315.102",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor",
66
"paths": [
@@ -10,15 +10,15 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./restore.sh or .\\restore.cmd to install it."
1111
},
1212
"tools": {
13-
"dotnet": "10.0.100-preview.6.25302.104",
13+
"dotnet": "10.0.100-preview.6.25315.102",
1414
"runtimes": {
1515
"dotnet": [
1616
"$(MicrosoftNETCorePlatformsVersion)"
1717
]
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25317.107",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25317.107"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25318.104",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25318.104"
2323
}
2424
}

‎src/dotnet-ef/dotnet-ef.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ dotnet ef database update
7676
</PropertyGroup>
7777

7878
<ItemGroup>
79-
<NuspecProperty Include="packageType=$(PackageType)" />
8079
<NuspecProperty Include="targetFramework=$(TargetFramework)" />
8180
<NuspecProperty Include="SettingsFile=$(_ToolsSettingsFilePath)" />
8281
<!-- https://github.com/dotnet/msbuild/issues/10715. %2A replaces * working around an issue building Linux. -->

‎src/dotnet-ef/dotnet-ef.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
$CommonMetadataElements$
55
<packageTypes>
6-
<packageType name="$packageType$" />
6+
<packageType name="DotnetTool" />
77
</packageTypes>
88
<readme>docs\PACKAGE.md</readme>
99
</metadata>

0 commit comments

Comments
 (0)