From 06cbef2f192b824d5ff41de0e24a6502829dfb89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Sep 2019 12:39:10 +0000 Subject: [PATCH 01/13] Update dependencies from https://github.com/dotnet/core-setup build 20190904.16 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19454.16 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19454.16 Dependency coherency updates - Microsoft.CSharp - 4.7.0-rc1.19454.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.CodeDom - 4.7.0-rc1.19454.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.7.0-rc1.19454.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Configuration.ConfigurationManager - 4.7.0-rc1.19454.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Data.SqlClient - 4.8.0-rc1.19454.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db1a29e235..1898a7b126 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,33 @@ - + https://github.com/dotnet/corefx - 5f2c2771e077f98c097ecc1b9202bee22ef50aed + 6019e0ce528d0743cce92a28b6ee31c445ab8884 - + https://github.com/dotnet/core-setup - caa8d3b1edd7eec947f6283f8342a9249b5d7171 + 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 - + https://github.com/dotnet/core-setup - caa8d3b1edd7eec947f6283f8342a9249b5d7171 + 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 - + https://github.com/dotnet/corefx - 5f2c2771e077f98c097ecc1b9202bee22ef50aed + 6019e0ce528d0743cce92a28b6ee31c445ab8884 - + https://github.com/dotnet/corefx - 5f2c2771e077f98c097ecc1b9202bee22ef50aed + 6019e0ce528d0743cce92a28b6ee31c445ab8884 - + https://github.com/dotnet/corefx - 5f2c2771e077f98c097ecc1b9202bee22ef50aed + 6019e0ce528d0743cce92a28b6ee31c445ab8884 - + https://github.com/dotnet/corefx - 5f2c2771e077f98c097ecc1b9202bee22ef50aed + 6019e0ce528d0743cce92a28b6ee31c445ab8884 diff --git a/eng/Versions.props b/eng/Versions.props index 196a506067..ced5b421a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,15 +16,15 @@ 6.7.2-beta-ef6 - 4.6.0-rc1.19454.13 - 4.6.0-rc1.19454.13 - 4.6.0-rc1.19454.13 - 4.6.0-rc1.19454.13 - 4.7.0-rc1.19454.13 + 4.7.0-rc1.19454.8 + 4.7.0-rc1.19454.8 + 4.7.0-rc1.19454.8 + 4.7.0-rc1.19454.8 + 4.8.0-rc1.19454.8 - 3.0.0-rc1-19455-02 - 3.0.0-rc1-19455-02 + 3.1.0-preview1.19454.16 + 3.1.0-preview1.19454.16 - - $(MicrosoftNETCoreAppRuntimeVersion) - $(MicrosoftNETCoreAppRuntimeVersion) - $(MicrosoftNETCoreAppRefPackageVersion) + + + $(MicrosoftNETCoreAppRuntimeVersion) + $(MicrosoftNETCoreAppRuntimeVersion) + $(MicrosoftNETCoreAppRefPackageVersion) diff --git a/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj b/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj index 50ace3d2cc..4a5e8fb2da 100644 --- a/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj +++ b/src/NuGet/EntityFramework/EntityFramework.NuGet.csproj @@ -2,7 +2,7 @@ - net45;net40;netcoreapp3.0 + net45;net40;$(DefaultNetCoreTargetFramework) false false True @@ -18,6 +18,7 @@ + @@ -27,7 +28,7 @@ - + @@ -35,7 +36,7 @@ - + - - - + + + diff --git a/src/ef6/ef6.csproj b/src/ef6/ef6.csproj index 85258a1df6..6e6c1fa4f4 100644 --- a/src/ef6/ef6.csproj +++ b/src/ef6/ef6.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.0;net40;net45 + $(DefaultNetCoreTargetFramework);net40;net45 System.Data.Entity.Tools diff --git a/test/EntityFramework/FunctionalTests.ProviderAgnostic/FunctionalTests.ProviderAgnostic.csproj b/test/EntityFramework/FunctionalTests.ProviderAgnostic/FunctionalTests.ProviderAgnostic.csproj index 2b050e5a7a..3333c963e6 100644 --- a/test/EntityFramework/FunctionalTests.ProviderAgnostic/FunctionalTests.ProviderAgnostic.csproj +++ b/test/EntityFramework/FunctionalTests.ProviderAgnostic/FunctionalTests.ProviderAgnostic.csproj @@ -3,7 +3,7 @@ System.Data.Entity EntityFramework.FunctionalTests.ProviderAgnostic - net452;netcoreapp3.0 + net452;$(DefaultNetCoreTargetFramework) $(DefineConstants);EF_FUNCTIONALS $(NoWarn);CS8002 @@ -38,7 +38,7 @@ - + xunit.console.dll.config PreserveNewest diff --git a/test/EntityFramework/FunctionalTests.Transitional/FunctionalTests.Transitional.csproj b/test/EntityFramework/FunctionalTests.Transitional/FunctionalTests.Transitional.csproj index 479c598eb9..85e51fbf4e 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/FunctionalTests.Transitional.csproj +++ b/test/EntityFramework/FunctionalTests.Transitional/FunctionalTests.Transitional.csproj @@ -3,7 +3,7 @@ System.Data.Entity EntityFramework.FunctionalTests.Transitional - net452;netcoreapp3.0 + net452;$(DefaultNetCoreTargetFramework) diff --git a/test/EntityFramework/FunctionalTests/FunctionalTests.csproj b/test/EntityFramework/FunctionalTests/FunctionalTests.csproj index 755756e54f..c68a658343 100644 --- a/test/EntityFramework/FunctionalTests/FunctionalTests.csproj +++ b/test/EntityFramework/FunctionalTests/FunctionalTests.csproj @@ -3,7 +3,7 @@ System.Data.Entity EntityFramework.FunctionalTests - net452;netcoreapp3.0 + net452;$(DefaultNetCoreTargetFramework) $(DefineConstants);EF_FUNCTIONALS $(NoWarn);CS0169 @@ -332,7 +332,7 @@ - + PreserveNewest diff --git a/test/EntityFramework/VBTests/VBTests.vbproj b/test/EntityFramework/VBTests/VBTests.vbproj index b9bb83e6e8..24f1c03962 100644 --- a/test/EntityFramework/VBTests/VBTests.vbproj +++ b/test/EntityFramework/VBTests/VBTests.vbproj @@ -3,7 +3,7 @@ EntityFramework.VBTests - net452;netcoreapp3.0 + net452;$(DefaultNetCoreTargetFramework) From e83f9137a3d31f91d98380586e9bf68e10a133be Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sat, 7 Sep 2019 13:47:36 -0700 Subject: [PATCH 07/13] Update remaining use of 'netcoreapp3.0' -> 'netcoreapp3.1' --- src/NuGet/EntityFramework/tools/EntityFramework6.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NuGet/EntityFramework/tools/EntityFramework6.psm1 b/src/NuGet/EntityFramework/tools/EntityFramework6.psm1 index 6f9f8012cc..4920add484 100644 --- a/src/NuGet/EntityFramework/tools/EntityFramework6.psm1 +++ b/src/NuGet/EntityFramework/tools/EntityFramework6.psm1 @@ -869,7 +869,7 @@ function EF6($project, $startupProject, $workingDir, $params) $projectAssetsFile = GetCpsProperty $project 'ProjectAssetsFile' $runtimeConfig = Join-Path $targetDir ($targetName + '.runtimeconfig.json') $runtimeFrameworkVersion = GetCpsProperty $project 'RuntimeFrameworkVersion' - $efPath = Join-Path $PSScriptRoot 'netcoreapp3.0\any\ef6.dll' + $efPath = Join-Path $PSScriptRoot 'netcoreapp3.1\any\ef6.dll' $dotnetParams = 'exec', '--depsfile', $depsFile From 6736dd5051066f42d41a8b0a90d99ed873984245 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sat, 7 Sep 2019 14:12:29 -0700 Subject: [PATCH 08/13] !fixup! Correct `$(TargetFramework)` condition --- Directory.Build.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 4b2ad66351..a7e9cee8e9 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -6,7 +6,8 @@ - + $(MicrosoftNETCoreAppRuntimeVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(MicrosoftNETCoreAppRefPackageVersion) From a91d27d22a5a08cf0f702c6a92373d00dcc14e43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Sep 2019 19:54:05 +0000 Subject: [PATCH 09/13] Update dependencies from https://github.com/dotnet/core-setup build 20190908.7 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19458.7 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19458.7 Dependency coherency updates - Microsoft.CSharp - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.CodeDom - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Configuration.ConfigurationManager - 4.7.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Data.SqlClient - 4.8.0-preview1.19457.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd337b4993..8462340b8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/corefx ddd5d4e90a5d7186d81018364d7473ccf237f11e - + https://github.com/dotnet/core-setup - e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/dotnet/core-setup - e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index b55f70a2e7..d8932edeae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,8 +23,8 @@ 4.8.0-preview1.19457.1 - 3.1.0-preview1.19457.10 - 3.1.0-preview1.19457.10 + 3.1.0-preview1.19458.7 + 3.1.0-preview1.19458.7 + $(NoWarn);NU5131 diff --git a/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec b/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec index 3fbfedb12a..916f249200 100644 --- a/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec +++ b/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec @@ -8,6 +8,10 @@ + + + + From d8006fed56840b6ea47f6e44bce4969a4ff705dd Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 11 Sep 2019 14:01:02 -0700 Subject: [PATCH 13/13] Fix pack --- Directory.Build.props | 4 ++++ Directory.Build.targets | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 92f9f10e90..7e20910ded 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,6 +6,10 @@ Apache-2.0 + + netcoreapp3.1 + + Microsoft;EntityFramework;EF;Database;Data;O/RM;ADO.NET Microsoft Entity Framework diff --git a/Directory.Build.targets b/Directory.Build.targets index 4a110c22be..690c58a8e7 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,9 +1,5 @@ - - netcoreapp3.1 - -