diff --git a/Build/VSIP/install.bat b/Build/VSIP/install.bat index 955b62f4a..883e46a26 100644 --- a/Build/VSIP/install.bat +++ b/Build/VSIP/install.bat @@ -9,7 +9,9 @@ rmdir /S /Q "C:\Users\Atmoic\AppData\Local\Microsoft\VisualStudio\9.0\ProjectAss del /S /Q "C:\Users\Atmoic\AppData\Roaming\Cosmos User Kit\Build\VSIP\*.*" echo Compiling cosmos -%windir%\Microsoft.NET\Framework\V3.5\msbuild ..\..\source\Cosmos.sln /verbosity:normal /nologo /p:Configuration=Debug /p:Platform=x86 /p:BuildCmd=Rebuild +cd "..\..\source" +%windir%\Microsoft.NET\Framework\V3.5\msbuild Cosmos.sln /verbosity:normal /nologo /p:Configuration=Bootstrap /p:Platform=x86 /t:Rebuild > out +cd ..\Build\VSIP\ echo Copying files xcopy /Y ..\..\Source\libraries\MDbg\raw.* . @@ -31,7 +33,7 @@ rem xcopy /Y ..\..\source\Cosmos\Cosmos.Kernel.Plugs\bin\debug\Cosmos.Kernel.Plu xcopy /Y ..\..\source\Cosmos\Cosmos.System\bin\debug\Cosmos.Sys.* . xcopy /Y ..\..\Build\Tools\Cosmos.Sys.Plugs\Cosmos.Sys.Plugs.* . xcopy /Y ..\..\source\Cosmos.Kernel.FileSystems\bin\debug\Cosmos.Sys.FileSystem.* . -xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\bin\debug\Cosmos.VS.Package.* . +xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\bin\Debug\Cosmos.VS.Package.* . xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject.zip . echo . @@ -45,7 +47,7 @@ IF EXIST "C:\Program Files\Inno Setup 5\ISCC.exe" ( "C:\Program Files (x86)\Inno Setup 5\ISCC" /Q ..\..\Setup2\Cosmos.iss ) -..\..\Setup2\Output\CosmosUserKit5.exe /SILENT +REM ..\..\Setup2\Output\CosmosUserKit5.exe /SILENT rem Relaunch VS -..\..\source\Cosmos.sln +REM ..\..\source\Cosmos.sln diff --git a/source/Cosmos.sln b/source/Cosmos.sln index 967c4e534..95918e57a 100644 --- a/source/Cosmos.sln +++ b/source/Cosmos.sln @@ -185,7 +185,6 @@ Global SccProjectName22 = ../source2/IL2PCU/Cosmos.IL2CPU.X86.Tests SccLocalPath22 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.X86.Tests SccProjectUniqueName23 = ..\\source2\\Users\\Kudzu\\Breakpoints\\Breakpoints.Cosmos - SccProjectTopLevelParentUniqueName23 = Cosmos.sln SccProjectName23 = ../source2/Users/Kudzu/Breakpoints SccLocalPath23 = ..\\source2\\Users\\Kudzu\\Breakpoints SccProjectUniqueName24 = ..\\source2\\IL2PCU\\Cosmos.IL2CPU.Plugs\\Cosmos.IL2CPU.Plugs.csproj @@ -208,8 +207,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Bootstrap|x86.ActiveCfg = Release|x86 - {CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Bootstrap|x86.Build.0 = Release|x86 + {CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Bootstrap|x86.ActiveCfg = Debug|x86 + {CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Bootstrap|x86.Build.0 = Debug|x86 {CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Debug|Any CPU.Build.0 = Debug|Any CPU {CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Debug|x86.ActiveCfg = Debug|x86 @@ -220,8 +219,8 @@ Global {CE50FE98-9AC4-4B4D-ADC7-31F6DCD28755}.Release|x86.Build.0 = Release|x86 {B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Bootstrap|x86.ActiveCfg = Release|x86 - {B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Bootstrap|x86.Build.0 = Release|x86 + {B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Bootstrap|x86.ActiveCfg = Debug|x86 + {B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Bootstrap|x86.Build.0 = Debug|x86 {B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Debug|Any CPU.Build.0 = Debug|Any CPU {B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Debug|x86.ActiveCfg = Debug|x86 @@ -232,8 +231,8 @@ Global {B168BEDD-C6A6-4E7C-B9A5-0144286E9E42}.Release|x86.Build.0 = Release|x86 {A1F83D9F-2D44-4264-A08B-416797123018}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {A1F83D9F-2D44-4264-A08B-416797123018}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {A1F83D9F-2D44-4264-A08B-416797123018}.Bootstrap|x86.ActiveCfg = Release|x86 - {A1F83D9F-2D44-4264-A08B-416797123018}.Bootstrap|x86.Build.0 = Release|x86 + {A1F83D9F-2D44-4264-A08B-416797123018}.Bootstrap|x86.ActiveCfg = Debug|x86 + {A1F83D9F-2D44-4264-A08B-416797123018}.Bootstrap|x86.Build.0 = Debug|x86 {A1F83D9F-2D44-4264-A08B-416797123018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A1F83D9F-2D44-4264-A08B-416797123018}.Debug|Any CPU.Build.0 = Debug|Any CPU {A1F83D9F-2D44-4264-A08B-416797123018}.Debug|x86.ActiveCfg = Debug|x86 @@ -244,8 +243,8 @@ Global {A1F83D9F-2D44-4264-A08B-416797123018}.Release|x86.Build.0 = Release|x86 {5C293BB9-FB42-495E-AAD9-D15888631CA4}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {5C293BB9-FB42-495E-AAD9-D15888631CA4}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {5C293BB9-FB42-495E-AAD9-D15888631CA4}.Bootstrap|x86.ActiveCfg = Release|x86 - {5C293BB9-FB42-495E-AAD9-D15888631CA4}.Bootstrap|x86.Build.0 = Release|x86 + {5C293BB9-FB42-495E-AAD9-D15888631CA4}.Bootstrap|x86.ActiveCfg = Debug|x86 + {5C293BB9-FB42-495E-AAD9-D15888631CA4}.Bootstrap|x86.Build.0 = Debug|x86 {5C293BB9-FB42-495E-AAD9-D15888631CA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5C293BB9-FB42-495E-AAD9-D15888631CA4}.Debug|Any CPU.Build.0 = Debug|Any CPU {5C293BB9-FB42-495E-AAD9-D15888631CA4}.Debug|x86.ActiveCfg = Debug|x86 @@ -256,8 +255,8 @@ Global {5C293BB9-FB42-495E-AAD9-D15888631CA4}.Release|x86.Build.0 = Release|x86 {819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Bootstrap|x86.ActiveCfg = Release|x86 - {819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Bootstrap|x86.Build.0 = Release|x86 + {819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Bootstrap|x86.ActiveCfg = Debug|x86 + {819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Bootstrap|x86.Build.0 = Debug|x86 {819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Debug|Any CPU.Build.0 = Debug|Any CPU {819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Debug|x86.ActiveCfg = Debug|x86 @@ -268,8 +267,8 @@ Global {819DB8FC-5DA1-461F-83C9-2F5C88088C94}.Release|x86.Build.0 = Release|x86 {6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Bootstrap|x86.ActiveCfg = Release|x86 - {6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Bootstrap|x86.Build.0 = Release|x86 + {6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Bootstrap|x86.ActiveCfg = Debug|x86 + {6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Bootstrap|x86.Build.0 = Debug|x86 {6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Debug|Any CPU.Build.0 = Debug|Any CPU {6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Debug|x86.ActiveCfg = Debug|x86 @@ -280,8 +279,8 @@ Global {6110AD07-EB07-4A99-BB73-7A69AF5732F1}.Release|x86.Build.0 = Release|x86 {BCB66614-20FE-4184-B214-FD42844AD8A6}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {BCB66614-20FE-4184-B214-FD42844AD8A6}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {BCB66614-20FE-4184-B214-FD42844AD8A6}.Bootstrap|x86.ActiveCfg = Release|x86 - {BCB66614-20FE-4184-B214-FD42844AD8A6}.Bootstrap|x86.Build.0 = Release|x86 + {BCB66614-20FE-4184-B214-FD42844AD8A6}.Bootstrap|x86.ActiveCfg = Debug|x86 + {BCB66614-20FE-4184-B214-FD42844AD8A6}.Bootstrap|x86.Build.0 = Debug|x86 {BCB66614-20FE-4184-B214-FD42844AD8A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BCB66614-20FE-4184-B214-FD42844AD8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCB66614-20FE-4184-B214-FD42844AD8A6}.Debug|x86.ActiveCfg = Debug|x86 @@ -292,8 +291,8 @@ Global {BCB66614-20FE-4184-B214-FD42844AD8A6}.Release|x86.Build.0 = Release|x86 {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}.Bootstrap|x86.ActiveCfg = Release|x86 - {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}.Bootstrap|x86.Build.0 = Release|x86 + {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}.Bootstrap|x86.ActiveCfg = Debug|x86 + {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}.Bootstrap|x86.Build.0 = Debug|x86 {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}.Debug|Any CPU.Build.0 = Debug|Any CPU {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}.Debug|x86.ActiveCfg = Debug|x86 @@ -304,8 +303,8 @@ Global {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}.Release|x86.Build.0 = Release|x86 {0462E82B-8C29-41A9-8265-9C89038ADB29}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {0462E82B-8C29-41A9-8265-9C89038ADB29}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {0462E82B-8C29-41A9-8265-9C89038ADB29}.Bootstrap|x86.ActiveCfg = Release|x86 - {0462E82B-8C29-41A9-8265-9C89038ADB29}.Bootstrap|x86.Build.0 = Release|x86 + {0462E82B-8C29-41A9-8265-9C89038ADB29}.Bootstrap|x86.ActiveCfg = Debug|x86 + {0462E82B-8C29-41A9-8265-9C89038ADB29}.Bootstrap|x86.Build.0 = Debug|x86 {0462E82B-8C29-41A9-8265-9C89038ADB29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0462E82B-8C29-41A9-8265-9C89038ADB29}.Debug|Any CPU.Build.0 = Debug|Any CPU {0462E82B-8C29-41A9-8265-9C89038ADB29}.Debug|x86.ActiveCfg = Debug|x86 @@ -316,8 +315,8 @@ Global {0462E82B-8C29-41A9-8265-9C89038ADB29}.Release|x86.Build.0 = Release|x86 {3B8CD27E-9E91-4472-A4D9-9B3D581A5316}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {3B8CD27E-9E91-4472-A4D9-9B3D581A5316}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {3B8CD27E-9E91-4472-A4D9-9B3D581A5316}.Bootstrap|x86.ActiveCfg = Release|x86 - {3B8CD27E-9E91-4472-A4D9-9B3D581A5316}.Bootstrap|x86.Build.0 = Release|x86 + {3B8CD27E-9E91-4472-A4D9-9B3D581A5316}.Bootstrap|x86.ActiveCfg = Debug|x86 + {3B8CD27E-9E91-4472-A4D9-9B3D581A5316}.Bootstrap|x86.Build.0 = Debug|x86 {3B8CD27E-9E91-4472-A4D9-9B3D581A5316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3B8CD27E-9E91-4472-A4D9-9B3D581A5316}.Debug|Any CPU.Build.0 = Debug|Any CPU {3B8CD27E-9E91-4472-A4D9-9B3D581A5316}.Debug|x86.ActiveCfg = Debug|x86 @@ -328,8 +327,8 @@ Global {3B8CD27E-9E91-4472-A4D9-9B3D581A5316}.Release|x86.Build.0 = Release|x86 {BC6AE974-1F18-4A19-A956-5062E4D3FD53}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {BC6AE974-1F18-4A19-A956-5062E4D3FD53}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {BC6AE974-1F18-4A19-A956-5062E4D3FD53}.Bootstrap|x86.ActiveCfg = Release|x86 - {BC6AE974-1F18-4A19-A956-5062E4D3FD53}.Bootstrap|x86.Build.0 = Release|x86 + {BC6AE974-1F18-4A19-A956-5062E4D3FD53}.Bootstrap|x86.ActiveCfg = Debug|x86 + {BC6AE974-1F18-4A19-A956-5062E4D3FD53}.Bootstrap|x86.Build.0 = Debug|x86 {BC6AE974-1F18-4A19-A956-5062E4D3FD53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BC6AE974-1F18-4A19-A956-5062E4D3FD53}.Debug|Any CPU.Build.0 = Debug|Any CPU {BC6AE974-1F18-4A19-A956-5062E4D3FD53}.Debug|x86.ActiveCfg = Debug|x86 @@ -340,8 +339,8 @@ Global {BC6AE974-1F18-4A19-A956-5062E4D3FD53}.Release|x86.Build.0 = Release|x86 {AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Bootstrap|x86.ActiveCfg = Release|x86 - {AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Bootstrap|x86.Build.0 = Release|x86 + {AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Bootstrap|x86.ActiveCfg = Debug|x86 + {AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Bootstrap|x86.Build.0 = Debug|x86 {AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Debug|x86.ActiveCfg = Debug|x86 @@ -352,8 +351,8 @@ Global {AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Release|x86.Build.0 = Release|x86 {6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Bootstrap|x86.ActiveCfg = Release|x86 - {6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Bootstrap|x86.Build.0 = Release|x86 + {6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Bootstrap|x86.ActiveCfg = Debug|x86 + {6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Bootstrap|x86.Build.0 = Debug|x86 {6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Debug|x86.ActiveCfg = Debug|x86 @@ -364,8 +363,8 @@ Global {6D2688FE-6FD8-44A8-B96A-6037457F72A7}.Release|x86.Build.0 = Release|x86 {678E7BC5-0C17-44D6-9BF7-52EE5A6CD22A}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {678E7BC5-0C17-44D6-9BF7-52EE5A6CD22A}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {678E7BC5-0C17-44D6-9BF7-52EE5A6CD22A}.Bootstrap|x86.ActiveCfg = Release|x86 - {678E7BC5-0C17-44D6-9BF7-52EE5A6CD22A}.Bootstrap|x86.Build.0 = Release|x86 + {678E7BC5-0C17-44D6-9BF7-52EE5A6CD22A}.Bootstrap|x86.ActiveCfg = Debug|x86 + {678E7BC5-0C17-44D6-9BF7-52EE5A6CD22A}.Bootstrap|x86.Build.0 = Debug|x86 {678E7BC5-0C17-44D6-9BF7-52EE5A6CD22A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {678E7BC5-0C17-44D6-9BF7-52EE5A6CD22A}.Debug|Any CPU.Build.0 = Debug|Any CPU {678E7BC5-0C17-44D6-9BF7-52EE5A6CD22A}.Debug|x86.ActiveCfg = Debug|x86 @@ -376,19 +375,20 @@ Global {678E7BC5-0C17-44D6-9BF7-52EE5A6CD22A}.Release|x86.Build.0 = Release|x86 {61535AF6-4A1E-4691-B2BC-039851EF4850}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {61535AF6-4A1E-4691-B2BC-039851EF4850}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {61535AF6-4A1E-4691-B2BC-039851EF4850}.Bootstrap|x86.ActiveCfg = Release|Any CPU + {61535AF6-4A1E-4691-B2BC-039851EF4850}.Bootstrap|x86.ActiveCfg = Debug|Any CPU + {61535AF6-4A1E-4691-B2BC-039851EF4850}.Bootstrap|x86.Build.0 = Debug|Any CPU {61535AF6-4A1E-4691-B2BC-039851EF4850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {61535AF6-4A1E-4691-B2BC-039851EF4850}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61535AF6-4A1E-4691-B2BC-039851EF4850}.Debug|x86.ActiveCfg = Debug|Any CPU - {61535AF6-4A1E-4691-B2BC-039851EF4850}.Debug|x86.Build.0 = Debug|Any CPU + {61535AF6-4A1E-4691-B2BC-039851EF4850}.Debug|x86.ActiveCfg = Debug|x86 + {61535AF6-4A1E-4691-B2BC-039851EF4850}.Debug|x86.Build.0 = Debug|x86 {61535AF6-4A1E-4691-B2BC-039851EF4850}.Release|Any CPU.ActiveCfg = Release|Any CPU {61535AF6-4A1E-4691-B2BC-039851EF4850}.Release|Any CPU.Build.0 = Release|Any CPU {61535AF6-4A1E-4691-B2BC-039851EF4850}.Release|x86.ActiveCfg = Release|Any CPU {61535AF6-4A1E-4691-B2BC-039851EF4850}.Release|x86.Build.0 = Release|Any CPU {239E33A7-F0C3-4801-85CA-4D8F89A31DC0}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {239E33A7-F0C3-4801-85CA-4D8F89A31DC0}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {239E33A7-F0C3-4801-85CA-4D8F89A31DC0}.Bootstrap|x86.ActiveCfg = Release|x86 - {239E33A7-F0C3-4801-85CA-4D8F89A31DC0}.Bootstrap|x86.Build.0 = Release|x86 + {239E33A7-F0C3-4801-85CA-4D8F89A31DC0}.Bootstrap|x86.ActiveCfg = Debug|x86 + {239E33A7-F0C3-4801-85CA-4D8F89A31DC0}.Bootstrap|x86.Build.0 = Debug|x86 {239E33A7-F0C3-4801-85CA-4D8F89A31DC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {239E33A7-F0C3-4801-85CA-4D8F89A31DC0}.Debug|Any CPU.Build.0 = Debug|Any CPU {239E33A7-F0C3-4801-85CA-4D8F89A31DC0}.Debug|x86.ActiveCfg = Debug|x86 @@ -399,8 +399,8 @@ Global {239E33A7-F0C3-4801-85CA-4D8F89A31DC0}.Release|x86.Build.0 = Release|x86 {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Bootstrap|x86.ActiveCfg = Release|x86 - {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Bootstrap|x86.Build.0 = Release|x86 + {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Bootstrap|x86.ActiveCfg = Debug|x86 + {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Bootstrap|x86.Build.0 = Debug|x86 {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Debug|x86.ActiveCfg = Debug|x86 @@ -411,8 +411,8 @@ Global {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Release|x86.Build.0 = Release|x86 {63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Bootstrap|x86.ActiveCfg = Release|x86 - {63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Bootstrap|x86.Build.0 = Release|x86 + {63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Bootstrap|x86.ActiveCfg = Debug|x86 + {63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Bootstrap|x86.Build.0 = Debug|x86 {63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Debug|x86.ActiveCfg = Debug|x86 @@ -423,8 +423,8 @@ Global {63F7BFB9-419E-4965-B580-304B9C9FA7D8}.Release|x86.Build.0 = Release|x86 {B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Bootstrap|x86.ActiveCfg = Release|x86 - {B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Bootstrap|x86.Build.0 = Release|x86 + {B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Bootstrap|x86.ActiveCfg = Debug|x86 + {B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Bootstrap|x86.Build.0 = Debug|x86 {B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Debug|x86.ActiveCfg = Debug|x86 @@ -435,7 +435,7 @@ Global {B2F76E27-EAE1-4ECF-8A33-77B2CFBB9367}.Release|x86.Build.0 = Release|x86 {6658FCE0-7032-4B7B-BD95-F2765C393442}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {6658FCE0-7032-4B7B-BD95-F2765C393442}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {6658FCE0-7032-4B7B-BD95-F2765C393442}.Bootstrap|x86.ActiveCfg = Release|x86 + {6658FCE0-7032-4B7B-BD95-F2765C393442}.Bootstrap|x86.ActiveCfg = Debug|x86 {6658FCE0-7032-4B7B-BD95-F2765C393442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6658FCE0-7032-4B7B-BD95-F2765C393442}.Debug|Any CPU.Build.0 = Debug|Any CPU {6658FCE0-7032-4B7B-BD95-F2765C393442}.Debug|x86.ActiveCfg = Debug|x86 @@ -446,30 +446,30 @@ Global {6658FCE0-7032-4B7B-BD95-F2765C393442}.Release|x86.Build.0 = Release|x86 {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Bootstrap|x86.ActiveCfg = Release|Any CPU - {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Bootstrap|x86.Build.0 = Release|Any CPU + {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Bootstrap|x86.ActiveCfg = Debug|Any CPU + {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Bootstrap|x86.Build.0 = Debug|Any CPU {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Debug|x86.ActiveCfg = Debug|Any CPU - {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Debug|x86.Build.0 = Debug|Any CPU + {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Debug|x86.ActiveCfg = Debug|x86 + {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Debug|x86.Build.0 = Debug|x86 {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Release|Any CPU.ActiveCfg = Release|Any CPU {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Release|Any CPU.Build.0 = Release|Any CPU {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Release|x86.ActiveCfg = Release|Any CPU {4266FA56-F6FE-4E9B-BAE3-B6910183884C}.Release|x86.Build.0 = Release|Any CPU {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Bootstrap|x86.ActiveCfg = Release|Any CPU + {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Bootstrap|x86.ActiveCfg = Debug|Any CPU {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Debug|x86.ActiveCfg = Debug|Any CPU - {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Debug|x86.Build.0 = Debug|Any CPU + {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Debug|x86.ActiveCfg = Debug|x86 + {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Debug|x86.Build.0 = Debug|x86 {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Release|Any CPU.ActiveCfg = Release|Any CPU {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Release|Any CPU.Build.0 = Release|Any CPU {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Release|x86.ActiveCfg = Release|Any CPU {52BF0A64-EBEF-420A-9F27-6C5226A4B77B}.Release|x86.Build.0 = Release|Any CPU {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136}.Bootstrap|x86.ActiveCfg = Release|Any CPU + {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136}.Bootstrap|x86.ActiveCfg = Debug|Any CPU {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136}.Debug|Any CPU.Build.0 = Debug|Any CPU {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -480,22 +480,23 @@ Global {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136}.Release|x86.Build.0 = Release|Any CPU {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Bootstrap|x86.ActiveCfg = Release|Any CPU - {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Bootstrap|x86.Build.0 = Release|Any CPU + {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Bootstrap|x86.ActiveCfg = Debug|Any CPU + {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Bootstrap|x86.Build.0 = Debug|Any CPU {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|x86.ActiveCfg = Debug|Any CPU - {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|x86.Build.0 = Debug|Any CPU + {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|x86.ActiveCfg = Debug|x86 + {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|x86.Build.0 = Debug|x86 {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Release|Any CPU.ActiveCfg = Release|Any CPU {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Release|Any CPU.Build.0 = Release|Any CPU {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Release|x86.ActiveCfg = Release|Any CPU {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Release|x86.Build.0 = Release|Any CPU {3370FC04-B669-46A4-A4AA-A89540318F8D}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU {3370FC04-B669-46A4-A4AA-A89540318F8D}.Bootstrap|Any CPU.Build.0 = Release|Any CPU - {3370FC04-B669-46A4-A4AA-A89540318F8D}.Bootstrap|x86.ActiveCfg = Release|Any CPU + {3370FC04-B669-46A4-A4AA-A89540318F8D}.Bootstrap|x86.ActiveCfg = Debug|Any CPU {3370FC04-B669-46A4-A4AA-A89540318F8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3370FC04-B669-46A4-A4AA-A89540318F8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3370FC04-B669-46A4-A4AA-A89540318F8D}.Debug|x86.ActiveCfg = Debug|Any CPU + {3370FC04-B669-46A4-A4AA-A89540318F8D}.Debug|x86.ActiveCfg = Debug|x86 + {3370FC04-B669-46A4-A4AA-A89540318F8D}.Debug|x86.Build.0 = Debug|x86 {3370FC04-B669-46A4-A4AA-A89540318F8D}.Release|Any CPU.ActiveCfg = Release|Any CPU {3370FC04-B669-46A4-A4AA-A89540318F8D}.Release|Any CPU.Build.0 = Release|Any CPU {3370FC04-B669-46A4-A4AA-A89540318F8D}.Release|x86.ActiveCfg = Release|Any CPU @@ -535,7 +536,6 @@ Global {9D82B35C-7133-4ADE-AA5C-0FFB2BFA8BA6} = {A4478219-065D-4928-BB4D-4358CAD39A03} {2DF5F17F-4890-4856-ADFD-4DE23282C3B7} = {A4478219-065D-4928-BB4D-4358CAD39A03} {0CF14D0F-6054-4D3D-9062-E3D2EB064A4E} = {A4478219-065D-4928-BB4D-4358CAD39A03} - {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136} = {9D82B35C-7133-4ADE-AA5C-0FFB2BFA8BA6} {61535AF6-4A1E-4691-B2BC-039851EF4850} = {CD3F5E45-8B24-424F-ADF1-0211712F4CB7} {239E33A7-F0C3-4801-85CA-4D8F89A31DC0} = {35CABD9D-5C85-419A-B6C9-561EAD97A553} {F708C866-1C9B-4579-8C28-0728ECCFC1ED} = {35CABD9D-5C85-419A-B6C9-561EAD97A553} diff --git a/source2/Debug/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj b/source2/Debug/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj index fae160f35..fe2978fca 100644 --- a/source2/Debug/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj +++ b/source2/Debug/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj @@ -34,6 +34,26 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + true + GlobalSuppressions.cs + prompt + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + true + GlobalSuppressions.cs + prompt + diff --git a/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.Debug.HostProcess.csproj b/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.Debug.HostProcess.csproj index bc846d3c6..93afa1d6f 100644 --- a/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.Debug.HostProcess.csproj +++ b/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.Debug.HostProcess.csproj @@ -36,6 +36,26 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + true + GlobalSuppressions.cs + prompt + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + true + GlobalSuppressions.cs + prompt + diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs index b54145682..ea84ddcb6 100644 --- a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs +++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs @@ -17,7 +17,7 @@ using System.IO; using Cosmos.Compiler.Debug; using System.Collections.Specialized; using Cosmos.Debug.Common; -using Cosmos.Build.Common; +//using Cosmos.Build.Common; namespace Cosmos.Debug.VSDebugEngine { @@ -35,7 +35,7 @@ namespace Cosmos.Debug.VSDebugEngine internal uint? mCurrentAddress = null; internal string mISO; private readonly NameValueCollection mDebugInfo; - protected TargetHost mTargetHost; + //protected TargetHost mTargetHost; protected void LaunchQEMU(bool aGDB) { var xDebugConnectorStr = "-serial tcp:127.0.0.1:4444"; @@ -125,10 +125,10 @@ namespace Cosmos.Debug.VSDebugEngine mProcessStartInfo = new ProcessStartInfo(Path.Combine(PathUtilities.GetVSIPDir(), "Cosmos.Debug.HostProcess.exe")); if (StringComparer.InvariantCultureIgnoreCase.Equals(mDebugInfo["BuildTarget"], "qemu")) { - mTargetHost = TargetHost.QEMU; +// mTargetHost = TargetHost.QEMU; LaunchQEMU(xGDBDebugStub); } else if (StringComparer.InvariantCultureIgnoreCase.Equals(mDebugInfo["BuildTarget"], "VMWareWorkstation")) { - mTargetHost = TargetHost.VMWareWorkstation; + //assemblyref://FSharp.CoremTargetHost = TargetHost.VMWareWorkstation; LaunchVMWareWorkstation(xGDBDebugStub); } else { throw new Exception("Invalid BuildTarget value: '" + mDebugInfo["BuildTarget"] + "'!"); @@ -366,11 +366,11 @@ namespace Cosmos.Debug.VSDebugEngine // that allows VS to "see" that. Here we resume it. mProcess.StandardInput.WriteLine(); - if (mTargetHost == TargetHost.QEMU) { - // QEMU and Pipes - QEMU will stop and wait till we connect. It will not even show until we do. - // We have to do this after we release the debug host though. - mDebugEngine.DebugConnector.WaitConnect(); - } + //if (mTargetHost == TargetHost.QEMU) { + // // QEMU and Pipes - QEMU will stop and wait till we connect. It will not even show until we do. + // // We have to do this after we release the debug host though. + // mDebugEngine.DebugConnector.WaitConnect(); + //} } void mProcess_Exited(object sender, EventArgs e) diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj b/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj index c8d1482ab..c03566c05 100644 --- a/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj +++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj @@ -120,10 +120,6 @@ {9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2} Cosmos.Compiler.Debug - - {0462E82B-8C29-41A9-8265-9C89038ADB29} - Cosmos.Build.Common - {3B8CD27E-9E91-4472-A4D9-9B3D581A5316} Cosmos.Build.Launch diff --git a/source2/IL2PCU/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj b/source2/IL2PCU/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj index 660786b81..d47fa7026 100644 --- a/source2/IL2PCU/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj +++ b/source2/IL2PCU/Cosmos.IL2CPU.Plugs/Cosmos.IL2CPU.Plugs.csproj @@ -36,6 +36,26 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + true + GlobalSuppressions.cs + prompt + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + true + GlobalSuppressions.cs + prompt + diff --git a/source2/IL2PCU/Cosmos.IL2CPU.X86.Tests/Cosmos.IL2CPU.X86.Tests.csproj b/source2/IL2PCU/Cosmos.IL2CPU.X86.Tests/Cosmos.IL2CPU.X86.Tests.csproj index 1b2cd61e9..c1d6ba73a 100644 --- a/source2/IL2PCU/Cosmos.IL2CPU.X86.Tests/Cosmos.IL2CPU.X86.Tests.csproj +++ b/source2/IL2PCU/Cosmos.IL2CPU.X86.Tests/Cosmos.IL2CPU.X86.Tests.csproj @@ -34,6 +34,26 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + true + GlobalSuppressions.cs + prompt + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + true + GlobalSuppressions.cs + prompt + False diff --git a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj index d1e12826c..1a462f6cd 100644 --- a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj +++ b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj @@ -254,6 +254,26 @@ true ..\MPF\9.0\Src\CSharp + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + true + GlobalSuppressions.cs + prompt + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + true + GlobalSuppressions.cs + prompt + diff --git a/source2/VSIP/Cosmos.VS.Package/DebugOptionsQemu.cs b/source2/VSIP/Cosmos.VS.Package/DebugOptionsQemu.cs index 5018c1dc6..deacfda19 100644 --- a/source2/VSIP/Cosmos.VS.Package/DebugOptionsQemu.cs +++ b/source2/VSIP/Cosmos.VS.Package/DebugOptionsQemu.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; using Cosmos.Build.Common; +//using Cosmos.Build.Common; namespace Cosmos.VS.Package { diff --git a/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.cs b/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.cs index 74ebfa37d..45f297982 100644 --- a/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.cs +++ b/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.cs @@ -7,12 +7,13 @@ using System.Linq; using System.Text; using System.Windows.Forms; using Cosmos.Build.Common; +//using Cosmos.Build.Common; namespace Cosmos.VS.Package { public partial class VMOptionsQemu : SubPropertyPageBase { - private VMQemuProperties projProperties; + private Cosmos.Build.Common.VMQemuProperties projProperties; public VMOptionsQemu() {