From 183d455002a62efea26492438b918041e6d40c75 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 3 Mar 2022 12:56:33 -0800 Subject: [PATCH 01/20] Remove use of target frameworks prior to net472 --- tools/EntityFramework.settings.targets | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/EntityFramework.settings.targets b/tools/EntityFramework.settings.targets index 4ba23306..f39860dc 100644 --- a/tools/EntityFramework.settings.targets +++ b/tools/EntityFramework.settings.targets @@ -28,9 +28,7 @@ Project global pre-settings. 0 $(VersionReleasePrefix) - v4.5 - v4.6 - v4.7.2 + v4.7.2 From 2a5027681d882f7c2a8b85ff947e95e720c77bbb Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 17 Mar 2022 10:55:51 -0700 Subject: [PATCH 02/20] Convert XmlCore to SDK-style project --- Directory.Build.props | 16 ++++++ Directory.Build.targets | 5 ++ src/EFTools/XmlCore/XmlCore.csproj | 72 ++++++++------------------ tools/EntityFramework.settings.targets | 1 + 4 files changed, 45 insertions(+), 49 deletions(-) create mode 100644 Directory.Build.targets diff --git a/Directory.Build.props b/Directory.Build.props index 1eebc91c..b7c4f95a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,4 +20,20 @@ $(MicrosoftVisualStudioPackageCurrent) 1.9.2 + + + + false + + + false + + true + + + + true + true + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 00000000..bab90866 --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,5 @@ + + + $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk + + diff --git a/src/EFTools/XmlCore/XmlCore.csproj b/src/EFTools/XmlCore/XmlCore.csproj index 9b09b3e7..fda5fa23 100644 --- a/src/EFTools/XmlCore/XmlCore.csproj +++ b/src/EFTools/XmlCore/XmlCore.csproj @@ -1,51 +1,22 @@  - + + + - PackageReference - Debug - AnyCPU - {79B40A85-CDCC-4AC3-A583-77CA43CB5136} - Library - Properties + $(ToolingDotNetFrameworkSdkVersion) Microsoft.Data.Tools.XmlDesignerBase Microsoft.Data.Tools.Design.XmlCore - $(OutputPath)$(RootNamespace).xml - $(ToolingDotNetFrameworkVersion) - 512 false true - - AnyCPU - true - full - false - DEBUG;TRACE - prompt - 4 - 1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - AnyCPU - pdbonly - true - TRACE - prompt - 4 - 1573;1572;1570;1711;1712;1587;1584;1571;1589 - + + $(NoWarn);1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 $(NoWarn);VSTHRD001;VSSDK006 - true - - - $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk - - - true + @@ -59,18 +30,32 @@ + + + + + ResXFileCodeGenerator + Designer + CommonResource.Designer.cs + + + ResXFileCodeGenerator + ControlsResources.Designer.cs + Designer + ResXFileCodeGenerator Resources.Designer.cs Designer + Properties\SharedAssemblyInfo.cs @@ -267,18 +252,7 @@ - - - ResXFileCodeGenerator - Designer - CommonResource.Designer.cs - - - ResXFileCodeGenerator - ControlsResources.Designer.cs - Designer - - + MSBuild:Compile @@ -289,5 +263,5 @@ Designer - + \ No newline at end of file diff --git a/tools/EntityFramework.settings.targets b/tools/EntityFramework.settings.targets index f39860dc..f7698f7e 100644 --- a/tools/EntityFramework.settings.targets +++ b/tools/EntityFramework.settings.targets @@ -29,6 +29,7 @@ Project global pre-settings. $(VersionReleasePrefix) v4.7.2 + net472 From a33cde531235e923530ca3fd8ef0d19caa7fd5d5 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 17 Mar 2022 10:59:07 -0700 Subject: [PATCH 03/20] Convert DesignXmlCore to SDK-style project --- .../DesignXmlCore/DesignXmlCore.csproj | 82 ++++++------------- 1 file changed, 26 insertions(+), 56 deletions(-) diff --git a/src/EFTools/DesignXmlCore/DesignXmlCore.csproj b/src/EFTools/DesignXmlCore/DesignXmlCore.csproj index ac6c01fe..7bffe0b2 100644 --- a/src/EFTools/DesignXmlCore/DesignXmlCore.csproj +++ b/src/EFTools/DesignXmlCore/DesignXmlCore.csproj @@ -1,54 +1,24 @@  - + + + - PackageReference - Debug - AnyCPU - {6C80DBCA-16C8-48C9-9019-AB6FDED788DE} - Library - Properties Microsoft.VisualStudio.Data.Tools.Design.XmlCore - $(OutputPath)$(AssemblyName).xml Microsoft.VisualStudio.Data.Tools.Design.XmlCore - $(ToolingDotNetFrameworkVersion) + $(ToolingDotNetFrameworkSdkVersion) false - 512 - - - AnyCPU - true - full - false - DEBUG;TRACE - prompt - 4 - 1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - AnyCPU - pdbonly - true - TRACE - prompt - 4 - 1573;1572;1570;1711;1712;1587;1584;1571;1589 + + $(NoWarn);1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 $(NoWarn);VSTHRD010;VSTHRD001;VSSDK006 + None - - true - - - $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk - - - true - + @@ -63,7 +33,9 @@ + + @@ -77,17 +49,32 @@ + + + + + ResXFileCodeGenerator Resources.Designer.cs Designer + + Microsoft.Data.Tools.VSXmlDesignerBase.VirtualTreeGrid.VirtualTreeControl.resources + + + Microsoft.Data.Tools.VSXmlDesignerBase.VirtualTreeGrid.arrow.ico + + + Microsoft.Data.Tools.VSXmlDesignerBase.VirtualTreeGrid.dotdotdot.ico + ProgressDialog.cs Designer + Properties\SharedAssemblyInfo.cs @@ -253,22 +240,5 @@ - - - Microsoft.Data.Tools.VSXmlDesignerBase.VirtualTreeGrid.VirtualTreeControl.resources - - - Microsoft.Data.Tools.VSXmlDesignerBase.VirtualTreeGrid.arrow.ico - - - Microsoft.Data.Tools.VSXmlDesignerBase.VirtualTreeGrid.dotdotdot.ico - - - - - {79b40a85-cdcc-4ac3-a583-77ca43cb5136} - XmlCore - - - + \ No newline at end of file From aef1061d7477d824d6e6fe1108437fb7e646c7f8 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 17 Mar 2022 11:02:03 -0700 Subject: [PATCH 04/20] Convert EntityDesignBootstrapPackage to SDK-style project --- .../EntityDesignBootstrapPackage.csproj | 79 +++++++------------ 1 file changed, 28 insertions(+), 51 deletions(-) diff --git a/src/EFTools/EntityDesignBootstrapPackage/EntityDesignBootstrapPackage.csproj b/src/EFTools/EntityDesignBootstrapPackage/EntityDesignBootstrapPackage.csproj index 758a1ee7..75798330 100644 --- a/src/EFTools/EntityDesignBootstrapPackage/EntityDesignBootstrapPackage.csproj +++ b/src/EFTools/EntityDesignBootstrapPackage/EntityDesignBootstrapPackage.csproj @@ -1,60 +1,37 @@  - + + + true + - PackageReference - Debug - AnyCPU - Library - Properties Microsoft.Data.Entity.Design.BootstrapPackage - $(OutputPath)$(AssemblyName).xml Microsoft.Data.Entity.Design.BootstrapPackage - $(ToolingDotNetFrameworkVersion) - 512 + $(ToolingDotNetFrameworkSdkVersion) false false - true - {FC48CB33-A0D9-49ED-841D-CC88FD3D761D} - - - AnyCPU - true - full - false - DEBUG;TRACE - prompt - 4 - 1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - AnyCPU - pdbonly - true - TRACE - prompt - 4 - 1573;1572;1570;1711;1712;1587;1584;1571;1589 + + $(NoWarn);1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 + $(NoWarn);VSSDK006 + - $(NoWarn);VSSDK006 $(DefineConstants);IS_BOOTSTRAP_PACKAGE - - true - - - $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk - - - true - + + + + + + + + @@ -63,12 +40,16 @@ + - - - - + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + Properties\SharedAssemblyInfo.cs @@ -81,16 +62,12 @@ True Resources.resx - + - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - + - + From 942ed694dbcda7f8d4d57b0fc7774848984e074b Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 17 Mar 2022 11:04:09 -0700 Subject: [PATCH 05/20] Convert EntityDesignExtensibility to SDK-style project --- .../EntityDesignExtensibility.csproj | 67 ++++++------------- 1 file changed, 21 insertions(+), 46 deletions(-) diff --git a/src/EFTools/EntityDesignExtensibility/EntityDesignExtensibility.csproj b/src/EFTools/EntityDesignExtensibility/EntityDesignExtensibility.csproj index dedd6eca..ce905dce 100644 --- a/src/EFTools/EntityDesignExtensibility/EntityDesignExtensibility.csproj +++ b/src/EFTools/EntityDesignExtensibility/EntityDesignExtensibility.csproj @@ -1,58 +1,40 @@  - + + + - PackageReference - Debug - AnyCPU - {092010FF-C0C3-4564-B8F0-7758E630DE00} - Library - Properties Microsoft.Data.Entity.Design.Extensibility - $(OutputPath)$(AssemblyName).xml Microsoft.Data.Entity.Design.Extensibility false - $(ToolingDotNetFrameworkVersion) + $(ToolingDotNetFrameworkSdkVersion) false - 512 - - - AnyCPU - true - full - false - DEBUG;TRACE - prompt - 4 - 1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - AnyCPU - pdbonly - true - TRACE - prompt - 4 - 1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - true - - - $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk + - true + $(NoWarn);1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 - - + + + + + + + + + ResXFileCodeGenerator + Resources1.Designer.cs + Designer + + + @@ -82,14 +64,7 @@ - - - ResXFileCodeGenerator - Resources1.Designer.cs - Designer - - - + From d79e09dbc52edcfcf25436770acb670e20b4bc4e Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 17 Mar 2022 11:23:40 -0700 Subject: [PATCH 06/20] Convert runtime projects to SDK-style projects --- Directory.Build.targets | 2 +- .../EntityFramework.SqlServer.csproj | 94 ++++---------- .../EntityFramework.SqlServerCompact.csproj | 115 +++++------------- src/EntityFramework/EntityFramework.csproj | 84 +++---------- 4 files changed, 78 insertions(+), 217 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index bab90866..e5f82acd 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk + $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk diff --git a/src/EntityFramework.SqlServer/EntityFramework.SqlServer.csproj b/src/EntityFramework.SqlServer/EntityFramework.SqlServer.csproj index 62c76645..ef137ee8 100644 --- a/src/EntityFramework.SqlServer/EntityFramework.SqlServer.csproj +++ b/src/EntityFramework.SqlServer/EntityFramework.SqlServer.csproj @@ -1,64 +1,22 @@  - - + + + + - Debug - AnyCPU - 8.0.30703 - 2.0 - {6F4BB80B-5F74-44D3-A77F-0025DFA48C1A} - Library - Properties + net45;net40 System.Data.Entity.SqlServer - EntityFramework.SqlServer - $(OutputPath)$(AssemblyName).xml - 512 - true - ..\EcmaPublicKey.snk - true - - - v4.5 - true - full - false - TRACE;DEBUG;SQLSERVER - prompt - 4 - true - 1591;1573;1572;1570 - - - v4.5 - pdbonly - true - TRACE;CODE_ANALYSIS;SQLSERVER - prompt - 4 - true - 1573;1572;1570 + $(DefineConstants);SQLSERVER - - v4.0 - true - full - false - TRACE;DEBUG;NET40;SQLSERVER - prompt - 4 - true - 1591;1573;1572;1570 + + + ..\EcmaPublicKey.snk - - v4.0 - pdbonly - true - TRACE;CODE_ANALYSIS;NET40;SQLSERVER - prompt - 4 - true - 1573;1572;1570 + + + $(NoWarn);1591;1573;1572;1570 + @@ -66,6 +24,11 @@ + + + + + Utilities\TaskExtensions.cs @@ -161,9 +124,11 @@ + + Properties\EcmaPublicKey.snk @@ -173,6 +138,9 @@ Resources.SqlServer.cs System.Data.Entity.SqlServer + + + Designer @@ -198,21 +166,9 @@ System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml + - - - {e06d1c12-efe8-4413-a15c-ae01fc158f2f} - EntityFramework - - - - + \ No newline at end of file diff --git a/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj b/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj index 525a1eba..d4ad6982 100644 --- a/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj +++ b/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj @@ -1,70 +1,23 @@  - - + + + + - PackageReference - Debug - AnyCPU - 8.0.30703 - 2.0 - {1EF9C524-7122-4677-B111-DD14BB2A9EA2} - Library - Properties + net45;net40 System.Data.Entity.SqlServerCompact - EntityFramework.SqlServerCompact - $(OutputPath)$(AssemblyName).xml - 512 - true - ..\EcmaPublicKey.snk - true - ..\.. - true - - - v4.5 - true - full - false - TRACE;DEBUG;SQLSERVERCOMPACT - prompt - 4 - true - 1591;1573;1572;1570 - - - v4.5 - pdbonly - true - TRACE;CODE_ANALYSIS;SQLSERVERCOMPACT - prompt - 4 - true - 1573;1572;1570 + $(DefineConstants);SQLSERVERCOMPACT - - v4.0 - true - full - false - TRACE;DEBUG;NET40;SQLSERVERCOMPACT - prompt - 4 - true - 1591;1573;1572;1570 + + + ..\EcmaPublicKey.snk - - v4.0 - pdbonly - true - TRACE;CODE_ANALYSIS;NET40;SQLSERVERCOMPACT - prompt - 4 - true - 1573;1572;1570 + + + $(NoWarn);1591;1573;1572;1570 - - + @@ -72,6 +25,15 @@ + + + + + + + + + Properties\SharedAssemblyInfo.cs @@ -139,22 +101,27 @@ + + Properties\EcmaPublicKey.snk - - Designer - TextTemplatingFileGenerator Resources.SqlServerCompact.cs System.Data.Entity.SqlServerCompact + + + + + Designer + Microsoft.SqlServerCe.Client.Resources.Entity.SqlCeProviderServices.StoreSchemaDefinition.ssdl @@ -168,27 +135,9 @@ System.Data.Resources.SqlServerCe.Entity.SqlCeProviderServices.StoreSchemaMapping.msl + - - - {e06d1c12-efe8-4413-a15c-ae01fc158f2f} - EntityFramework - - - - - - - - - + \ No newline at end of file diff --git a/src/EntityFramework/EntityFramework.csproj b/src/EntityFramework/EntityFramework.csproj index 4a8125b7..4b68dd08 100644 --- a/src/EntityFramework/EntityFramework.csproj +++ b/src/EntityFramework/EntityFramework.csproj @@ -1,64 +1,21 @@  - - + + + + - Debug - AnyCPU - 8.0.30703 - 2.0 - {E06D1C12-EFE8-4413-A15C-AE01FC158F2F} - Library - Properties + net45;net40 System.Data.Entity - EntityFramework - $(OutputPath)$(AssemblyName).xml - 512 - true - ..\EcmaPublicKey.snk - true - - - v4.5 - true - full - false - TRACE;DEBUG - prompt - 4 - true - 1591;1573;1572;1570 - - v4.5 - pdbonly - true - TRACE;CODE_ANALYSIS - prompt - 4 - true - 1573;1572;1570 - - - v4.0 - true - full - false - TRACE;DEBUG;NET40 - prompt - 4 - true - 1591;1573;1572;1570 + + + ..\EcmaPublicKey.snk - - v4.0 - pdbonly - true - TRACE;CODE_ANALYSIS;NET40 - prompt - 4 - true - 1573;1572;1570 + + + $(NoWarn);1591;1573;1572;1570 + @@ -72,6 +29,7 @@ + Properties\SharedAssemblyInfo.cs @@ -1838,9 +1796,11 @@ + + Properties\EcmaPublicKey.snk @@ -1864,6 +1824,9 @@ Resources.cs System.Data.Entity + + + Designer @@ -1923,16 +1886,9 @@ System.Data.Resources.ProviderServices.ProviderManifest.xsd + - - - + \ No newline at end of file From 7f5b561658b58b4597e000f4992c7b95e743769d Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 17 Mar 2022 11:28:39 -0700 Subject: [PATCH 07/20] Convert VsIdeTestHostFramework to SDK-style project --- .../Framework/VsIdeTestHostFramework.csproj | 56 ++++--------------- 1 file changed, 11 insertions(+), 45 deletions(-) diff --git a/tools/VsIdeHostAdapter/Framework/VsIdeTestHostFramework.csproj b/tools/VsIdeHostAdapter/Framework/VsIdeTestHostFramework.csproj index dac3e197..f917a935 100644 --- a/tools/VsIdeHostAdapter/Framework/VsIdeTestHostFramework.csproj +++ b/tools/VsIdeHostAdapter/Framework/VsIdeTestHostFramework.csproj @@ -1,49 +1,23 @@  - - - + + + + - PackageReference - Release - AnyCPU - {614AC98E-A68E-4EB4-AF27-1CEDBA7CA3B4} - Library - Properties + net45 Framework Microsoft.VisualStudio.QualityTools.VsIdeTestHostFramework - v4.5 - 512 - - - true - full - false - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - TRACE - prompt - 4 - - - true - - - $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk - - - true + - - + + + + + Properties\SharedAssemblyInfo.cs @@ -54,13 +28,5 @@ - - \ No newline at end of file From 8629376c3c39a3394e58692dfff1ed03bd9d379d Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 17 Mar 2022 11:31:26 -0700 Subject: [PATCH 08/20] Convert EntityDesignerVersioningFacade to SDK-style project --- .../EntityDesignerVersioningFacade.csproj | 77 +++++-------------- 1 file changed, 21 insertions(+), 56 deletions(-) diff --git a/src/EFTools/EntityDesignerVersioningFacade/EntityDesignerVersioningFacade.csproj b/src/EFTools/EntityDesignerVersioningFacade/EntityDesignerVersioningFacade.csproj index e59e652a..11f1a214 100644 --- a/src/EFTools/EntityDesignerVersioningFacade/EntityDesignerVersioningFacade.csproj +++ b/src/EFTools/EntityDesignerVersioningFacade/EntityDesignerVersioningFacade.csproj @@ -1,45 +1,18 @@  - + + - + - Debug - AnyCPU - {0518E682-510D-48F8-BB14-7151C50A1850} - Library - Properties + $(ToolingDotNetFrameworkSdkVersion) Microsoft.Data.Entity.Design.VersioningFacade Microsoft.Data.Entity.Design.VersioningFacade - $(OutputPath)$(AssemblyName).xml - $(ToolingDotNetFrameworkVersion) - 512 - - - true - full - false - DEBUG;TRACE - prompt - 4 - 1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - pdbonly - true - TRACE - prompt - 4 - 1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - true - - - $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk + - true + $(NoWarn);1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 + @@ -50,6 +23,19 @@ + + + + + + + + ResXFileCodeGenerator + Resources.VersioningFacade.Designer.cs + Designer + + + Properties\SharedAssemblyInfo.cs @@ -118,26 +104,5 @@ - - - {e06d1c12-efe8-4413-a15c-ae01fc158f2f} - EntityFramework - - - - - ResXFileCodeGenerator - Resources.VersioningFacade.Designer.cs - Designer - - - - - + \ No newline at end of file From 5041843a6d1c786c8bfd972e9269d61c8e998047 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 17 Mar 2022 11:58:01 -0700 Subject: [PATCH 09/20] Convert EntityDesignDatabaseGeneration to SDK-style project --- .../EntityDesignDatabaseGeneration.csproj | 79 +++++-------------- 1 file changed, 21 insertions(+), 58 deletions(-) diff --git a/src/EFTools/EntityDesignDatabaseGeneration/EntityDesignDatabaseGeneration.csproj b/src/EFTools/EntityDesignDatabaseGeneration/EntityDesignDatabaseGeneration.csproj index b2c0d1be..dfa59337 100644 --- a/src/EFTools/EntityDesignDatabaseGeneration/EntityDesignDatabaseGeneration.csproj +++ b/src/EFTools/EntityDesignDatabaseGeneration/EntityDesignDatabaseGeneration.csproj @@ -1,48 +1,19 @@  - + + + - Debug - AnyCPU - {15000B5C-C005-473A-BA65-EAF37E660B2C} - Library - Properties + $(ToolingDotNetFrameworkSdkVersion) Microsoft.Data.Entity.Design.DatabaseGeneration - $(OutputPath)$(AssemblyName).xml Microsoft.Data.Entity.Design.DatabaseGeneration false - $(ToolingDotNetFrameworkVersion) - false - 512 - - - AnyCPU - true - full - false - DEBUG;TRACE - prompt - 4 - 1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - AnyCPU - pdbonly - true - TRACE - prompt - 4 - 1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - true - - - $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk + - true + $(NoWarn);1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 + @@ -53,20 +24,21 @@ + - - {e06d1c12-efe8-4413-a15c-ae01fc158f2f} - EntityFramework - - - {0518e682-510d-48f8-bb14-7151c50a1850} - EntityDesignerVersioningFacade - - - {79b40a85-cdcc-4ac3-a583-77ca43cb5136} - XmlCore - + + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + Properties\SharedAssemblyInfo.cs @@ -91,14 +63,5 @@ Resources.resx - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - - - + \ No newline at end of file From 784cd8e56069208928221c85b6e6a4910b23656d Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 17 Mar 2022 12:06:40 -0700 Subject: [PATCH 10/20] Convert EntityDesignModel to SDK-style project --- .../EntityDesignModel.csproj | 88 ++++++------------- 1 file changed, 28 insertions(+), 60 deletions(-) diff --git a/src/EFTools/EntityDesignModel/EntityDesignModel.csproj b/src/EFTools/EntityDesignModel/EntityDesignModel.csproj index e4c23f81..8c294dd0 100644 --- a/src/EFTools/EntityDesignModel/EntityDesignModel.csproj +++ b/src/EFTools/EntityDesignModel/EntityDesignModel.csproj @@ -1,50 +1,22 @@  - + + + - Debug - AnyCPU - Library - Properties + $(ToolingDotNetFrameworkSdkVersion) Microsoft.Data.Entity.Design.Model Microsoft.Data.Entity.Design.Model - $(OutputPath)$(AssemblyName).xml - $(ToolingDotNetFrameworkVersion) - 512 false false true - {B44E942F-0AD1-4FB4-9146-DD1F8E17D4D8} - - - AnyCPU - true - full - false - DEBUG;TRACE - prompt - 4 - 1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - AnyCPU - pdbonly - true - TRACE - prompt - 4 - 1573;1572;1570;1711;1712;1587;1584;1571;1589 - - - true + - $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk - - - true + $(NoWarn);1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 + @@ -55,6 +27,24 @@ + + + + + + + + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + Validation\RuntimeErrorCodes\MappingErrorCode.cs @@ -417,6 +407,7 @@ + TextTemplatingFileGenerator @@ -424,34 +415,11 @@ - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - - - {e06d1c12-efe8-4413-a15c-ae01fc158f2f} - EntityFramework - - - {0518e682-510d-48f8-bb14-7151c50a1850} - EntityDesignerVersioningFacade - - - {79b40a85-cdcc-4ac3-a583-77ca43cb5136} - XmlCore - - - + + \ No newline at end of file From e42ab012862db669a8ee022a5c5d7b794f19509e Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Thu, 17 Mar 2022 12:06:55 -0700 Subject: [PATCH 11/20] Convert EntityDesign to SDK-style project --- src/EFTools/EntityDesign/EntityDesign.csproj | 344 ++++++++----------- 1 file changed, 152 insertions(+), 192 deletions(-) diff --git a/src/EFTools/EntityDesign/EntityDesign.csproj b/src/EFTools/EntityDesign/EntityDesign.csproj index d452812e..cb12abb2 100644 --- a/src/EFTools/EntityDesign/EntityDesign.csproj +++ b/src/EFTools/EntityDesign/EntityDesign.csproj @@ -1,51 +1,53 @@  - + + + - PackageReference - Debug - AnyCPU - {F904B4BE-C7CF-4E4F-85B7-B006A2D1C561} - Library - Properties + $(ToolingDotNetFrameworkSdkVersion) Microsoft.Data.Entity.Design - $(OutputPath)$(AssemblyName).xml Microsoft.Data.Entity.Design false - $(ToolingDotNetFrameworkVersion) - false - 512 - $(NoWarn);VSTHRD010;VSSDK006;VSTHRD001 - - true - full - false - DEBUG;TRACE - prompt - 4 + + $(NoWarn);1591;1573;1572;1570;1711;1712;1587;1584;1571;1589 + $(NoWarn);VSTHRD010;VSSDK006;VSTHRD001 - - pdbonly - true - TRACE - prompt - 4 - $(NoWarn);1573;1572;1570;1711;1712;1587;1584;1571;1589 - + None - - true - - - $(RepositoryRoot)src\EFTools\EFToolsPublicKey.snk - - - true - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -77,34 +79,19 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + VisualStudio\HandlerBase.cs @@ -325,77 +312,10 @@ - - TextTemplatingFilePreprocessor - DefaultCSharpContextGenerator.cs - Microsoft.Data.Entity.Design.CodeGeneration - - - TextTemplatingFilePreprocessor - DefaultCSharpEntityTypeGenerator.cs - Microsoft.Data.Entity.Design.CodeGeneration - - - TextTemplatingFilePreprocessor - DefaultVBContextGenerator.cs - Microsoft.Data.Entity.Design.CodeGeneration - - - TextTemplatingFilePreprocessor - DefaultVBEntityTypeGenerator.cs - Microsoft.Data.Entity.Design.CodeGeneration - - - TextTemplatingFileGenerator - DbContext.txt - - - - - - - - - - - TextTemplatingFileGenerator - CodeFirst.txt - - - - PreserveNewest - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - AssemblyResources.xaml Code - - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - @@ -722,10 +642,92 @@ Strings.resx Always + + + Form + + + DebugViewerDialog.cs + + + + + + TextTemplatingFilePreprocessor + DefaultCSharpContextGenerator.cs + Microsoft.Data.Entity.Design.CodeGeneration + + + TextTemplatingFilePreprocessor + DefaultCSharpEntityTypeGenerator.cs + Microsoft.Data.Entity.Design.CodeGeneration + + + TextTemplatingFilePreprocessor + DefaultVBContextGenerator.cs + Microsoft.Data.Entity.Design.CodeGeneration + + + TextTemplatingFilePreprocessor + DefaultVBEntityTypeGenerator.cs + Microsoft.Data.Entity.Design.CodeGeneration + + + TextTemplatingFileGenerator + DbContext.txt + + + + + + + + + + + TextTemplatingFileGenerator + CodeFirst.txt + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + - + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + @@ -734,6 +736,9 @@ + + + True True @@ -764,20 +769,12 @@ + DeleteStorageEntitySetsDialog.cs Designer - - PreserveNewest - - - PreserveNewest - - - - PublicResXFileCodeGenerator Designer @@ -869,8 +866,14 @@ Strings.Designer.cs Always + + DebugViewerDialog.cs + Designer + + + @@ -898,8 +901,6 @@ - - @@ -911,6 +912,7 @@ + @@ -927,72 +929,26 @@ - - - - Form - - - DebugViewerDialog.cs - - - - - DebugViewerDialog.cs - Designer - - + - - - {6f4bb80b-5f74-44d3-a77f-0025dfa48c1a} - EntityFramework.SqlServer - - - {e06d1c12-efe8-4413-a15c-ae01fc158f2f} - EntityFramework - - - {6c80dbca-16c8-48c9-9019-ab6fded788de} - DesignXmlCore - - - {0518e682-510d-48f8-bb14-7151c50a1850} - EntityDesignerVersioningFacade - - - {79b40a85-cdcc-4ac3-a583-77ca43cb5136} - XmlCore - - - {15000b5c-c005-473a-ba65-eaf37e660b2c} - EntityDesignDatabaseGeneration - - - {092010ff-c0c3-4564-b8f0-7758e630de00} - EntityDesignExtensibility - - - {b44e942f-0ad1-4fb4-9146-dd1f8e17d4d8} - EntityDesignModel - - + + - - + $(BuildDependsOn); CreateTemplatesAndPackages; + $(TargetDir)EntityDesigner\Templates @@ -1015,6 +971,7 @@ +