From 0dccc8e69bdfc1d57075d758fda3949714737dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Mon, 1 May 2017 21:19:50 +0100 Subject: [PATCH] Tests and debugger fixes. --- .../Cosmos.TestRunner.UnitTest.csproj | 8 ++-- appveyor.yml | 6 +-- source/Cosmos.Debug.Hosts/Bochs.cs | 1 + .../AD7.Impl/AD7Engine.cs | 8 ++-- .../AD7.Impl/AD7ProgramNode.cs | 2 +- .../Commands/DebugExecCommand.cs | 2 +- .../Commands/DebugLaunchCommand.cs | 4 +- .../Commands/DebugLogCommand.cs | 4 +- .../Cosmos.VS.DebugEngine.csproj | 20 ++++---- .../CosmosDebugEnginePackage.cs | 12 ++--- .../Resources/Cosmos.ico | Bin 0 -> 25214 bytes .../Resources/CosmosDebugEnginePackage.ico | Bin 428446 -> 0 bytes source/Cosmos.VS.DebugEngine/VSPackage.resx | 2 +- source/Cosmos.VS.DebugEngine/VSPackage.vsct | 44 ++++++++++++++++++ .../source.extension.vsixmanifest | 3 +- .../Cosmos.VS.ProjectSystem.csproj | 2 - .../CosmosProjectConfig.cs | 9 ++-- .../source.extension.vsixmanifest | 2 +- 18 files changed, 85 insertions(+), 44 deletions(-) create mode 100644 source/Cosmos.VS.DebugEngine/Resources/Cosmos.ico delete mode 100644 source/Cosmos.VS.DebugEngine/Resources/CosmosDebugEnginePackage.ico create mode 100644 source/Cosmos.VS.DebugEngine/VSPackage.vsct diff --git a/Tests/Cosmos.TestRunner.UnitTest/Cosmos.TestRunner.UnitTest.csproj b/Tests/Cosmos.TestRunner.UnitTest/Cosmos.TestRunner.UnitTest.csproj index 6e18ad518..821fef3ac 100644 --- a/Tests/Cosmos.TestRunner.UnitTest/Cosmos.TestRunner.UnitTest.csproj +++ b/Tests/Cosmos.TestRunner.UnitTest/Cosmos.TestRunner.UnitTest.csproj @@ -1,15 +1,15 @@  - netcoreapp1.0 + netcoreapp1.1 True ..\..\Cosmos.snk - - - + + + diff --git a/appveyor.yml b/appveyor.yml index 6bf664456..64d55cffa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,11 +25,11 @@ build_script: xcopy /Y "%APPVEYOR_BUILD_FOLDER%\Build\VSIP\Cosmos.targets" "%ProgramFiles(x86)%\MSBuild\Cosmos\" - dotnet publish source/Cosmos.Build.MSBuild -f net462 -r win7-x86 -o "c:\CosmosRun\Build\VSIP\" + dotnet publish source/Cosmos.Build.MSBuild -f net462 -r win7-x86 -c Release -o "c:\CosmosRun\Build\VSIP\" - dotnet publish source/IL2CPU -f netcoreapp1.0 -r win7-x86 -o "c:\CosmosRun\Build\IL2CPU\" + dotnet publish source/IL2CPU -f netcoreapp1.0 -r win7-x86 -c Release -o "c:\CosmosRun\Build\IL2CPU\" - dotnet publish source/XSharp.Compiler -f netcoreapp1.0 -r win7-x86 -o "c:\CosmosRun\Build\XSharp\" + dotnet publish source/XSharp.Compiler -f netcoreapp1.0 -r win7-x86 -c Release -o "c:\CosmosRun\Build\XSharp\" xcopy /Y "c:\Cosmos\Build\VSIP\Cosmos.Debug.Kernel.*" "c:\CosmosRun\Kernel\" diff --git a/source/Cosmos.Debug.Hosts/Bochs.cs b/source/Cosmos.Debug.Hosts/Bochs.cs index 1f67b5f98..a5d0adef6 100644 --- a/source/Cosmos.Debug.Hosts/Bochs.cs +++ b/source/Cosmos.Debug.Hosts/Bochs.cs @@ -102,6 +102,7 @@ namespace Cosmos.Debug.Hosts } _bochsStartInfo.Arguments = string.Format("-q {1} -f \"{0}\"", _bochsConfigurationFile.FullName, xExtraLog); _bochsStartInfo.WorkingDirectory = _bochsConfigurationFile.Directory.FullName; + _bochsStartInfo.CreateNoWindow = true; // when ProcessStartInfo.UseShellExecute is supported in .net core, maybe this line isn't needed //_bochsStartInfo.UseShellExecute = true; if (RedirectOutput) { diff --git a/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Engine.cs b/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Engine.cs index 3eacf9ed8..8e8bb6bd2 100644 --- a/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Engine.cs +++ b/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Engine.cs @@ -25,7 +25,7 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl // IDebugEngineProgram2: This interface provides simultanious debugging of multiple threads in a debuggee. [ComVisible(true)] - [Guid("DC8503AB-7EE6-456C-A209-66C690D9F6F4")] + [Guid(Guids.guidDebugEngineString)] public class AD7Engine : IDebugEngine2, IDebugEngineLaunch2, IDebugProgram3, IDebugEngineProgram2 { internal IDebugProgram2 mProgram; @@ -33,7 +33,7 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl internal AD7Process mProcess; // A unique identifier for the program being debugged. Guid mProgramID; - public const string ID = "FA1DA3A6-66FF-4C65-B077-E65F7164EF83"; + public static readonly Guid EngineID = new Guid("{fa1da3a6-66ff-4c65-b077-e65f7164ef83}"); internal AD7Module mModule; internal AD7Thread mThread; private AD7ProgramNode mProgNode; @@ -256,7 +256,7 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl int IDebugEngine2.GetEngineId(out Guid oGuidEngine) { // Gets the GUID of the DebugEngine. - oGuidEngine = new Guid(ID); + oGuidEngine = EngineID; return VSConstants.S_OK; } @@ -332,7 +332,7 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl // Gets the name and identifier of the debug engine (DE) running this program. engineName = Resources.EngineName; - engineGuid = new Guid(AD7Engine.ID); + engineGuid = EngineID; return VSConstants.S_OK; } diff --git a/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7ProgramNode.cs b/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7ProgramNode.cs index 443ed3c28..d09d2b41a 100644 --- a/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7ProgramNode.cs +++ b/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7ProgramNode.cs @@ -23,7 +23,7 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl int IDebugProgramNode2.GetEngineInfo(out string oEngineName, out Guid oEngineGuid) { oEngineName = Resources.EngineName; - oEngineGuid = new Guid(AD7Engine.ID); + oEngineGuid = AD7Engine.EngineID; return VSConstants.S_OK; } diff --git a/source/Cosmos.VS.DebugEngine/Commands/DebugExecCommand.cs b/source/Cosmos.VS.DebugEngine/Commands/DebugExecCommand.cs index 8ac86dce9..67c195ddd 100644 --- a/source/Cosmos.VS.DebugEngine/Commands/DebugExecCommand.cs +++ b/source/Cosmos.VS.DebugEngine/Commands/DebugExecCommand.cs @@ -29,7 +29,7 @@ namespace Cosmos.VS.DebugEngine.Commands return hr; if (string.IsNullOrWhiteSpace(arguments)) - throw new ArgumentException("Expected an MI command to execute (ex: Debug.MIDebugExec info sharedlibrary)"); + throw new ArgumentException("Expected a Cosmos command to execute (ex: Debug.CosmosDebugExec info sharedlibrary)"); DebugExec(arguments); diff --git a/source/Cosmos.VS.DebugEngine/Commands/DebugLaunchCommand.cs b/source/Cosmos.VS.DebugEngine/Commands/DebugLaunchCommand.cs index 3af620f12..5090a5506 100644 --- a/source/Cosmos.VS.DebugEngine/Commands/DebugLaunchCommand.cs +++ b/source/Cosmos.VS.DebugEngine/Commands/DebugLaunchCommand.cs @@ -47,8 +47,8 @@ namespace Cosmos.VS.DebugEngine.Commands return hr; if (hr == VSConstants.S_OK || parseCommandLine.HasSwitches() != VSConstants.S_OK) { - string message = string.Concat("Unexpected syntax for MIDebugLaunch command. Expected:\n", - "Debug.MIDebugLaunch /Executable: /OptionsFile:"); + string message = string.Concat("Unexpected syntax for CosmosDebugLaunch command. Expected:\n", + "Debug.CosmosDebugLaunch /Executable: /OptionsFile:"); throw new ApplicationException(message); } diff --git a/source/Cosmos.VS.DebugEngine/Commands/DebugLogCommand.cs b/source/Cosmos.VS.DebugEngine/Commands/DebugLogCommand.cs index 1c3266e9c..58bd761cc 100644 --- a/source/Cosmos.VS.DebugEngine/Commands/DebugLogCommand.cs +++ b/source/Cosmos.VS.DebugEngine/Commands/DebugLogCommand.cs @@ -47,8 +47,8 @@ namespace Cosmos.VS.DebugEngine.Commands return hr; if (hr == VSConstants.S_OK || parseCommandLine.HasSwitches() != VSConstants.S_OK) { - string message = string.Concat("Unexpected syntax for MIDebugLaunch command. Expected:\n", - "Debug.MIDebugLog [/On: [/OutputWindow] | /Off]"); + string message = string.Concat("Unexpected syntax for CosmosDebugLaunch command. Expected:\n", + "Debug.CosmosDebugLog [/On: [/OutputWindow] | /Off]"); throw new ApplicationException(message); } diff --git a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj index 2e391923b..5aad5d2a8 100644 --- a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj +++ b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj @@ -26,13 +26,12 @@ v4.6.2 true true - false + true true true - true + false - true full false bin\Debug\ @@ -105,6 +104,15 @@ Designer + + + true + + + Menus.ctmenu + Designer + + False @@ -119,9 +127,6 @@ False - - False - ..\..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll True @@ -292,9 +297,6 @@ VSPackage - - - diff --git a/source/Cosmos.VS.DebugEngine/CosmosDebugEnginePackage.cs b/source/Cosmos.VS.DebugEngine/CosmosDebugEnginePackage.cs index 0d7e1f6db..390ae668c 100644 --- a/source/Cosmos.VS.DebugEngine/CosmosDebugEnginePackage.cs +++ b/source/Cosmos.VS.DebugEngine/CosmosDebugEnginePackage.cs @@ -1,21 +1,15 @@ using System; -using System.Diagnostics; -using System.Globalization; using System.Runtime.InteropServices; -using System.ComponentModel.Design; -using System.IO; -using Cosmos.VS.DebugEngine.Commands; -using Microsoft.Win32; -using Microsoft.VisualStudio; -using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio.Shell; +using Cosmos.VS.DebugEngine.Commands; + namespace Cosmos.VS.DebugEngine { [PackageRegistration(UseManagedResourcesOnly = true)] [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] - //[ProvideMenuResource("Menus.ctmenu", 1)] + [ProvideMenuResource("Menus.ctmenu", 1)] [Guid(Guids.guidPackageString)] public sealed class CosmosDebugEnginePackage : Package, IOleCommandTarget { diff --git a/source/Cosmos.VS.DebugEngine/Resources/Cosmos.ico b/source/Cosmos.VS.DebugEngine/Resources/Cosmos.ico new file mode 100644 index 0000000000000000000000000000000000000000..fcdc4018323d6394947898b5445c7c219df93a15 GIT binary patch literal 25214 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

#Da@nr{b6L-L-G?W!!Yl{ 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

N3mPu2mM3; zmKw3j9OIw0-7>d1d|TrK z{X_qjJhtX<%)e!BbNG(smuiRpp?^yrr}8s(y=885_)g6~wjTP2{w;YNSe5YKQ)ze@h;x@-ub4Wo~o$PR&2I9{Pv=EqNT{pS9gG zw>f-U;{*Le|CT(q=5NfuWo~o$j^&qXhyI~|OCG24Gj+XXZgcof%|Est`iK54c^u=P zwcRqeIec5=1N}q)mOQrRZ_K}CZgcpK<(F!Q{-J+M9;fm%b-iV7bNEipKeitFhyE>j z9OIw0-7>d1d|TrK{X_qjJhtX<%)e!BbNG(smuiRpp?^yrr}8s(y=885_)g6~wjTP2 z{w;YNSe5YKQ)ze@h;x@-ub4Wo~o$PR&2I z9{Pv=EqNT{pS9gGw>f-U;{*Le|CT(q=5NfuWo~o$j^&qXhyI~|OCG24Gj+XXZgcof z%|Est`iK54c^u=PwcRqeIec5=1N}q)mOQrRZ_K}CZgcpK<(F!Q{-J+M9;fm%b-iV7 zbNEipKeitFhyE>j9OIw0-7>d1d|TrK{X_qjJhtX<%)e!BbNG(smuiRpp?^yrr}8s( zy=885_)g6~wjTP2{w;YNSe5YKQ)ze@h;x z@-ub4Wo~o$PR&2I9{Pv=EqNT{pS9gGw>f-U;{*Le|CT(q=5NfuWo~o$j^&qXhyI~| zOCG24Gj+XXZgcof%|Est`iK54c^u=PwcRqeIec5=1N}q)mOQrRZ_K}CZgcpK<(F!Q z{-J+M9;fm%b-iV7bNEipKeitFhyE>j9OIw0-7>d1d|TrK{X_qjJhtX<%)e!BbNG(s zmuiRpp?^yrr}8s(y=885_)g6~wjTP2{w;YNSe5YKQ)ze@h;x@-ub4Wo~o$PR&2I9{Pv=EqNT{pS9gGw>f-U;{*Le|CT(q=5Nfu zWo~o$j^&qXhyI~|OCG24Gj+XXZgcof%|Est`d_yGWA%gm!44Qq#{l|={-K}g`dK@6 z&_DFQb`B%{>E{>p5B)f9)Jb{L{}b=pXurex~bZ?bt#8(Er*wjQFRY zU(i4F5B*Hn&)Ttr{-OW1a~SbYKfj=V=pXu-uAjAI2mM3;Yv(ZHpMHKp|Ik15GhIJx z#}4|3{@2c7#6SJ~g8rd@=x4fq){Y(Y5B;y5!-#+S`33z$|Ip8L{j423=pXuDJBJbf z^z#e)hyJ0T>H1kacF;fczjh8I{^{oz^bh?*KhyQIcI=>k=zr}TM*P#yFX$iohkmB( zXYJTQ|Iq*1IgI$HpI^{F^bh?^*U#FqgZ`JT|2h5}6P9}%S|66V&EeY`KjWBx63o5Oc3zf?Q)5B*#6IF+BN>n(Ge!*^=_vGveD^l!=I82_y8mbuO0+ZrF} zANsfCu{D2V{w;Hx!*?vdR6Fz!{af-lm7l5WEpwa0cWVBz_0T``Z^`2r|E%qnxy|9* z8XxE%`nTkSLRtnHS$ z&EeY`ALt+Yx8$)ke`EeFbDP6=EWcDc^bh@8@;H^Bsp~Cso5Oc%{;~DYKlE?O;~4*} z?UuRC;oBM?=pXvGWBx63o5Oc3zf?Q)5B*#6IF+BN>n(Ge!*^=_vGveD^l!=I z82_y8mbuO0+ZrF}ANsfCu{D2V{w;Hx!*?vdR6Fz!{af-lm7l5WEpwa0cWVBz_0T`` zZ^`2r|E%qnxy|9*8XxE%`nTkSLRtnHS$&EeY`ALt+Yx8$)ke`EeFbDP6=EWcDc^bh@8@;H^Bsp~Cso5Oc% z{;~DYKlE?O;~4*}?UuRC;oBM?=pXvGWBx63o5Oc3zf?Q)5B*#6IF+BN>n(Ge z!*^=_vGveD^l!=I82_y8mbuO0+ZrF}ANsfCu{D2V{w;Hx!*?vdR6Fz!{af-lm7l5W zEpwa0cWVBz_0T``Z^`2r|E%qnxy|9*8XxE%`nTkSLRtnHS$&EeY`ALt+Yx8$)ke`EeFbDP6=EWcDc^bh@8 z@;H^Bsp~Cso5Oc%{;~DYKlE?O;~4*}?UuRC;oBM?=pXvGWBx63o5Oc3zf?Q) z5B*#6IF+BN>n(Ge!*^=_vGveD^l!=I82_y8mbuO0+ZrF}ANsfCu{D2V{w;Hx!*?vd zR6Fz!{af-lm7l5WEpwa0cWVBz_0T``Z^`2r|E%qnxy|9*8XxE%`nTku2rQLI2SI+BuB)r=MTY zKlBg%OxMrav4j4h|Fv@%@lQX$pnvEe`kAhuwPOeUL;q{%FyfznenJ1xKlC$QKWoPh z`iK74&SAtq{rrOdp?~OSx_;J<9rT~3{~Y)o!pFOJ?{<$KJ;LA4e~_mACr_U2-oJmp zJ46kavS+d4uccr(R~#QceAvBw`4YNM)V+M)fA#9s(VhV-mVYsq?v}6*-t*Jm>!s%9 z^|9UyK>y4B41xE2TiwfZ;Mnd3p#SCSAMg3|YM;-7W4afB{+FkJyyqWA_pE@#_Im;7e?I-=J^ylP zpU;3b-wQzh_WH+r{^is?>z~^--U~qgw))3={&8rZ&w#bv3qb!i`p0|zap|7*&+S_7 z1=g(pA+aCgclYp~|DgQ)1jqh23J!TMFhm=dea_t4$9sPJo=<1s+qZA=w+h_fDmc`= zz-8CBmfzgEr~UAr-)jHavuDlU(|G#yDb4_Q2H;*mQ)}MwxwVh?{8sn$+4teYhr5f5 zi$?#{=g-7waW9Zp?X9=Db&vP_uI^dep?h5#V>?>h3$&`u)0x1@jh%ulNYo(1;fhk7a=%}FhqLC)ai}l6=f`6L!S9*^}@5j;aDHry@19Ut8u*N59cDk z?+<@*1+3y83u2_!aJ%2n8=?uuhMe@Pt3EE+GxUBaAmKqQF#(VxSzJ+u- z_L*M@e;UKH!09!}asFy`=^M}euK;~}S=xwuZ{EDw;dAJC4o-RIr_~bA0>|S|&s~VS z8m4oM=Qs!Eh;zsu^jVb7Q~Zp2oQo;X{Ipu&436VY+g+Ppj)OJPTao{k>nW6s^bB`unVb|eN5*uyT*^Dk6*UW2bRzLv|3)4XMwoCkEwi^UE|4;$1lU@1A5Oo z1jcKB7Kr=%VY;3&>kxcQ-E*y<59WC0r(wIcXMwoCpQ7gJYc$?0eS9sS59WO4r`2rf z&jN9OKV82$S8DuO^7xWJAI$yCPpi{Xp9SLnKBs!~`qH?xEnm~d~m2|ep+1)`799k_tq+%$G^s{C66EK^T8pX`Dyi-`&l6F@8{9w zA$HL?w&d}-J|8UMnV(h%>t}(uzdwW;54Werv!#z)eLl$j%#SOZ3r~w@fw;ftDjj#5 zi=%V;$^H2t_cK3cR8CBCJqyJBJy!>*i*Rsz>k5Xi~jxqJ=%e31K@pN4PFykpM-aeuE>0pqC% zH=R?qx2jC181dKQTLdkuArTOg2&%X9njKOa~<^V9IonJdMP`+E&(jL(Tc zPF~ODi#{LZ+-oS_x%SK*f3CQO_!){7=B*EbA@#qEbB0#xGUh%cr=j>@-sM1G2q!Mf zoUs+VEO`&fV=Ok9fB6s?!jrYmnOd#2<~t ziNFv}EqzXE<(8h`koZzDzQS02)jWz0i-%Xn}N1eT1z5KddnvBJb6)*(Kv@_}C7_yx1>{z;3q-8))>*Sz!l08Uo-4^nvq1QwPpZoDVo3a6aIC&=A1+fb#+8 zgQgDLKj3`8`GE5Q=Yxg-&IgxCidO^ zoX7nkKkKokIkB95JMu^U*Tn51vHJXu^+WuB@ZiC2O)rT_EN9=2{P*?0rrJ}isQ)h= z419ja`rtqKFZHA8|L31R?#8?{KRiCh7tQ5$vX$}2IPcrX@IP0)9Dgo<$bX*mFIT-# z|LXoS7oOlh`0sPTKi^}0od3h`e{$&+=O4~L;y^Aw`P!#`O!K}S`X8=;*6q^Tx$3{P zyg44^KhOOS5g?GJc=m zu|D_@{!9KaKiAUA_+y;+?PK`AR6LMBKL7h1@cA99?c29W`7>4#E>JGFIlsQv%`>ez$NTKrvxZYopFYikK?)ZL zANMk^IpzQG;ltg<#YK}p^%<8O?N~1K)!f<2IN!W^v&&VdP<**GMKMyW9JkVT&ILDz z-tWG5FBlq2POU!DVQj5P4ry?$`7V4VIq zonOzNKQH+_l()3T_u==)oQ0$z+Plx6@7wh$C(3Q;Ie6;kZr$rg_flgf8`W-zKKwIJ z^BL0^^PBe6e0bv&JLPaHYdz-Lt-tSH-@DgjeaJJ<`J(uLs9)4CU!k**G?RnhV{#77 zbumuX2gT1hdhNHaPp^)R=34VRl;4;!7xO56$Q<4E3*L|VzMZ%|C%-w4sjZ8Bus-TM zNk`2&M1A*)YRg;uz3bnf8n4y5I*-S${h^Mv!)tHsv5djlXq`5n#>pqmX>gN1mUQjn zJawy`GEs;Dp4)x#BIIHV%_hVJyTjy1K zvaMSFdnB8S>iT;9_c`uWe+R?;J&e-e{w~FDg`4aCKE!Uj+0x(T**0VH92cG8vmi6AFSpHE+GDy|K0=e z@BV#_p+5&A^)Pi^Zv3alF?Ai{2Y*Nl;7|FUp8Wnb700RTpkL^BN&1!VtJc@K`EMPs z^pE(v`jz-tU+2bu>N!4j9pdluXDW_U*8zXvPiGYPgZt+c9)Lf2_+x#)ApPe)|D}KH zYsBAu|FXtg`cK7QtZ)7;;`Qs-qkg_f#>Ln4^AzMu+eeI#etsg>mp_XY`&k~2ZA?o( z2mG8@QvA6v*YX-ri)j1~@89Rb{N>A+<%7LSr@6Fe&(As$))ez8)5-OTKabt(2lwji&DZp^`NZiMA40!R zLqAX1mp}O=-=VdzAZ z9|}j<55+*SG+1+-Lt3})zI%P|UQHaX&%VnVGrtH!QFGdtUgdnU(VP+dxIZMuA#+>| zQGSWoeNBbA@UyegPZr5)(nYh>Ky0))V&DTCN9@6bda}&%5qFI7Zj*+wOeh{zE>l{dKdwOYQFDoc`lS^mAIL?seb2nxE5( zsK?_0^TDKbAqBsdvcG&U$aT&61(SD!Y|piy^uzwww7>RzNai+V-jw`@_@!8e%)|cG z`^*^r4Z-y?<1cxhay^BADf`K_Yux|X`G@?&|GgT??IAc#;r|f76w8o#Q}&m6rd(tH zVefy86Srgkb^<*I=zHE0d;jHqsiog7oLX~Q>-*wwEX=)W==#>KEDR#n*mIYiRBLf!nFmoR3g_ zzUKw?KD_r2?)ovUVS8VD;r`?2)~|E-0?WAKjA<_j_w+yTALp^7qLo&{Ox~ z=M?v^x(nsY<;8gpYNZ=mFS)8+(_C%6|9;Es<=B$fbIg5hU;KUR*w(jRVnu7@*pkCosmosDebugEnginePackage Visual Studio Extension Detailed Info - Resources\CosmosDebugEnginePackage.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\Cosmos.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/source/Cosmos.VS.DebugEngine/VSPackage.vsct b/source/Cosmos.VS.DebugEngine/VSPackage.vsct new file mode 100644 index 000000000..9a8809912 --- /dev/null +++ b/source/Cosmos.VS.DebugEngine/VSPackage.vsct @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/Cosmos.VS.DebugEngine/source.extension.vsixmanifest b/source/Cosmos.VS.DebugEngine/source.extension.vsixmanifest index 2496c6511..ccb59cb71 100644 --- a/source/Cosmos.VS.DebugEngine/source.extension.vsixmanifest +++ b/source/Cosmos.VS.DebugEngine/source.extension.vsixmanifest @@ -2,8 +2,9 @@ - Cosmos.VS.DebugEngine + Cosmos Visual Studio Debug Engine Visual Studio Debug Engine for Cosmos + Resources\Cosmos.ico diff --git a/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj b/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj index c1e92e1b9..68703cb40 100644 --- a/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj +++ b/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj @@ -4,8 +4,6 @@ 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - true diff --git a/source/Cosmos.VS.ProjectSystem/CosmosProjectConfig.cs b/source/Cosmos.VS.ProjectSystem/CosmosProjectConfig.cs index fd2a5596f..e09049ac0 100644 --- a/source/Cosmos.VS.ProjectSystem/CosmosProjectConfig.cs +++ b/source/Cosmos.VS.ProjectSystem/CosmosProjectConfig.cs @@ -4,13 +4,14 @@ using System.Diagnostics; using System.IO; using System.Reflection; using System.Runtime.InteropServices; -using Cosmos.Build.Common; -using Cosmos.Debug.Common; using Microsoft.VisualStudio; using Microsoft.VisualStudio.Project; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; +using Cosmos.Build.Common; +using Cosmos.Debug.Common; + namespace Cosmos.VS.ProjectSystem { public class CosmosProjectConfig : ProjectConfig @@ -90,9 +91,9 @@ namespace Cosmos.VS.ProjectSystem xInfo.bstrExe = DictionaryHelper.DumpToString(xValues); // Select the debugger - xInfo.clsidCustom = new Guid("{FA1DA3A6-66FF-4c65-B077-E65F7164EF83}"); // Debug engine identifier. + xInfo.clsidCustom = Cosmos.VS.DebugEngine.AD7.Impl.AD7Engine.EngineID; // Debug engine identifier. // ??? This identifier doesn't seems to appear anywhere else in souce code. - xInfo.clsidPortSupplier = new Guid("{708C1ECA-FF48-11D2-904F-00C04FA302A1}"); + //xInfo.clsidPortSupplier = new Guid("{708C1ECA-FF48-11D2-904F-00C04FA302A1}"); VsShellUtilities.LaunchDebugger(ProjectMgr.Site, xInfo); } diff --git a/source/Cosmos.VS.ProjectSystem/source.extension.vsixmanifest b/source/Cosmos.VS.ProjectSystem/source.extension.vsixmanifest index 38e12b163..081820f0b 100644 --- a/source/Cosmos.VS.ProjectSystem/source.extension.vsixmanifest +++ b/source/Cosmos.VS.ProjectSystem/source.extension.vsixmanifest @@ -2,7 +2,7 @@ - Cosmos Visual Studio Project System + Cosmos Visual Studio Project System The Visual Studio project system for the Cosmos Operating System. Resources\Cosmos.ico