Skip to content

Commit 9cc12d6

Browse files
author
Nate McMaster
committed
Split tools into VisualStudio and DotNet packages and implement ef.exe
Issues: - Fix #646 - implements assembly-based command line interface - Fix #5273 - Split tools packages into .Tools.DotNet and .Tools.VisualStudio - Fix #5334 - Refactor cmdlets/dotnet-ef to invoke ef.exe/ef.dll - Fix #5684 - Use nuspec's instead of Sake - Fix #5839 - throw warning when architecture is not in {x86, x64, AnyCPU} Other changes: - Add --no-color and --no-appdomain to command line tools - Add --json option to 'dbcontext scaffold' and 'migrations remove' - Refactor the inside-man invocation for Tools.DotNet to use "ef.dll" instead of invoking .Design.exe. - Add native powershell module for processing/forwarding streams - Reorganize code * 💔 break up DotNet and VisualStudio command line tools into separate packages * Push down execution logic dode from Tools.VisualStudio into .Design. * Lift code from .Design.Core to .Design * Reorganize test projects * Create a powershell only project for Tools.VisualStudio * Move tests into appropriate test projects and adjust namespaces
1 parent 2742fb6 commit 9cc12d6

File tree

239 files changed

+4938
-3776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+4938
-3776
lines changed

‎EntityFramework-xproj.sln

Lines changed: 27 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCo
2222
EndProject
2323
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Relational.Design", "src\Microsoft.EntityFrameworkCore.Relational.Design\Microsoft.EntityFrameworkCore.Relational.Design.xproj", "{0B4B5871-2017-40CA-B190-AEDB974D843D}"
2424
EndProject
25-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Tools", "src\Microsoft.EntityFrameworkCore.Tools\Microsoft.EntityFrameworkCore.Tools.xproj", "{4A6CBC98-59D9-49A4-9CDF-9D6AAE8C59CF}"
26-
EndProject
2725
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Design", "src\Microsoft.EntityFrameworkCore.Design\Microsoft.EntityFrameworkCore.Design.xproj", "{4682C48A-94A2-42DF-AFBC-1C3A6CD7195A}"
2826
EndProject
2927
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Sqlite.Design", "src\Microsoft.EntityFrameworkCore.Sqlite.Design\Microsoft.EntityFrameworkCore.Sqlite.Design.xproj", "{937E330E-E8B6-43BF-A15C-CCCEE0AFDE24}"
@@ -32,9 +30,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCo
3230
EndProject
3331
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CEF61AEE-F8DA-4A3B-9D30-F6228479CA0B}"
3432
EndProject
35-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Tools.Core.FunctionalTests", "test\Microsoft.EntityFrameworkCore.Tools.Core.FunctionalTests\Microsoft.EntityFrameworkCore.Tools.Core.FunctionalTests.xproj", "{51A4DC71-404E-40AE-BBB0-DAF64087DB40}"
33+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Design.FunctionalTests", "test\Microsoft.EntityFrameworkCore.Design.FunctionalTests\Microsoft.EntityFrameworkCore.Design.FunctionalTests.xproj", "{51A4DC71-404E-40AE-BBB0-DAF64087DB40}"
3634
EndProject
37-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Tools.Core.Tests", "test\Microsoft.EntityFrameworkCore.Tools.Core.Tests\Microsoft.EntityFrameworkCore.Tools.Core.Tests.xproj", "{27F77706-090D-481C-87F6-A86873CD261B}"
35+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Design.Tests", "test\Microsoft.EntityFrameworkCore.Design.Tests\Microsoft.EntityFrameworkCore.Design.Tests.xproj", "{27F77706-090D-481C-87F6-A86873CD261B}"
3836
EndProject
3937
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.FunctionalTests", "test\Microsoft.EntityFrameworkCore.FunctionalTests\Microsoft.EntityFrameworkCore.FunctionalTests.xproj", "{5CED78E9-9D9D-4288-B87B-37E7AC97A834}"
4038
EndProject
@@ -66,19 +64,19 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCo
6664
EndProject
6765
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.SqlServer.Tests", "test\Microsoft.EntityFrameworkCore.SqlServer.Tests\Microsoft.EntityFrameworkCore.SqlServer.Tests.xproj", "{DC946BF1-3598-41C8-A979-0DBA3B19F799}"
6866
EndProject
69-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Tools.Cli.FunctionalTests", "test\Microsoft.EntityFrameworkCore.Tools.Cli.FunctionalTests\Microsoft.EntityFrameworkCore.Tools.Cli.FunctionalTests.xproj", "{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88}"
70-
EndProject
7167
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Specification.Tests", "src\Microsoft.EntityFrameworkCore.Specification.Tests\Microsoft.EntityFrameworkCore.Specification.Tests.xproj", "{AAB3C3CD-0BDD-494B-83AD-F3295AAA13CF}"
7268
EndProject
7369
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Relational.Specification.Tests", "src\Microsoft.EntityFrameworkCore.Relational.Specification.Tests\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.xproj", "{E2703F17-D2F9-43F7-A379-D0A8833AEE1E}"
7470
EndProject
7571
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests", "src\Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests\Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests.xproj", "{88796EE8-B48B-434D-AC55-FAFFC9BE0D77}"
7672
EndProject
77-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Design.Core", "src\Microsoft.EntityFrameworkCore.Design.Core\Microsoft.EntityFrameworkCore.Design.Core.xproj", "{6C155372-A8A1-4E3B-8808-E875AFE452C8}"
73+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Tools.Console", "src\Tools.Console\Tools.Console.xproj", "{EA4F8FFB-0A8B-4E04-A6D8-17E4B3D9FC27}"
7874
EndProject
79-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Tools.Tests", "test\Microsoft.EntityFrameworkCore.Tools.Tests\Microsoft.EntityFrameworkCore.Tools.Tests.xproj", "{A9F7622A-62D7-45B9-9FFB-0E00AFFA0BB7}"
75+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Tools.DotNet", "src\Tools.DotNet\Tools.DotNet.xproj", "{31132653-55A2-4ADB-BABB-60F386D2A98E}"
8076
EndProject
81-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.EntityFrameworkCore.Tools.FunctionalTests", "test\Microsoft.EntityFrameworkCore.Tools.FunctionalTests\Microsoft.EntityFrameworkCore.Tools.FunctionalTests.xproj", "{3DEF9731-D253-42E5-BF89-F04596523D12}"
77+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Tools.DotNet.FunctionalTests", "test\Tools.DotNet.FunctionalTests\Tools.DotNet.FunctionalTests.xproj", "{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88}"
78+
EndProject
79+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Tools.Console.FunctionalTests", "test\Tools.Console.FunctionalTests\Tools.Console.FunctionalTests.xproj", "{667BE700-2B7D-4E6D-BFFB-1BFFEF51D078}"
8280
EndProject
8381
Global
8482
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -110,10 +108,6 @@ Global
110108
{0B4B5871-2017-40CA-B190-AEDB974D843D}.Debug|Any CPU.Build.0 = Debug|Any CPU
111109
{0B4B5871-2017-40CA-B190-AEDB974D843D}.Release|Any CPU.ActiveCfg = Release|Any CPU
112110
{0B4B5871-2017-40CA-B190-AEDB974D843D}.Release|Any CPU.Build.0 = Release|Any CPU
113-
{4A6CBC98-59D9-49A4-9CDF-9D6AAE8C59CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
114-
{4A6CBC98-59D9-49A4-9CDF-9D6AAE8C59CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
115-
{4A6CBC98-59D9-49A4-9CDF-9D6AAE8C59CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
116-
{4A6CBC98-59D9-49A4-9CDF-9D6AAE8C59CF}.Release|Any CPU.Build.0 = Release|Any CPU
117111
{4682C48A-94A2-42DF-AFBC-1C3A6CD7195A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118112
{4682C48A-94A2-42DF-AFBC-1C3A6CD7195A}.Debug|Any CPU.Build.0 = Debug|Any CPU
119113
{4682C48A-94A2-42DF-AFBC-1C3A6CD7195A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -194,10 +188,6 @@ Global
194188
{DC946BF1-3598-41C8-A979-0DBA3B19F799}.Debug|Any CPU.Build.0 = Debug|Any CPU
195189
{DC946BF1-3598-41C8-A979-0DBA3B19F799}.Release|Any CPU.ActiveCfg = Release|Any CPU
196190
{DC946BF1-3598-41C8-A979-0DBA3B19F799}.Release|Any CPU.Build.0 = Release|Any CPU
197-
{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
198-
{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88}.Debug|Any CPU.Build.0 = Debug|Any CPU
199-
{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88}.Release|Any CPU.ActiveCfg = Release|Any CPU
200-
{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88}.Release|Any CPU.Build.0 = Release|Any CPU
201191
{AAB3C3CD-0BDD-494B-83AD-F3295AAA13CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
202192
{AAB3C3CD-0BDD-494B-83AD-F3295AAA13CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
203193
{AAB3C3CD-0BDD-494B-83AD-F3295AAA13CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -210,18 +200,22 @@ Global
210200
{88796EE8-B48B-434D-AC55-FAFFC9BE0D77}.Debug|Any CPU.Build.0 = Debug|Any CPU
211201
{88796EE8-B48B-434D-AC55-FAFFC9BE0D77}.Release|Any CPU.ActiveCfg = Release|Any CPU
212202
{88796EE8-B48B-434D-AC55-FAFFC9BE0D77}.Release|Any CPU.Build.0 = Release|Any CPU
213-
{6C155372-A8A1-4E3B-8808-E875AFE452C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
214-
{6C155372-A8A1-4E3B-8808-E875AFE452C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
215-
{6C155372-A8A1-4E3B-8808-E875AFE452C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
216-
{6C155372-A8A1-4E3B-8808-E875AFE452C8}.Release|Any CPU.Build.0 = Release|Any CPU
217-
{A9F7622A-62D7-45B9-9FFB-0E00AFFA0BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
218-
{A9F7622A-62D7-45B9-9FFB-0E00AFFA0BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
219-
{A9F7622A-62D7-45B9-9FFB-0E00AFFA0BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
220-
{A9F7622A-62D7-45B9-9FFB-0E00AFFA0BB7}.Release|Any CPU.Build.0 = Release|Any CPU
221-
{3DEF9731-D253-42E5-BF89-F04596523D12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
222-
{3DEF9731-D253-42E5-BF89-F04596523D12}.Debug|Any CPU.Build.0 = Debug|Any CPU
223-
{3DEF9731-D253-42E5-BF89-F04596523D12}.Release|Any CPU.ActiveCfg = Release|Any CPU
224-
{3DEF9731-D253-42E5-BF89-F04596523D12}.Release|Any CPU.Build.0 = Release|Any CPU
203+
{EA4F8FFB-0A8B-4E04-A6D8-17E4B3D9FC27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
204+
{EA4F8FFB-0A8B-4E04-A6D8-17E4B3D9FC27}.Debug|Any CPU.Build.0 = Debug|Any CPU
205+
{EA4F8FFB-0A8B-4E04-A6D8-17E4B3D9FC27}.Release|Any CPU.ActiveCfg = Release|Any CPU
206+
{EA4F8FFB-0A8B-4E04-A6D8-17E4B3D9FC27}.Release|Any CPU.Build.0 = Release|Any CPU
207+
{31132653-55A2-4ADB-BABB-60F386D2A98E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
208+
{31132653-55A2-4ADB-BABB-60F386D2A98E}.Debug|Any CPU.Build.0 = Debug|Any CPU
209+
{31132653-55A2-4ADB-BABB-60F386D2A98E}.Release|Any CPU.ActiveCfg = Release|Any CPU
210+
{31132653-55A2-4ADB-BABB-60F386D2A98E}.Release|Any CPU.Build.0 = Release|Any CPU
211+
{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
212+
{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88}.Debug|Any CPU.Build.0 = Debug|Any CPU
213+
{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88}.Release|Any CPU.ActiveCfg = Release|Any CPU
214+
{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88}.Release|Any CPU.Build.0 = Release|Any CPU
215+
{667BE700-2B7D-4E6D-BFFB-1BFFEF51D078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
216+
{667BE700-2B7D-4E6D-BFFB-1BFFEF51D078}.Debug|Any CPU.Build.0 = Debug|Any CPU
217+
{667BE700-2B7D-4E6D-BFFB-1BFFEF51D078}.Release|Any CPU.ActiveCfg = Release|Any CPU
218+
{667BE700-2B7D-4E6D-BFFB-1BFFEF51D078}.Release|Any CPU.Build.0 = Release|Any CPU
225219
EndGlobalSection
226220
GlobalSection(SolutionProperties) = preSolution
227221
HideSolutionNode = FALSE
@@ -233,7 +227,6 @@ Global
233227
{1420ADB9-CBEC-4BB1-8D57-22B304D1832A} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
234228
{8C421811-FA60-429B-A9BA-36E72EACF14D} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
235229
{0B4B5871-2017-40CA-B190-AEDB974D843D} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
236-
{4A6CBC98-59D9-49A4-9CDF-9D6AAE8C59CF} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
237230
{4682C48A-94A2-42DF-AFBC-1C3A6CD7195A} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
238231
{937E330E-E8B6-43BF-A15C-CCCEE0AFDE24} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
239232
{710C03E2-D30E-4B68-94E7-FCBFDE715044} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
@@ -254,12 +247,12 @@ Global
254247
{30A896EA-DB51-4E68-BD6D-4279EB5E1138} = {CEF61AEE-F8DA-4A3B-9D30-F6228479CA0B}
255248
{CF9E7087-235F-4E61-941C-BB9EDC087312} = {CEF61AEE-F8DA-4A3B-9D30-F6228479CA0B}
256249
{DC946BF1-3598-41C8-A979-0DBA3B19F799} = {CEF61AEE-F8DA-4A3B-9D30-F6228479CA0B}
257-
{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88} = {CEF61AEE-F8DA-4A3B-9D30-F6228479CA0B}
258250
{AAB3C3CD-0BDD-494B-83AD-F3295AAA13CF} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
259251
{E2703F17-D2F9-43F7-A379-D0A8833AEE1E} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
260252
{88796EE8-B48B-434D-AC55-FAFFC9BE0D77} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
261-
{6C155372-A8A1-4E3B-8808-E875AFE452C8} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
262-
{A9F7622A-62D7-45B9-9FFB-0E00AFFA0BB7} = {CEF61AEE-F8DA-4A3B-9D30-F6228479CA0B}
263-
{3DEF9731-D253-42E5-BF89-F04596523D12} = {CEF61AEE-F8DA-4A3B-9D30-F6228479CA0B}
253+
{EA4F8FFB-0A8B-4E04-A6D8-17E4B3D9FC27} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
254+
{31132653-55A2-4ADB-BABB-60F386D2A98E} = {7067BD06-DEBE-49A0-BC78-AB99B06424FC}
255+
{100C88C9-C14D-4B4D-ADE9-50FBC6A03B88} = {CEF61AEE-F8DA-4A3B-9D30-F6228479CA0B}
256+
{667BE700-2B7D-4E6D-BFFB-1BFFEF51D078} = {CEF61AEE-F8DA-4A3B-9D30-F6228479CA0B}
264257
EndGlobalSection
265258
EndGlobal

0 commit comments

Comments
 (0)