Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit94ccee9

Browse files
authored
Merge pull request#37240 from dotnet/merge/release/10.0-to-main
[automated] Merge branch 'release/10.0' => 'main'
2 parentsf564ef9 +0bbc024 commit94ccee9

File tree

9 files changed

+19
-16
lines changed

9 files changed

+19
-16
lines changed

‎src/EFCore.Relational/Query/StructuralTypeProjectionExpression.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public class StructuralTypeProjectionExpression : Expression
2020
privatereadonlyDictionary<INavigation,StructuralTypeShaperExpression>_ownedNavigationMap;
2121
privateDictionary<IComplexProperty,Expression>?_complexPropertyCache;
2222

23+
privatestaticreadonlyboolUseOldBehavior37205=
24+
AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue37205",outvarenabled)&&enabled;
2325
/// <summary>
2426
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
2527
/// the same compatibility standards as public APIs. It may be changed or removed without notice in

‎src/EFCore.Tasks/EFCore.Tasks.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>MSBuild tasks for Entity Framework Core projects.</Description>
5-
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
5+
<TargetFrameworks>$(NetToolCurrent);net472</TargetFrameworks>
66
<AssemblyName>Microsoft.EntityFrameworkCore.Tasks</AssemblyName>
77
<RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
88
<IncludeSymbols>false</IncludeSymbols>
@@ -75,7 +75,8 @@
7575
<NuspecPropertyInclude="AssemblyName=$(AssemblyName)" />
7676
<NuspecPropertyInclude="OutputPath=$(OutputPath)" />
7777
<NuspecPropertyInclude="ArtifactsBinDir=$(ArtifactsBinDir)" />
78-
<NuspecPropertyInclude="DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework)" />
78+
<NuspecPropertyInclude="NetToolCurrent=$(NetToolCurrent)" />
79+
<NuspecPropertyInclude="NetToolMinimum=$(NetToolMinimum)" />
7980
<NuspecPropertyInclude="Configuration=$(Configuration)" />
8081
</ItemGroup>
8182
</Target>

‎src/EFCore.Tasks/EFCore.Tasks.nuspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<metadata>
55
$CommonMetadataElements$
66
<dependencies>
7-
<grouptargetFramework="$DefaultNetCoreTargetFramework$">
7+
<grouptargetFramework="$NetToolCurrent$">
88
<dependencyid="Microsoft.EntityFrameworkCore.Design"version="$Version$" />
99
</group>
1010
</dependencies>
@@ -13,11 +13,11 @@
1313
<files>
1414
$CommonFileElements$
1515
<filesrc="PACKAGE.md"target="docs\" />
16-
<filesrc="$OutputPath$$DefaultNetCoreTargetFramework$\$AssemblyName$.dll"target="tasks\$DefaultNetCoreTargetFramework$\" />
17-
<filesrc="$OutputPath$$DefaultNetCoreTargetFramework$\$AssemblyName$.pdb"target="tasks\$DefaultNetCoreTargetFramework$\" />
18-
<filesrc="$OutputPath$$DefaultNetCoreTargetFramework$\$AssemblyName$.deps.json"target="tasks\$DefaultNetCoreTargetFramework$\" />
16+
<filesrc="$OutputPath$$NetToolCurrent$\$AssemblyName$.dll"target="tasks\$NetToolCurrent$\" />
17+
<filesrc="$OutputPath$$NetToolCurrent$\$AssemblyName$.pdb"target="tasks\$NetToolCurrent$\" />
18+
<filesrc="$OutputPath$$NetToolCurrent$\$AssemblyName$.deps.json"target="tasks\$NetToolCurrent$\" />
1919
<filesrc="$OutputPath$net472\*"target="tasks\net472\" />
20-
<filesrc="$ArtifactsBinDir$ef\$Configuration$\$DefaultNetCoreTargetFramework$\*"target="tools\$DefaultNetCoreTargetFramework$\" />
20+
<filesrc="$ArtifactsBinDir$ef\$Configuration$\$NetToolMinimum$\*"target="tools\$NetToolCurrent$\" />
2121
<filesrc="buildTransitive\*"target="buildTransitive\" />
2222
</files>
2323
</package>

‎src/EFCore.Tools/EFCore.Tools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ImportProject="Sdk.props"Sdk="Microsoft.NET.Sdk" />
44

55
<PropertyGroup>
6-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
6+
<TargetFramework>$(NetToolMinimum)</TargetFramework>
77
<PackageId>Microsoft.EntityFrameworkCore.Tools</PackageId>
88
<NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
99
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>

‎src/EFCore.Tools/tools/EntityFrameworkCore.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ function EF($project, $startupProject, $params, $applicationArgs, [switch] $skip
12531253
$projectAssetsFile= GetCpsProperty$startupProject'ProjectAssetsFile'
12541254
$runtimeConfig=Join-Path$targetDir ($startupTargetName+'.runtimeconfig.json')
12551255
$runtimeFrameworkVersion= GetCpsProperty$startupProject'RuntimeFrameworkVersion'
1256-
$efPath=Join-Path$PSScriptRoot'net10.0\any\ef.dll'
1256+
$efPath=Join-Path$PSScriptRoot'net8.0\any\ef.dll'
12571257

12581258
$dotnetParams='exec','--depsfile',$depsFile
12591259

‎src/dotnet-ef/RootCommand.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ protected override int Execute(string[] _)
168168
args.Add(startupProject.RuntimeFrameworkVersion);
169169
}
170170

171-
#if!NET10_0
171+
#if!NET8_0
172172
#error Target framework needs to be updated here, as well as in Microsoft.EntityFrameworkCore.Tasks.props and EntityFrameworkCore.psm1
173173
#endif
174-
args.Add(Path.Combine(toolsPath,"net10.0","any","ef.dll"));
174+
args.Add(Path.Combine(toolsPath,"net8.0","any","ef.dll"));
175175
}
176176
elseif(targetFramework.Identifier==".NETStandard")
177177
{

‎src/dotnet-ef/dotnet-ef.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
dotnet ef database drop
1414
dotnet ef database update
1515
</Description>
16-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
16+
<TargetFramework>$(NetToolMinimum)</TargetFramework>
1717
<OutputType>Exe</OutputType>
1818
<PackAsTool>true</PackAsTool>
1919
<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;win-arm64</PackAsToolShimRuntimeIdentifiers>

‎src/dotnet-ef/dotnet-ef.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<filesrc="PACKAGE.md"target="docs\" />
1515
<filesrc="$SettingsFile$"target="tools\$targetFramework$\any" />
1616
<filesrc="$Output$"target="tools\$targetFramework$\any" />
17-
<filesrc="$OutputBinary$"target="tools\$targetFramework$\any\tools\$TargetFramework$\any" />
18-
<filesrc="$OutputRuntimeConfig$"target="tools\$targetFramework$\any\tools\$TargetFramework$\any" />
19-
<filesrc="$OutputSymbol$"target="tools\$targetFramework$\any\tools\$TargetFramework$\any" />
17+
<filesrc="$OutputBinary$"target="tools\$targetFramework$\any\tools\$targetFramework$\any" />
18+
<filesrc="$OutputRuntimeConfig$"target="tools\$targetFramework$\any\tools\$targetFramework$\any" />
19+
<filesrc="$OutputSymbol$"target="tools\$targetFramework$\any\tools\$targetFramework$\any" />
2020
<filesrc="$OutputExe$"target="tools\$targetFramework$\any\tools\net472\any" />
2121
<filesrc="$OutputExeSymbol$"target="tools\$targetFramework$\any\tools\net472\any" />
2222
<filesrc="$OutputX86Exe$"target="tools\$targetFramework$\any\tools\net472\win-x86" />

‎src/ef/ef.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ProjectSdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
4+
<TargetFrameworks>$(NetToolMinimum);net472</TargetFrameworks>
55
<Description>Entity Framework Core Command-line Tools</Description>
66
<OutputType>Exe</OutputType>
77
<IsPackable>false</IsPackable>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp