Skip to content

Commit 035932d

Browse files
authored
Merge branch 'release/9.0' into merge/release/8.0-to-release/9.0
2 parents 2042519 + 32f03a4 commit 035932d

File tree

3,842 files changed

+373970
-179564
lines changed

Some content is hidden

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

3,842 files changed

+373970
-179564
lines changed

.config/guardian/.gdnbaselines

-33
This file was deleted.

.editorconfig

+6-6
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ csharp_style_var_elsewhere = true:suggestion
9191

9292
# Expression-bodied members
9393
# Explicitly disabled due to difference in coding style between source and tests
94-
#csharp_style_expression_bodied_methods = false:silent
95-
#csharp_style_expression_bodied_constructors = false:silent
96-
csharp_style_expression_bodied_operators = false:silent
94+
csharp_style_expression_bodied_methods = true:suggestion
95+
csharp_style_expression_bodied_constructors = true:suggestion
96+
csharp_style_expression_bodied_operators = true:suggestion
9797
csharp_style_expression_bodied_properties = true:suggestion
9898
csharp_style_expression_bodied_indexers = true:suggestion
9999
csharp_style_expression_bodied_accessors = true:suggestion
@@ -117,6 +117,9 @@ csharp_style_conditional_delegate_call = true:suggestion
117117
# Code block preferences
118118
csharp_prefer_braces = true:suggestion
119119

120+
# Primary constructors
121+
csharp_style_prefer_primary_constructors = true:suggestion
122+
120123
## Formatting conventions
121124
# Dotnet formatting settings:
122125
[*.{cs,vb}]
@@ -248,8 +251,5 @@ dotnet_naming_rule.everything_else_naming.symbols = everything_else
248251
dotnet_naming_rule.everything_else_naming.style = camel_case_style
249252
dotnet_naming_rule.everything_else_naming.severity = suggestion
250253

251-
# Microsoft .NET properties
252-
csharp_style_expression_bodied_methods = true:suggestion
253-
254254
# ReSharper properties
255255
resharper_local_function_body = expression_body

.github/CONTRIBUTING.md

+12
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,18 @@ The typical workflow for contributing to EF Core is outlined below. This is not
5858

5959
The PR will be merged by a member of the EF Team once the C.I. checks have passed and the code has been approved.
6060

61+
## Developer builds
62+
63+
By default, the EF build requires API documentation for all public members. However, this can be turned off while actively working on code by creating a file named "AspNetCoreSettings.props" above the repo root (for example, in the folder that itself contains your solution folder) with the following contents:
64+
65+
```xml
66+
<Project>
67+
<PropertyGroup>
68+
<DeveloperBuild>True</DeveloperBuild>
69+
</PropertyGroup>
70+
</Project>
71+
```
72+
6173
## Breaking changes
6274

6375
EF Core is used by many thousands of existing applications. We want to make it as easy as possible for those existing applications to update to new versions. A change that causes an existing application to break when being updated is known as a "breaking change". Sometimes it is necessary to make a breaking change to keep the platform alive and moving forward. However, each such breaking change must be explicitly called out and will only be approved if the value of making the change greatly outweighs the pain of breaking existing applications.

.github/fabricbot.json

-165
This file was deleted.
+66
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:

.github/workflows/TestCosmos.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
Start-CosmosDbEmulator -Timeout 360
2121
2222
- name: Checkout
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424

2525
- name: Restore
2626
run: restore.cmd
@@ -35,7 +35,7 @@ jobs:
3535
shell: cmd
3636

3737
- name: Publish Test Results
38-
uses: actions/upload-artifact@v3
38+
uses: actions/upload-artifact@v4
3939
if: always()
4040
with:
4141
name: test-results

Directory.Build.props

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
( $(MSBuildProjectName.EndsWith('.Tests')) OR
1111
$(MSBuildProjectName.EndsWith('.FunctionalTests'))) ">true</IsUnitTestProject>
1212
<IsUnitTestProject Condition=" '$(IsUnitTestProject)' == '' ">false</IsUnitTestProject>
13+
<IsTestUtilityProject Condition="'$(IsSpecificationTestProject)' == 'true'">true</IsTestUtilityProject>
14+
<SolutionRoot>$(MSBuildThisFileDirectory)</SolutionRoot>
1315
</PropertyGroup>
1416

1517
<PropertyGroup>
@@ -37,9 +39,11 @@
3739
<PackageTags>Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore</PackageTags>
3840
<Product>Microsoft Entity Framework Core</Product>
3941
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
40-
<LangVersion>11.0</LangVersion>
42+
<LangVersion>12.0</LangVersion>
43+
<Nullable>enable</Nullable>
4144
<DebugType>portable</DebugType>
4245
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
46+
<PackageIconFullPath>$(MSBuildThisFileDirectory)logo\ef-logo.png</PackageIconFullPath>
4347
</PropertyGroup>
4448

4549
<PropertyGroup Condition="'$(DeveloperBuild)' == 'true'">
@@ -51,9 +55,6 @@
5155
<NoWarn>$(NoWarn.Replace(';1591', ''))</NoWarn>
5256
</PropertyGroup>
5357

54-
<ItemGroup>
55-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
56-
</ItemGroup>
5758
<ItemGroup>
5859
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" />
5960
</ItemGroup>

Directory.Build.targets

+8-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,16 @@
88
<ItemGroup Condition="'$(PackageReadmeFile)' != ''">
99
<None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
1010
</ItemGroup>
11-
11+
1212
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
1313
<Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />
14+
15+
<ItemGroup>
16+
<FrameworkReference Update="Microsoft.NETCore.App"
17+
Condition="'$(TargetFramework)' == 'net9.0' and '$(StabilizePackageVersion)' != 'true'"
18+
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
19+
TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
20+
</ItemGroup>
1421

1522
<Target Name="GetCustomAssemblyAttributes"
1623
BeforeTargets="GetAssemblyAttributes"

0 commit comments

Comments
 (0)