Skip to content

Commit

Permalink
Merge branch 'release/9.0' into merge/release/8.0-to-release/9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
AndriySvyryd authored Oct 14, 2024
2 parents f9b5a38 + ae85c4b commit d0338db
Show file tree
Hide file tree
Showing 3,845 changed files with 368,649 additions and 179,066 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
33 changes: 0 additions & 33 deletions .config/guardian/.gdnbaselines

This file was deleted.

12 changes: 6 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ csharp_style_var_elsewhere = true:suggestion

# Expression-bodied members
# Explicitly disabled due to difference in coding style between source and tests
#csharp_style_expression_bodied_methods = false:silent
#csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_methods = true:suggestion
csharp_style_expression_bodied_constructors = true:suggestion
csharp_style_expression_bodied_operators = true:suggestion
csharp_style_expression_bodied_properties = true:suggestion
csharp_style_expression_bodied_indexers = true:suggestion
csharp_style_expression_bodied_accessors = true:suggestion
Expand All @@ -117,6 +117,9 @@ csharp_style_conditional_delegate_call = true:suggestion
# Code block preferences
csharp_prefer_braces = true:suggestion

# Primary constructors
csharp_style_prefer_primary_constructors = true:suggestion

## Formatting conventions
# Dotnet formatting settings:
[*.{cs,vb}]
Expand Down Expand Up @@ -248,8 +251,5 @@ dotnet_naming_rule.everything_else_naming.symbols = everything_else
dotnet_naming_rule.everything_else_naming.style = camel_case_style
dotnet_naming_rule.everything_else_naming.severity = suggestion

# Microsoft .NET properties
csharp_style_expression_bodied_methods = true:suggestion

# ReSharper properties
resharper_local_function_body = expression_body
12 changes: 12 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,18 @@ The typical workflow for contributing to EF Core is outlined below. This is not

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.

## Developer builds

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:

```xml
<Project>
<PropertyGroup>
<DeveloperBuild>True</DeveloperBuild>
</PropertyGroup>
</Project>
```

## Breaking changes

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.
Expand Down
165 changes: 0 additions & 165 deletions .github/fabricbot.json

This file was deleted.

66 changes: 66 additions & 0 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
id:
name: GitOps.PullRequestIssueManagement
description: GitOps.PullRequestIssueManagement primitive
owner:
resource: repository
disabled: false
where:
configuration:
resourceManagementConfiguration:
scheduledSearches: []
eventResponderTasks:
- if:
- payloadType: Pull_Request
- hasLabel:
label: auto-merge
then:
- enableAutoMerge:
mergeMethod: Squash
description: Auto-merge PRs
- if:
- payloadType: Pull_Request
- labelRemoved:
label: auto-merge
then:
- disableAutoMerge
description: Auto-merge PRs
- if:
- payloadType: Pull_Request
- isAction:
action: Opened
- isActivitySender:
user: dotnet-maestro[bot]
issueAuthor: False
- titleContains:
pattern: Update dependencies
isRegex: False
then:
- addLabel:
label: area-infrastructure
- addLabel:
label: 'type-dependency update :arrow_up_small:'
- approvePullRequest:
comment: Auto-approving dependency update.
description: '[Infrastructure PRs] Add area-infrastructure label to dependency update Pull Requests'
- if:
- payloadType: Pull_Request
- isAction:
action: Opened
- isActivitySender:
user: dotnet-maestro-bot
issueAuthor: False
- titleContains:
pattern: Merge branch
isRegex: False
then:
- addLabel:
label: area-infrastructure
- addLabel:
label: 'type-merge forward :fast_forward:'
- approvePullRequest:
comment: Auto-approving branch merge.
- addLabel:
label: auto-merge
description: '[Infrastructure PRs] Add area-infrastructure label to auto-merge Pull Requests'
onFailure:
onSuccess:
4 changes: 2 additions & 2 deletions .github/workflows/TestCosmos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
Start-CosmosDbEmulator -Timeout 360
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Restore
run: restore.cmd
Expand All @@ -35,7 +35,7 @@ jobs:
shell: cmd

- name: Publish Test Results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: test-results
Expand Down
9 changes: 5 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
( $(MSBuildProjectName.EndsWith('.Tests')) OR
$(MSBuildProjectName.EndsWith('.FunctionalTests'))) ">true</IsUnitTestProject>
<IsUnitTestProject Condition=" '$(IsUnitTestProject)' == '' ">false</IsUnitTestProject>
<IsTestUtilityProject Condition="'$(IsSpecificationTestProject)' == 'true'">true</IsTestUtilityProject>
<SolutionRoot>$(MSBuildThisFileDirectory)</SolutionRoot>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -37,9 +39,11 @@
<PackageTags>Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore</PackageTags>
<Product>Microsoft Entity Framework Core</Product>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<LangVersion>11.0</LangVersion>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<DebugType>portable</DebugType>
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
<PackageIconFullPath>$(MSBuildThisFileDirectory)logo\ef-logo.png</PackageIconFullPath>
</PropertyGroup>

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

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" />
</ItemGroup>
Expand Down
9 changes: 8 additions & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,16 @@
<ItemGroup Condition="'$(PackageReadmeFile)' != ''">
<None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />

<ItemGroup>
<FrameworkReference Update="Microsoft.NETCore.App"
Condition="'$(TargetFramework)' == 'net9.0' and '$(StabilizePackageVersion)' != 'true'"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
</ItemGroup>

<Target Name="GetCustomAssemblyAttributes"
BeforeTargets="GetAssemblyAttributes"
Expand Down
Loading

0 comments on commit d0338db

Please sign in to comment.