Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to .NET SDK 7.0 Preview 2 #27447

Merged
merged 3 commits into from
Mar 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ stages:
name: Build
- script: |
.dotnet\dotnet publish --configuration $(_BuildConfig) --runtime win-x64 --self-contained test\EFCore.Trimming.Tests
artifacts\bin\EFCore.Trimming.Tests\$(_BuildConfig)\$(_BuildTargetFramework)\win-x64\publish\EFCore.Trimming.Tests.exe
artifacts\bin\EFCore.Trimming.Tests\$(_BuildConfig)\net7.0\win-x64\publish\EFCore.Trimming.Tests.exe
displayName: Test trimming
- task: PublishBuildArtifacts@1
displayName: Upload TestResults
Expand Down
2 changes: 1 addition & 1 deletion benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>Microsoft.EntityFrameworkCore.Benchmarks</RootNamespace>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>Microsoft.EntityFrameworkCore.Benchmarks</RootNamespace>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>Microsoft.EntityFrameworkCore.Benchmarks</RootNamespace>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand Down
37 changes: 19 additions & 18 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,49 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="7.0.0-preview.3.22171.1">
<!-- Packages pinned to Preview 2 waiting for System.Runtime.CompilerServices.Unsafe -->
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="7.0.0-preview.2.22152.2" Pinned="True">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
<Sha>e24f66dff0770eee344038da8c12476d8c450c41</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0-preview.3.22171.1">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0-preview.2.22152.2" Pinned="True">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
<Sha>e24f66dff0770eee344038da8c12476d8c450c41</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0-preview.3.22171.1">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0-preview.2.22152.2" Pinned="True">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
<Sha>e24f66dff0770eee344038da8c12476d8c450c41</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="7.0.0-preview.3.22171.1">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="7.0.0-preview.2.22152.2" Pinned="True">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
<Sha>e24f66dff0770eee344038da8c12476d8c450c41</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="7.0.0-preview.3.22171.1">
<Dependency Name="Microsoft.Extensions.Configuration" Version="7.0.0-preview.2.22152.2" Pinned="True">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
<Sha>e24f66dff0770eee344038da8c12476d8c450c41</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="7.0.0-preview.3.22171.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-preview.3.22171.1">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-preview.2.22152.2" Pinned="True">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
<Sha>e24f66dff0770eee344038da8c12476d8c450c41</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="7.0.0-preview.3.22171.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="7.0.0-preview.3.22171.1">
<Dependency Name="Microsoft.Extensions.Logging" Version="7.0.0-preview.2.22152.2" Pinned="True">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
<Sha>e24f66dff0770eee344038da8c12476d8c450c41</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="7.0.0-preview.3.22171.1">
<Dependency Name="System.Collections.Immutable" Version="7.0.0-preview.2.22152.2" Pinned="True">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
<Sha>e24f66dff0770eee344038da8c12476d8c450c41</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="7.0.0-preview.3.22171.1">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="7.0.0-preview.2.22152.2" Pinned="True">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5</Sha>
<Sha>e24f66dff0770eee344038da8c12476d8c450c41</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
20 changes: 10 additions & 10 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<SystemCollectionsImmutableVersion>7.0.0-preview.3.22171.1</SystemCollectionsImmutableVersion>
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-preview.3.22171.1</SystemDiagnosticsDiagnosticSourceVersion>
<MicrosoftExtensionsCachingMemoryVersion>7.0.0-preview.3.22171.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>7.0.0-preview.3.22171.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0-preview.3.22171.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0-preview.3.22171.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>7.0.0-preview.3.22171.1</MicrosoftExtensionsConfigurationJsonVersion>
<SystemCollectionsImmutableVersion>7.0.0-preview.2.22152.2</SystemCollectionsImmutableVersion>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this change we have downgraded our dependencies in main branch. Is that required? Do we need to get main to upgrade dependencies again?
cc: @dotnet/aspnet-build

Copy link
Contributor Author

@bricelam bricelam Mar 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will unpin once we upgrade to Preview 3 of the SDK (see conversation above)

<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-preview.2.22152.2</SystemDiagnosticsDiagnosticSourceVersion>
<MicrosoftExtensionsCachingMemoryVersion>7.0.0-preview.2.22152.2</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>7.0.0-preview.2.22152.2</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0-preview.2.22152.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0-preview.2.22152.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>7.0.0-preview.2.22152.2</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>7.0.0-preview.3.22171.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>7.0.0-preview.3.22171.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-preview.3.22171.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>7.0.0-preview.3.22171.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsDependencyModelVersion>7.0.0-preview.2.22152.2</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-preview.3.22163.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>7.0.0-preview.2.22152.2</MicrosoftExtensionsLoggingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftCodeAnalysisVersion>4.0.1</MicrosoftCodeAnalysisVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/helix.proj
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</ItemGroup>

<PropertyGroup>
<XUnitPublishTargetFramework>net6.0</XUnitPublishTargetFramework>
<XUnitPublishTargetFramework>net7.0</XUnitPublishTargetFramework>
<XUnitRuntimeTargetFramework>netcoreapp2.0</XUnitRuntimeTargetFramework>
<XUnitRunnerVersion>2.4.2-pre.9</XUnitRunnerVersion>
<XUnitArguments></XUnitArguments>
Expand Down
11 changes: 3 additions & 8 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
{
"tools": {
"dotnet": "6.0.103",
"dotnet": "7.0.100-preview.2.22153.17",
"runtimes": {
"dotnet": [
"3.1.23",
"5.0.15"
],
"aspnetcore": [
"3.1.23",
"5.0.15"
"7.0.0-preview.2.22153.2"
]
}
},
"sdk": {
"version": "6.0.103",
"version": "7.0.100-preview.2.22153.17",
"allowPrerelease": true,
"rollForward": "latestMajor"
},
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.Sqlite.Core/SqliteBlob.cs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public override int Read(byte[] buffer, int offset, int count)
/// the buffer if that many bytes are not currently available, or zero (0) if the end of the stream has been
/// reached.
/// </returns>
#if NET
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
public override int Read(Span<byte> buffer)
#else
public virtual int Read(Span<byte> buffer)
Expand Down Expand Up @@ -257,7 +257,7 @@ public override void Write(byte[] buffer, int offset, int count)
/// <param name="buffer">
/// A region of memory. This method copies the contents of this region to the current stream.
/// </param>
#if NET
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
public override void Write(ReadOnlySpan<byte> buffer)
#else
public virtual void Write(ReadOnlySpan<byte> buffer)
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.Data.Sqlite.Core/SqliteTransaction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public override void Rollback()
RollbackInternal();
}

#if NET
#if NET5_0_OR_GREATER
/// <inheritdoc />
public override bool SupportsSavepoints => true;
#endif
Expand All @@ -111,7 +111,7 @@ public override void Rollback()
/// established to be rolled back, restoring the transaction state to what it was at the time of the savepoint.
/// </summary>
/// <param name="savepointName">The name of the savepoint to be created.</param>
#if NET
#if NET5_0_OR_GREATER
public override void Save(string savepointName)
#else
public virtual void Save(string savepointName)
Expand Down Expand Up @@ -139,7 +139,7 @@ public virtual void Save(string savepointName)
/// Rolls back all commands that were executed after the specified savepoint was established.
/// </summary>
/// <param name="savepointName">The name of the savepoint to roll back to.</param>
#if NET
#if NET5_0_OR_GREATER
public override void Rollback(string savepointName)
#else
public virtual void Rollback(string savepointName)
Expand Down Expand Up @@ -168,7 +168,7 @@ public virtual void Rollback(string savepointName)
/// reclaim some resources before the transaction ends.
/// </summary>
/// <param name="savepointName">The name of the savepoint to release.</param>
#if NET
#if NET5_0_OR_GREATER
public override void Release(string savepointName)
#else
public virtual void Release(string savepointName)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#if !NET
#if !(NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER)

namespace System.Diagnostics.CodeAnalysis
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#if !NET
#if !NET5_0_OR_GREATER

namespace System.Diagnostics.CodeAnalysis
{
Expand Down
2 changes: 1 addition & 1 deletion src/ef/NotNullIfNotNullAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#if !NETCOREAPP3_0_OR_GREATER
#if !(NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER)

namespace System.Diagnostics.CodeAnalysis
{
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.Analyzers.Tests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<PreserveCompilationContext>true</PreserveCompilationContext>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ var compilationWithAnalyzers
= compilation
.WithOptions(
compilation.Options.WithSpecificDiagnosticOptions(
analyzer.SupportedDiagnostics.ToDictionary(d => d.Id, d => ReportDiagnostic.Default)))
compilation.Options.SpecificDiagnosticOptions
.AddRange(analyzer.SupportedDiagnostics.ToDictionary(d => d.Id, d => ReportDiagnostic.Default))))
.WithAnalyzers(ImmutableArray.Create(analyzer));

var diagnostics = analyzerDiagnosticsOnly
Expand Down Expand Up @@ -98,6 +99,10 @@ var metadataReferences
.WithCompilationOptions(
new CSharpCompilationOptions(
OutputKind.DynamicallyLinkedLibrary,
specificDiagnosticOptions: new Dictionary<string, ReportDiagnostic>
{
{ "CS1701", ReportDiagnostic.Suppress }
},
nullableContextOptions: NullableContextOptions.Enable));
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.AspNet.InMemory.FunctionalTests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Shared ASP.NET test suite for Entity Framework Core database providers.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.AspNet.Specification.Tests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.AspNet.SqlServer.FunctionalTests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<SkipTests Condition="'$(OS)' != 'Windows_NT' AND '$(Test__SqlServer__DefaultConnection)' == ''">True</SkipTests>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.AspNet.Sqlite.FunctionalTests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.Cosmos.FunctionalTests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.Cosmos.Tests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore.Cosmos</RootNamespace>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.CrossStore.FunctionalTests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.Design.Tests/EFCore.Design.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>Microsoft.EntityFrameworkCore.Design.Tests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.InMemory.FunctionalTests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.InMemory.Tests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.OData.FunctionalTests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<SkipTests Condition="'$(OS)' != 'Windows_NT' AND '$(Test__SqlServer__DefaultConnection)' == ''">True</SkipTests>
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.Proxies.Tests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Shared test suite for Entity Framework Core relational database providers.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<AssemblyName>Microsoft.EntityFrameworkCore.Relational.Specification.Tests</AssemblyName>
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
Loading