Skip to content

Commit 7105f84

Browse files
bricelambricelam
committed
Target .NET 6.0
1 parent 3090669 commit 7105f84

21 files changed

+22
-20
lines changed

Diff for: ‎docs/getting-and-building-the-code.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The `build` script has different arguments to perform specific actions. The full
5252

5353
## Using Visual Studio
5454

55-
**The command line `build` (see above) must be run before using the solution with Visual Studio.**
55+
**The command line `build` (see above) should be run before using the solution with Visual Studio.**
5656

5757
The build script installs a preview .NET Core SDK. In order to make sure Visual studio (or any other IDE) is using same SDK, certain environment variables need to be set. To configure your local environment and open solution file in Visual Studio, run following command:
5858

@@ -64,6 +64,8 @@ You can inspect the script and use similar configuration for other IDEs.
6464

6565
Note that `startvs` actually opens whatever the default application is for `.sln` files. If you have multiple IDEs or multiple versions of Visual Studio installed, then make sure that the appropriate default is set, or edit the script to be explicit.
6666

67+
If you install the latest preview release of the [.NET SDK](https://dotnet.microsoft.com/download/dotnet), you may be able to skip using `startvs` and open the solution directly. While we strive to keep our codebase compatible with the latest preview, we may need to depend on changes that have been made since the latest preview release. If you encounter unexpected errors when opening the solution directly, try using `startvs` instead, and ensure you're on the latest preview of [Visual Studio](https://visualstudio.microsoft.com/vs/preview/).
68+
6769
### Run tests
6870

6971
Our tests are written using [xUnit.net](http://xunit.github.io/), and can be run with most test runners we have tried.

Diff for: ‎src/EFCore.Abstractions/EFCore.Abstractions.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Provides abstractions and attributes that are used to configure Entity Framework Core</Description>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<MinClientVersion>3.6</MinClientVersion>
77
<AssemblyName>Microsoft.EntityFrameworkCore.Abstractions</AssemblyName>
88
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>

Diff for: ‎src/EFCore.Cosmos/EFCore.Cosmos.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Azure Cosmos provider for Entity Framework Core.</Description>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<MinClientVersion>3.6</MinClientVersion>
77
<AssemblyName>Microsoft.EntityFrameworkCore.Cosmos</AssemblyName>
88
<RootNamespace>Microsoft.EntityFrameworkCore.Cosmos</RootNamespace>

Diff for: ‎src/EFCore.Design/EFCore.Design.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Shared design-time components for Entity Framework Core tools.</Description>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<AssemblyName>Microsoft.EntityFrameworkCore.Design</AssemblyName>
77
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>

Diff for: ‎src/EFCore.Design/build/net5.0/Microsoft.EntityFrameworkCore.Design.props renamed to ‎src/EFCore.Design/build/net6.0/Microsoft.EntityFrameworkCore.Design.props

File renamed without changes.

Diff for: ‎src/EFCore.InMemory/EFCore.InMemory.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>In-memory database provider for Entity Framework Core (to be used for testing purposes).</Description>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<MinClientVersion>3.6</MinClientVersion>
77
<AssemblyName>Microsoft.EntityFrameworkCore.InMemory</AssemblyName>
88
<RootNamespace>Microsoft.EntityFrameworkCore.InMemory</RootNamespace>

Diff for: ‎src/EFCore.Proxies/EFCore.Proxies.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Lazy-loading proxies for Entity Framework Core.</Description>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<MinClientVersion>3.6</MinClientVersion>
77
<AssemblyName>Microsoft.EntityFrameworkCore.Proxies</AssemblyName>
88
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>

Diff for: ‎src/EFCore.Relational/EFCore.Relational.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Shared Entity Framework Core components for relational database providers.</Description>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<MinClientVersion>3.6</MinClientVersion>
77
<AssemblyName>Microsoft.EntityFrameworkCore.Relational</AssemblyName>
88
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>

Diff for: ‎src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>NetTopologySuite support for the Microsoft SQL Server database provider for Entity Framework Core.</Description>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<MinClientVersion>3.6</MinClientVersion>
77
<AssemblyName>Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite</AssemblyName>
88
<RootNamespace>Microsoft.EntityFrameworkCore.SqlServer</RootNamespace>

Diff for: ‎src/EFCore.SqlServer.NTS/build/net5.0/Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite.targets renamed to ‎src/EFCore.SqlServer.NTS/build/net6.0/Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite.targets

File renamed without changes.

Diff for: ‎src/EFCore.SqlServer/EFCore.SqlServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Microsoft SQL Server database provider for Entity Framework Core.</Description>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<MinClientVersion>3.6</MinClientVersion>
77
<AssemblyName>Microsoft.EntityFrameworkCore.SqlServer</AssemblyName>
88
<RootNamespace>Microsoft.EntityFrameworkCore.SqlServer</RootNamespace>

Diff for: ‎src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PackageId>Microsoft.EntityFrameworkCore.Sqlite.Core</PackageId>
66
<RootNamespace>Microsoft.EntityFrameworkCore.Sqlite</RootNamespace>
77
<Description>SQLite database provider for Entity Framework Core. This package does not include a copy of the native SQLite library.</Description>
8-
<TargetFramework>net5.0</TargetFramework>
8+
<TargetFramework>net6.0</TargetFramework>
99
<MinClientVersion>3.6</MinClientVersion>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
<PackageTags>$(PackageTags);SQLite</PackageTags>

Diff for: ‎src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PackageId>Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite</PackageId>
66
<RootNamespace>Microsoft.EntityFrameworkCore.Sqlite</RootNamespace>
77
<Description>NetTopologySuite support for the SQLite database provider for Entity Framework Core.</Description>
8-
<TargetFramework>net5.0</TargetFramework>
8+
<TargetFramework>net6.0</TargetFramework>
99
<MinClientVersion>3.6</MinClientVersion>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
<PackageTags>$(PackageTags);SQLite;GIS;NTS;OGC;SpatiaLite</PackageTags>

Diff for: ‎src/EFCore.Sqlite.NTS/build/net5.0/Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite.targets renamed to ‎src/EFCore.Sqlite.NTS/build/net6.0/Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite.targets

File renamed without changes.

Diff for: ‎src/EFCore.Sqlite/EFCore.Sqlite.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<Description>SQLite database provider for Entity Framework Core.</Description>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net6.0</TargetFramework>
88
<MinClientVersion>3.6</MinClientVersion>
99
<PackageId>Microsoft.EntityFrameworkCore.Sqlite</PackageId>
1010
<PackageTags>$(PackageTags);SQLite</PackageTags>

Diff for: ‎src/EFCore.Sqlite/lib/net5.0/_._ renamed to ‎src/EFCore.Sqlite/lib/net6.0/_._

File renamed without changes.

Diff for: ‎src/EFCore.Tools/lib/net5.0/_._ renamed to ‎src/EFCore.Tools/lib/net6.0/_._

File renamed without changes.

Diff for: ‎src/EFCore/EFCore.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Commonly Used Types:
77
Microsoft.EntityFrameworkCore.DbContext
88
Microsoft.EntityFrameworkCore.DbSet
99
</Description>
10-
<TargetFramework>net5.0</TargetFramework>
10+
<TargetFramework>net6.0</TargetFramework>
1111
<MinClientVersion>3.6</MinClientVersion>
1212
<AssemblyName>Microsoft.EntityFrameworkCore</AssemblyName>
1313
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>

Diff for: ‎src/EFCore/Query/QueryableMethods.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ public static class QueryableMethods
9090
//public static MethodInfo DistinctWithComparer { get; }
9191

9292
/// <summary>
93-
/// The <see cref="MethodInfo" /> for <see cref="Queryable.ElementAt{TSource}" />
93+
/// The <see cref="MethodInfo" /> for <see cref="Queryable.ElementAt{TSource}(IQueryable{TSource}, int)" />
9494
/// </summary>
9595
public static MethodInfo ElementAt { get; }
9696

9797
/// <summary>
98-
/// The <see cref="MethodInfo" /> for <see cref="Queryable.ElementAtOrDefault{TSource}" />
98+
/// The <see cref="MethodInfo" /> for <see cref="Queryable.ElementAtOrDefault{TSource}(IQueryable{TSource}, int)" />
9999
/// </summary>
100100
public static MethodInfo ElementAtOrDefault { get; }
101101

@@ -221,7 +221,7 @@ public static class QueryableMethods
221221
public static MethodInfo MaxWithoutSelector { get; }
222222

223223
/// <summary>
224-
/// The <see cref="MethodInfo" /> for <see cref="Queryable.Max{TSource}" />
224+
/// The <see cref="MethodInfo" /> for <see cref="Queryable.Max{TSource}(IQueryable{TSource})" />
225225
/// </summary>
226226
public static MethodInfo MaxWithSelector { get; }
227227

@@ -231,7 +231,7 @@ public static class QueryableMethods
231231
public static MethodInfo MinWithoutSelector { get; }
232232

233233
/// <summary>
234-
/// The <see cref="MethodInfo" /> for <see cref="Queryable.Min{TSource}" />
234+
/// The <see cref="MethodInfo" /> for <see cref="Queryable.Min{TSource}(IQueryable{TSource})" />
235235
/// </summary>
236236
public static MethodInfo MinWithSelector { get; }
237237

@@ -322,7 +322,7 @@ public static class QueryableMethods
322322
//public static MethodInfo SkipWhileOrdinal { get; }
323323

324324
/// <summary>
325-
/// The <see cref="MethodInfo" /> for <see cref="Queryable.Take{TSource}" />
325+
/// The <see cref="MethodInfo" /> for <see cref="Queryable.Take{TSource}(IQueryable{TSource}, int)" />
326326
/// </summary>
327327
public static MethodInfo Take { get; }
328328

Diff for: ‎src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Microsoft.Data.Sqlite.SqliteException
1515
Microsoft.Data.Sqlite.SqliteFactory
1616
Microsoft.Data.Sqlite.SqliteParameter
1717
Microsoft.Data.Sqlite.SqliteTransaction</Description>
18-
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
18+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
1919
<MinClientVersion>3.6</MinClientVersion>
2020
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2121
<CodeAnalysisRuleSet>Microsoft.Data.Sqlite.Core.ruleset</CodeAnalysisRuleSet>

Diff for: ‎src/dotnet-ef/dotnet-ef.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dotnet ef database update
2222
<IncludeSource>false</IncludeSource>
2323
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
2424
<!--
25-
This keeps ef.exe targeting the default version of .NET Core for net5.0,
25+
This keeps ef.exe targeting the default version of .NET Core for netcoreapp3.1,
2626
which maximizes the machines on which this tool will be compatible.
2727
-->
2828
<TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' ">false</TargetLatestDotNetRuntime>

0 commit comments

Comments
 (0)