Skip to content

Commit

Permalink
Merge branch 'main' into collite
Browse files Browse the repository at this point in the history
  • Loading branch information
bricelam authored Dec 14, 2022
2 parents 2cc4e73 + 3a62379 commit 30de59d
Show file tree
Hide file tree
Showing 328 changed files with 18,197 additions and 3,954 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/ask_a_question.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ BlogContext

EF Core version:
Database provider: (e.g. Microsoft.EntityFrameworkCore.SqlServer)
Target framework: (e.g. .NET 5.0)
Target framework: (e.g. .NET 6.0)
Operating system:
IDE: (e.g. Visual Studio 2019 16.3)
IDE: (e.g. Visual Studio 2022 17.4)
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report_efcore.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ BlogContext

EF Core version:
Database provider: (e.g. Microsoft.EntityFrameworkCore.SqlServer)
Target framework: (e.g. .NET 5.0)
Target framework: (e.g. .NET 6.0)
Operating system:
IDE: (e.g. Visual Studio 2019 16.3)
IDE: (e.g. Visual Studio 2022 17.4)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report_sqlite.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ Unhandled exception. System.NullReferenceException: Object reference not set to
### Include version information

Microsoft.Data.Sqlite version:
Target framework: (e.g. .NET 5.0)
Target framework: (e.g. .NET 6.0)
Operating system:

2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<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>10.0</LangVersion>
<LangVersion>11.0</LangVersion>
<DebugType>portable</DebugType>
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<!-- Used for the Rich Navigation indexing task -->
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Repository

[![build status](https://img.shields.io/azure-devops/build/dnceng/public/51/main)](https://dev.azure.com/dnceng/public/_build?definitionId=51) [![test results](https://img.shields.io/azure-devops/tests/dnceng/public/51/main)](https://dev.azure.com/dnceng/public/_build?definitionId=51)
[![build status](https://img.shields.io/azure-devops/build/dnceng-public/public/17/main)](https://dev.azure.com/dnceng-public/public/_build?definitionId=17) [![test results](https://img.shields.io/azure-devops/tests/dnceng-public/public/17/main)](https://dev.azure.com/dnceng-public/public/_build?definitionId=17)

This repository is home to the following [.NET Foundation](https://dotnetfoundation.org/) projects. These projects are maintained by [Microsoft](https://github.com/microsoft) and licensed under the [MIT License](LICENSE.txt).

Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-richnav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ stages:
timeoutInMinutes: 90
enablePublishTestResults: true
pool:
name: NetCore-Svc-Public
name: NetCore-Public
demands: ImageOverride -equals 1es-windows-2019-open
steps:
- task: NuGetCommand@2
Expand Down
12 changes: 7 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,18 @@ stages:
enablePublishBuildArtifacts: true
enablePublishBuildAssets: ${{ ne(variables.runCodeQL3000, 'true') }}
enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }}
publishAssetsImmediately: true
enableTelemetry: true
helixRepo: dotnet/efcore
jobs:
- job: Windows
enablePublishTestResults: ${{ ne(variables.runCodeQL3000, 'true') }}
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
name: NetCore-Public
demands: ImageOverride -equals 1es-windows-2019-open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
name: NetCore1ESPool-Internal
demands: ImageOverride -equals 1es-windows-2019
${{ if eq(variables.runCodeQL3000, 'true') }}:
# Component governance and SBOM creation are not needed here. Disable what Arcade would inject.
Expand Down Expand Up @@ -210,7 +211,7 @@ stages:
${{ if or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}:
vmImage: ubuntu-22.04
${{ if and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}:
name: NetCore1ESPool-Svc-Internal
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
variables:
- _runCounter: $[counter(variables['Build.Reason'], 0)]
Expand Down Expand Up @@ -256,10 +257,10 @@ stages:
timeoutInMinutes: 180
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
name: NetCore-Public
demands: ImageOverride -equals 1es-windows-2019-open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
name: NetCore1ESPool-Internal
demands: ImageOverride -equals 1es-windows-2019
variables:
# Rely on task Arcade injects, not auto-injected build step.
Expand Down Expand Up @@ -311,3 +312,4 @@ stages:
enableSigningValidation: false
enableNugetValidation: false
enableSourceLinkValidation: false
publishAssetsImmediately: true
2 changes: 1 addition & 1 deletion benchmark/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
<PackageReference Include="xunit.assert" Version="$(XunitVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.1" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.2" />
</ItemGroup>

<ItemGroup>
Expand Down
28 changes: 15 additions & 13 deletions docs/DailyBuilds.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Create a file called "NuGet.config" with the following contents and put it next
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
Expand All @@ -30,13 +30,13 @@ A disadvantage of using daily builds is that there can be significant API churn

The daily builds are not published to NuGet.org because the .NET build infrastructure is not set up for this. Instead they can be pulled from a custom NuGet package source. To access this custom source, create a `NuGet.config` file in the same directory as your .NET solution or projects.

For EF7 daily builds, `NuGet.config` should contain:
For EF8 daily builds, `NuGet.config` should contain:

```xml
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
Expand All @@ -45,27 +45,27 @@ For EF7 daily builds, `NuGet.config` should contain:
To install the daily build of `dotnet ef`:

```sh
dotnet tool install -g dotnet-ef --version 7.0.0-* --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json
dotnet tool install -g dotnet-ef --version 8.0.0-* --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json
```

To install the `dotnet new` templates:

```sh
dotnet new install Microsoft.EntityFrameworkCore.Templates::7.0.0-* --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json
dotnet new install Microsoft.EntityFrameworkCore.Templates::8.0.0-* --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json
```

## Package versions to use

### Using wildcards

The easiest way to use daily builds is with wildcards in project references. For example, for EF Core 6.0 daily builds:
The easiest way to use daily builds is with wildcards in project references. For example, for EF Core 8.0 daily builds:

```xml
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="7.0.0-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="8.0.0-*" />
</ItemGroup>
```

Expand All @@ -83,12 +83,14 @@ Alternately, your IDE might provide auto-completion directly in the .csproj file

## What about Visual Studio and the SDK?

EF7 currently targets .NET 6. This means that:
EF8 currently targets .NET 6. This means that:

* Your application must target .NET 6 or later; .NET Framework, .NET Core 3.1, and .NET 5 are no longer supported targets.
* The daily builds should work with any IDE that supports .NET 6.
* The daily builds require that the .NET 6 SDK is installed.

However, it's likely that EF8 will be changed to target .NET 8 before it's released.

## Troubleshooting

### Missing packages
Expand All @@ -104,7 +106,7 @@ In addition, packages may be missing if the standard `nuget.org` package source
<clear />
</disabledPackageSources>
<packageSources>
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
Expand All @@ -120,7 +122,7 @@ A good way to ensure you're dealing with a completely clean NuGet configuration
</disabledPackageSources>
<packageSources>
<clear />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
Expand Down
66 changes: 33 additions & 33 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="8.0.0-alpha.1.22611.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cfdf0f67485ae41f4454a687b1e01ccb32e5e799</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0-alpha.1.22611.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cfdf0f67485ae41f4454a687b1e01ccb32e5e799</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-alpha.1.22611.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cfdf0f67485ae41f4454a687b1e01ccb32e5e799</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="8.0.0-alpha.1.22611.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cfdf0f67485ae41f4454a687b1e01ccb32e5e799</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
<Dependency Name="Microsoft.Extensions.Configuration" Version="8.0.0-alpha.1.22611.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cfdf0f67485ae41f4454a687b1e01ccb32e5e799</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0-alpha.1.22611.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cfdf0f67485ae41f4454a687b1e01ccb32e5e799</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22611.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cfdf0f67485ae41f4454a687b1e01ccb32e5e799</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="7.0.0-rtm.22518.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.0-alpha.1.22611.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cfdf0f67485ae41f4454a687b1e01ccb32e5e799</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
<Dependency Name="Microsoft.Extensions.Logging" Version="8.0.0-alpha.1.22611.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cfdf0f67485ae41f4454a687b1e01ccb32e5e799</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22561.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22609.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
<Sha>3e24006ee217f68b0c8a36cf272536ac239c9c47</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22561.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22609.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
<Sha>3e24006ee217f68b0c8a36cf272536ac239c9c47</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22561.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22609.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
<Sha>3e24006ee217f68b0c8a36cf272536ac239c9c47</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
Loading

0 comments on commit 30de59d

Please sign in to comment.