Skip to content

Commit 7dd8d8a

Browse files
rprouserprouse
committed
Moved the C++ test assemblies out to their own solution
1 parent 5031a06 commit 7dd8d8a

File tree

2 files changed

+49
-37
lines changed

2 files changed

+49
-37
lines changed

‎MockCppAssemblies.sln

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.31101.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock-cpp-clr-x64", "src\NUnitEngine\mock-cpp-clr\mock-cpp-clr-x64.vcxproj", "{FFF45826-991F-465B-8A03-0E1DB7E8F38C}"
7+
EndProject
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock-cpp-clr-x86", "src\NUnitEngine\mock-cpp-clr\mock-cpp-clr-x86.vcxproj", "{11640C9F-03A3-456B-848D-9B4A126F9506}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Mixed Platforms = Debug|Mixed Platforms
13+
Release|Mixed Platforms = Release|Mixed Platforms
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{FFF45826-991F-465B-8A03-0E1DB7E8F38C}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
17+
{FFF45826-991F-465B-8A03-0E1DB7E8F38C}.Debug|Mixed Platforms.Build.0 = Debug|x64
18+
{FFF45826-991F-465B-8A03-0E1DB7E8F38C}.Release|Mixed Platforms.ActiveCfg = Release|x64
19+
{FFF45826-991F-465B-8A03-0E1DB7E8F38C}.Release|Mixed Platforms.Build.0 = Release|x64
20+
{11640C9F-03A3-456B-848D-9B4A126F9506}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
21+
{11640C9F-03A3-456B-848D-9B4A126F9506}.Debug|Mixed Platforms.Build.0 = Debug|Win32
22+
{11640C9F-03A3-456B-848D-9B4A126F9506}.Release|Mixed Platforms.ActiveCfg = Release|Win32
23+
{11640C9F-03A3-456B-848D-9B4A126F9506}.Release|Mixed Platforms.Build.0 = Release|Win32
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
EndGlobal

‎nunit.sln

+21-37
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.31101.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitFramework", "NUnitFramework", "{5D8A9D62-C11C-45B2-8965-43DE8160B558}"
57
EndProject
68
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NET-2.0", "NET-2.0", "{64FE69B2-CE0B-4A47-83A3-9DE803851447}"
@@ -91,10 +93,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-console.tests", "src\
9193
EndProject
9294
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit-agent-x86", "src\NUnitEngine\nunit-agent\nunit-agent-x86.csproj", "{28B605B2-E2E9-417E-8369-49E263F1F31B}"
9395
EndProject
94-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock-cpp-clr-x64", "src\NUnitEngine\mock-cpp-clr\mock-cpp-clr-x64.vcxproj", "{FFF45826-991F-465B-8A03-0E1DB7E8F38C}"
95-
EndProject
96-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock-cpp-clr-x86", "src\NUnitEngine\mock-cpp-clr\mock-cpp-clr-x86.vcxproj", "{11640C9F-03A3-456B-848D-9B4A126F9506}"
97-
EndProject
9896
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Portable", "Portable", "{A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7}"
9997
EndProject
10098
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework-portable", "src\NUnitFramework\framework\nunit.framework-portable.csproj", "{D6FBBB3A-F6B8-45BB-B657-A7226AB96624}"
@@ -367,18 +365,6 @@ Global
367365
{28B605B2-E2E9-417E-8369-49E263F1F31B}.Release|Any CPU.Build.0 = Release|Any CPU
368366
{28B605B2-E2E9-417E-8369-49E263F1F31B}.Release|Mixed Platforms.ActiveCfg = Release|x86
369367
{28B605B2-E2E9-417E-8369-49E263F1F31B}.Release|Mixed Platforms.Build.0 = Release|x86
370-
{FFF45826-991F-465B-8A03-0E1DB7E8F38C}.Debug|Any CPU.ActiveCfg = Debug|Win32
371-
{FFF45826-991F-465B-8A03-0E1DB7E8F38C}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
372-
{FFF45826-991F-465B-8A03-0E1DB7E8F38C}.Debug|Mixed Platforms.Build.0 = Debug|x64
373-
{FFF45826-991F-465B-8A03-0E1DB7E8F38C}.Release|Any CPU.ActiveCfg = Release|Win32
374-
{FFF45826-991F-465B-8A03-0E1DB7E8F38C}.Release|Mixed Platforms.ActiveCfg = Release|x64
375-
{FFF45826-991F-465B-8A03-0E1DB7E8F38C}.Release|Mixed Platforms.Build.0 = Release|x64
376-
{11640C9F-03A3-456B-848D-9B4A126F9506}.Debug|Any CPU.ActiveCfg = Debug|Win32
377-
{11640C9F-03A3-456B-848D-9B4A126F9506}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
378-
{11640C9F-03A3-456B-848D-9B4A126F9506}.Debug|Mixed Platforms.Build.0 = Debug|Win32
379-
{11640C9F-03A3-456B-848D-9B4A126F9506}.Release|Any CPU.ActiveCfg = Release|Win32
380-
{11640C9F-03A3-456B-848D-9B4A126F9506}.Release|Mixed Platforms.ActiveCfg = Release|Win32
381-
{11640C9F-03A3-456B-848D-9B4A126F9506}.Release|Mixed Platforms.Build.0 = Release|Win32
382368
{D6FBBB3A-F6B8-45BB-B657-A7226AB96624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
383369
{D6FBBB3A-F6B8-45BB-B657-A7226AB96624}.Debug|Any CPU.Build.0 = Debug|Any CPU
384370
{D6FBBB3A-F6B8-45BB-B657-A7226AB96624}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -549,59 +535,57 @@ Global
549535
EndGlobalSection
550536
GlobalSection(NestedProjects) = preSolution
551537
{64FE69B2-CE0B-4A47-83A3-9DE803851447} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
552-
{FC222F6D-D86B-4ACD-85CC-31A3D8BCF967} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
553-
{83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
554-
{7B573D52-181D-482F-A61C-82E543B3E958} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
555-
{A21BFC37-44FC-41A0-B6E7-6F949F45A635} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
556-
{A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
557538
{12B66B03-90F1-4992-BD33-BDF3C69AE49E} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
558539
{2E368281-3BA8-4050-B05E-0E0E43F8F446} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
559540
{15B64946-4989-4873-915C-3E181772FA03} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
560541
{B0791F6D-5D14-40DD-A2CB-5D2A97892693} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
561542
{EA9871E3-9972-4476-821E-3961C28125E8} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
562-
{28C7B9D6-BE1F-45E5-952C-0D5C9CA3EFDF} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
543+
{FC222F6D-D86B-4ACD-85CC-31A3D8BCF967} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
563544
{EE7E1D47-C686-496A-81F2-B05F085BC21F} = {FC222F6D-D86B-4ACD-85CC-31A3D8BCF967}
564545
{7C36E4B4-16A7-450B-9919-BA35825F46B6} = {FC222F6D-D86B-4ACD-85CC-31A3D8BCF967}
565546
{CF37B690-0DF8-4E61-A716-49640191907C} = {FC222F6D-D86B-4ACD-85CC-31A3D8BCF967}
566547
{A59532C1-4C4F-48D8-9792-3BBAC9E39252} = {FC222F6D-D86B-4ACD-85CC-31A3D8BCF967}
567548
{A5CD398A-4F17-4973-A05F-540C05E04E96} = {FC222F6D-D86B-4ACD-85CC-31A3D8BCF967}
568-
{CE9EF1EE-B954-4DEA-B016-952F5F4B11A2} = {FC222F6D-D86B-4ACD-85CC-31A3D8BCF967}
549+
{83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
569550
{6A281C98-B74D-403B-8536-966871B992E3} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
570551
{DDCE1AE3-AA0D-4E2D-AD1B-8CA322AFA7DD} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
571552
{1D38AEC8-F5C0-4B1C-A0AE-18F4015A2E78} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
572553
{A35E6AD6-6D46-41E1-8DB1-A41086793893} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
573554
{08D0F53A-CD37-4060-B5A2-BCC202F0DE46} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
574-
{DBD0C8B0-BE4E-4CBF-AAD4-44BEA2EA830B} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
555+
{7B573D52-181D-482F-A61C-82E543B3E958} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
575556
{D209C368-1277-4EA6-A887-AA6EBA51AB99} = {7B573D52-181D-482F-A61C-82E543B3E958}
576557
{C3264FF3-E2D7-48D7-93A7-CDC9A827AD9D} = {7B573D52-181D-482F-A61C-82E543B3E958}
577558
{705FBD41-77A9-4FE7-A6C1-85026F2DDA09} = {7B573D52-181D-482F-A61C-82E543B3E958}
578559
{E7541163-D7BB-4E9A-A722-D7737B7A2995} = {7B573D52-181D-482F-A61C-82E543B3E958}
579560
{5B8B0EAB-3E74-48BB-8231-26E73B2019DC} = {7B573D52-181D-482F-A61C-82E543B3E958}
580-
{46EC0BC1-8F51-4B4D-B967-2EE452EA68FC} = {7B573D52-181D-482F-A61C-82E543B3E958}
581-
{3DEB15F9-E7DA-403F-B6D3-A8499310397F} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
582-
{A76794DA-29A4-4D63-9850-E0E363A2FAFD} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
583-
{0A5F920A-1BF5-4DAC-B799-0C618B203797} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
584-
{A4F0C741-6ED4-46C8-AE75-57E1C7197E22} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
561+
{A21BFC37-44FC-41A0-B6E7-6F949F45A635} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
585562
{A972031D-2F61-4183-AF75-99EE1A9F6B32} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
586563
{775FAD50-3623-4922-97C4-DFB29A8BE4C7} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
587564
{372A3447-D657-40FF-A089-77C19FEC30C8} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
588565
{D694CB69-6CFB-4762-86C2-EB27B808B282} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
589566
{C2A8FC7A-FA64-46EA-AF6D-73D6B371DBF8} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
590-
{28B605B2-E2E9-417E-8369-49E263F1F31B} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
591-
{FFF45826-991F-465B-8A03-0E1DB7E8F38C} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
592-
{11640C9F-03A3-456B-848D-9B4A126F9506} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
593-
{379058E2-E834-4CC7-B5CD-AC8DFCF82AEA} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
594-
{B6D3AEAE-ECDA-4047-A9BA-CC6DA3EBEDF8} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
595-
{91DD5A2D-9FE3-4C3C-9253-876141874DAD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
596-
{B923C1E7-54DD-4E79-A1A9-B21123863B04} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
597567
{0DE218CA-AFB8-423A-9CD2-E22DEAC55C46} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
598568
{B310A760-8AE1-41CA-81F8-03B12E2FCE30} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
569+
{28B605B2-E2E9-417E-8369-49E263F1F31B} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
570+
{A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
599571
{D6FBBB3A-F6B8-45BB-B657-A7226AB96624} = {A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7}
572+
{3DEB15F9-E7DA-403F-B6D3-A8499310397F} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
600573
{9ED200E4-2026-4955-87E0-D8CEA7BD9E7F} = {A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7}
574+
{A76794DA-29A4-4D63-9850-E0E363A2FAFD} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
601575
{AAABA65D-7BB9-45FB-B953-C7820E67810E} = {A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7}
576+
{28C7B9D6-BE1F-45E5-952C-0D5C9CA3EFDF} = {64FE69B2-CE0B-4A47-83A3-9DE803851447}
577+
{CE9EF1EE-B954-4DEA-B016-952F5F4B11A2} = {FC222F6D-D86B-4ACD-85CC-31A3D8BCF967}
578+
{DBD0C8B0-BE4E-4CBF-AAD4-44BEA2EA830B} = {83154E24-B0DD-48E7-8BB5-55CF3D7B0FE3}
579+
{46EC0BC1-8F51-4B4D-B967-2EE452EA68FC} = {7B573D52-181D-482F-A61C-82E543B3E958}
580+
{0A5F920A-1BF5-4DAC-B799-0C618B203797} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
602581
{9EFAD088-713E-4269-ADFC-1F21CA872A94} = {A6EBC77C-9A34-4796-B4D0-E7A1E21A65A7}
582+
{A4F0C741-6ED4-46C8-AE75-57E1C7197E22} = {A21BFC37-44FC-41A0-B6E7-6F949F45A635}
603583
{20132190-582E-462E-B18B-4B2CEDDDB6C4} = {D92A4841-72C5-4702-A4F4-7F6A2D3E341B}
604584
{0E7186B7-0CE3-4EA3-8C53-7A8F95E33A75} = {D92A4841-72C5-4702-A4F4-7F6A2D3E341B}
585+
{379058E2-E834-4CC7-B5CD-AC8DFCF82AEA} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
586+
{B6D3AEAE-ECDA-4047-A9BA-CC6DA3EBEDF8} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
587+
{91DD5A2D-9FE3-4C3C-9253-876141874DAD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
588+
{B923C1E7-54DD-4E79-A1A9-B21123863B04} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
605589
{96181317-7B6F-49F0-B283-6E804D41C8AF} = {B923C1E7-54DD-4E79-A1A9-B21123863B04}
606590
{E71A76CA-0089-4E1A-A7FB-210429DBED6E} = {B923C1E7-54DD-4E79-A1A9-B21123863B04}
607591
{793CEC1B-D44D-4162-BE03-913BF1FDB458} = {B923C1E7-54DD-4E79-A1A9-B21123863B04}

0 commit comments

Comments
 (0)