Skip to content

Commit 6081e8c

Browse files
ajcvickersajcvickers
committed
2 parents c06aa79 + 229d1f3 commit 6081e8c

File tree

87 files changed

+2033
-604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+2033
-604
lines changed

‎.github/fabricbot.json‎

Lines changed: 0 additions & 165 deletions
This file was deleted.

‎.github/policies/resourceManagement.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
scheduledSearches: []
11+
eventResponderTasks:
12+
- if:
13+
- payloadType: Pull_Request
14+
- hasLabel:
15+
label: auto-merge
16+
then:
17+
- enableAutoMerge:
18+
mergeMethod: Squash
19+
description: Auto-merge PRs
20+
- if:
21+
- payloadType: Pull_Request
22+
- labelRemoved:
23+
label: auto-merge
24+
then:
25+
- disableAutoMerge
26+
description: Auto-merge PRs
27+
- if:
28+
- payloadType: Pull_Request
29+
- isAction:
30+
action: Opened
31+
- isActivitySender:
32+
user: dotnet-maestro[bot]
33+
issueAuthor: False
34+
- titleContains:
35+
pattern: Update dependencies
36+
isRegex: False
37+
then:
38+
- addLabel:
39+
label: area-infrastructure
40+
- addLabel:
41+
label: 'type-dependency update :arrow_up_small:'
42+
- approvePullRequest:
43+
comment: Auto-approving dependency update.
44+
description: '[Infrastructure PRs] Add area-infrastructure label to dependency update Pull Requests'
45+
- if:
46+
- payloadType: Pull_Request
47+
- isAction:
48+
action: Opened
49+
- isActivitySender:
50+
user: dotnet-maestro-bot
51+
issueAuthor: False
52+
- titleContains:
53+
pattern: Merge branch
54+
isRegex: False
55+
then:
56+
- addLabel:
57+
label: area-infrastructure
58+
- addLabel:
59+
label: 'type-merge forward :fast_forward:'
60+
- approvePullRequest:
61+
comment: Auto-approving branch merge.
62+
- addLabel:
63+
label: auto-merge
64+
description: '[Infrastructure PRs] Add area-infrastructure label to auto-merge Pull Requests'
65+
onFailure:
66+
onSuccess:

‎docs/DailyBuilds.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ Using wildcards will cause NuGet to pull the latest daily build whenever package
7979

8080
You can use your IDE to choose the latest version. For example, in Visual Studio:
8181

82-
![image](![image](https://github.com/dotnet/efcore/assets/1430078/9a54546b-f969-4409-868b-0fa675b162c6))
82+
![Pick the daily build to use inside your IDE.](https://github.com/dotnet/efcore/assets/1430078/925aebff-fc88-4812-8cab-a3c4c29e8b94)
8383

8484
Alternately, your IDE might provide auto-completion directly in the .csproj file:
8585

86-
![image](https://user-images.githubusercontent.com/1430078/92645046-1d142900-f299-11ea-9e40-c2b1fe1f61c1.png)
86+
![Use auto-completion in the csproj file, if supported by your IDE.](https://user-images.githubusercontent.com/1430078/92645046-1d142900-f299-11ea-9e40-c2b1fe1f61c1.png)
8787

8888
## What about Visual Studio and the SDK?
8989

‎eng/Version.Details.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.2.24079.2">
4+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.2.24105.2">
55
<Uri>https://github.com/dotnet/runtime</Uri>
6-
<Sha>ce7c2225237f00efb8709f672280b4a345c4485c</Sha>
6+
<Sha>bdc031f53b9d24b5f3229badbb1d0b3b9e1e1fd9</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-preview.2.24079.2">
8+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-preview.2.24105.2">
99
<Uri>https://github.com/dotnet/runtime</Uri>
10-
<Sha>ce7c2225237f00efb8709f672280b4a345c4485c</Sha>
10+
<Sha>bdc031f53b9d24b5f3229badbb1d0b3b9e1e1fd9</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.2.24079.2">
12+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.2.24105.2">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>ce7c2225237f00efb8709f672280b4a345c4485c</Sha>
14+
<Sha>bdc031f53b9d24b5f3229badbb1d0b3b9e1e1fd9</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.2.24079.2">
16+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.2.24105.2">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>ce7c2225237f00efb8709f672280b4a345c4485c</Sha>
18+
<Sha>bdc031f53b9d24b5f3229badbb1d0b3b9e1e1fd9</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-preview.2.24079.2">
20+
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-preview.2.24105.2">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>ce7c2225237f00efb8709f672280b4a345c4485c</Sha>
22+
<Sha>bdc031f53b9d24b5f3229badbb1d0b3b9e1e1fd9</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.2.24079.2">
24+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.2.24105.2">
2525
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>ce7c2225237f00efb8709f672280b4a345c4485c</Sha>
26+
<Sha>bdc031f53b9d24b5f3229badbb1d0b3b9e1e1fd9</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.2.24079.2">
28+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.2.24105.2">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>ce7c2225237f00efb8709f672280b4a345c4485c</Sha>
30+
<Sha>bdc031f53b9d24b5f3229badbb1d0b3b9e1e1fd9</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-preview.2.24079.2">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-preview.2.24105.2">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>ce7c2225237f00efb8709f672280b4a345c4485c</Sha>
34+
<Sha>bdc031f53b9d24b5f3229badbb1d0b3b9e1e1fd9</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.2.24079.2">
36+
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.2.24105.2">
3737
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>ce7c2225237f00efb8709f672280b4a345c4485c</Sha>
38+
<Sha>bdc031f53b9d24b5f3229badbb1d0b3b9e1e1fd9</Sha>
3939
</Dependency>
40-
<Dependency Name="System.Text.Json" Version="9.0.0-preview.2.24079.2">
40+
<Dependency Name="System.Text.Json" Version="9.0.0-preview.2.24105.2">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>ce7c2225237f00efb8709f672280b4a345c4485c</Sha>
42+
<Sha>bdc031f53b9d24b5f3229badbb1d0b3b9e1e1fd9</Sha>
4343
</Dependency>
4444
</ProductDependencies>
4545
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
<UsingToolXliff>False</UsingToolXliff>
1717
</PropertyGroup>
1818
<PropertyGroup Label="Dependencies from dotnet/runtime">
19-
<MicrosoftExtensionsCachingMemoryVersion>9.0.0-preview.2.24079.2</MicrosoftExtensionsCachingMemoryVersion>
20-
<MicrosoftExtensionsConfigurationVersion>9.0.0-preview.2.24079.2</MicrosoftExtensionsConfigurationVersion>
21-
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-preview.2.24079.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
22-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-preview.2.24079.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23-
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0-preview.2.24079.2</MicrosoftExtensionsConfigurationJsonVersion>
24-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0-preview.2.24079.2</MicrosoftExtensionsDependencyInjectionVersion>
25-
<MicrosoftExtensionsDependencyModelVersion>9.0.0-preview.2.24079.2</MicrosoftExtensionsDependencyModelVersion>
26-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-preview.2.24079.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27-
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.2.24079.2</MicrosoftExtensionsLoggingVersion>
28-
<SystemTextJsonVersion>9.0.0-preview.2.24079.2</SystemTextJsonVersion>
19+
<MicrosoftExtensionsCachingMemoryVersion>9.0.0-preview.2.24105.2</MicrosoftExtensionsCachingMemoryVersion>
20+
<MicrosoftExtensionsConfigurationVersion>9.0.0-preview.2.24105.2</MicrosoftExtensionsConfigurationVersion>
21+
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-preview.2.24105.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
22+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-preview.2.24105.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23+
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0-preview.2.24105.2</MicrosoftExtensionsConfigurationJsonVersion>
24+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0-preview.2.24105.2</MicrosoftExtensionsDependencyInjectionVersion>
25+
<MicrosoftExtensionsDependencyModelVersion>9.0.0-preview.2.24105.2</MicrosoftExtensionsDependencyModelVersion>
26+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-preview.2.24105.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.2.24105.2</MicrosoftExtensionsLoggingVersion>
28+
<SystemTextJsonVersion>9.0.0-preview.2.24105.2</SystemTextJsonVersion>
2929
</PropertyGroup>
3030
<PropertyGroup Label="Dependencies from dotnet/arcade">
3131
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksTemplatingVersion>

‎src/EFCore.InMemory/ValueGeneration/Internal/InMemoryValueGeneratorSelector.cs‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,30 @@ public InMemoryValueGeneratorSelector(
3535
/// any release. You should only use it directly in your code with extreme caution and knowing that
3636
/// doing so can result in application failures when updating to a new Entity Framework Core release.
3737
/// </summary>
38-
public override ValueGenerator Select(IProperty property, ITypeBase typeBase)
39-
=> property.GetValueGeneratorFactory() == null
40-
&& property.ClrType.IsInteger()
41-
&& property.ClrType.UnwrapNullableType() != typeof(char)
42-
? GetOrCreate(property)
43-
: base.Select(property, typeBase);
38+
[Obsolete("Use TrySelect and throw if needed when the generator is not found.")]
39+
public override ValueGenerator? Select(IProperty property, ITypeBase typeBase)
40+
{
41+
if (TrySelect(property, typeBase, out var valueGenerator))
42+
{
43+
return valueGenerator;
44+
}
45+
46+
throw new NotSupportedException(
47+
CoreStrings.NoValueGenerator(property.Name, property.DeclaringType.DisplayName(), property.ClrType.ShortDisplayName()));
48+
}
4449

4550
/// <summary>
4651
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
4752
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
4853
/// any release. You should only use it directly in your code with extreme caution and knowing that
4954
/// doing so can result in application failures when updating to a new Entity Framework Core release.
5055
/// </summary>
51-
private ValueGenerator GetOrCreate(IProperty property)
52-
{
53-
var type = property.ClrType.UnwrapNullableType().UnwrapEnumType();
54-
if (FindGenerator(property, type, out var valueGenerator))
55-
{
56-
return valueGenerator!;
57-
}
58-
59-
throw new ArgumentException(
60-
CoreStrings.InvalidValueGeneratorFactoryProperty(
61-
"InMemoryIntegerValueGeneratorFactory", property.Name, property.DeclaringType.DisplayName()));
62-
}
56+
public override bool TrySelect(IProperty property, ITypeBase typeBase, out ValueGenerator? valueGenerator)
57+
=> property.GetValueGeneratorFactory() == null
58+
&& property.ClrType.IsInteger()
59+
&& property.ClrType.UnwrapNullableType() != typeof(char)
60+
? FindGenerator(property, property.ClrType.UnwrapNullableType().UnwrapEnumType(), out valueGenerator)
61+
: base.TrySelect(property, typeBase, out valueGenerator);
6362

6463
private bool FindGenerator(IProperty property, Type type, out ValueGenerator? valueGenerator)
6564
{

0 commit comments

Comments
 (0)