From 82dca49fadd185aa15e816cd092d7f1a45713563 Mon Sep 17 00:00:00 2001 From: Prateek Mahendrakar Date: Tue, 15 Sep 2020 20:07:33 -0400 Subject: [PATCH 1/3] Intial working commit --- .gitignore | 3 ++ .../PrettyXML.VSMac/PrettyXML.VSMac.csproj | 5 +++ .../PrettyXML.VSMac/PrettyXMLCommands.cs | 8 ++++ .../PrettyXML.VSMac/Properties/AddinInfo.cs | 3 +- .../Properties/Manifest.addin.xml | 18 ++++++++- .../PrettyXML.VSMac/XMLFormatter.cs | 36 ++++++++++++++++++ .../PrettyXML.VSMac/lib/XmlFormatter.dll | Bin 0 -> 10240 bytes 7 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 PrettyXML.VSMac/PrettyXML.VSMac/PrettyXMLCommands.cs create mode 100644 PrettyXML.VSMac/PrettyXML.VSMac/XMLFormatter.cs create mode 100644 PrettyXML.VSMac/PrettyXML.VSMac/lib/XmlFormatter.dll diff --git a/.gitignore b/.gitignore index dfcfd56..f16b86c 100644 --- a/.gitignore +++ b/.gitignore @@ -348,3 +348,6 @@ MigrationBackup/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ + +#ignore DS_Store +.DS_Store diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXML.VSMac.csproj b/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXML.VSMac.csproj index 7c4b66c..adc6e49 100644 --- a/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXML.VSMac.csproj +++ b/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXML.VSMac.csproj @@ -5,4 +5,9 @@ + + + lib\XmlFormatter.dll + + diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXMLCommands.cs b/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXMLCommands.cs new file mode 100644 index 0000000..b604bba --- /dev/null +++ b/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXMLCommands.cs @@ -0,0 +1,8 @@ +using System; +namespace PrettyXML.VSMac +{ + public enum PrettyXMLCommands + { + FormatXML + } +} diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs index b7dfb9d..743567c 100644 --- a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs +++ b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs @@ -23,7 +23,6 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -using System; using Mono.Addins; using Mono.Addins.Description; @@ -36,4 +35,4 @@ [assembly: AddinName("PrettyXML.VSMac")] [assembly: AddinCategory("IDE extensions")] [assembly: AddinDescription("PrettyXML.VSMac")] -[assembly: AddinAuthor("Mikayla Hutchinson")] +[assembly: AddinAuthor("Prateek Mahendrakar")] diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml index 42af096..a7e9475 100644 --- a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml +++ b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml @@ -1,5 +1,19 @@  - - + + + + + + + + + + + + \ No newline at end of file diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/XMLFormatter.cs b/PrettyXML.VSMac/PrettyXML.VSMac/XMLFormatter.cs new file mode 100644 index 0000000..66b8be3 --- /dev/null +++ b/PrettyXML.VSMac/PrettyXML.VSMac/XMLFormatter.cs @@ -0,0 +1,36 @@ +using MonoDevelop.Components.Commands; +using MonoDevelop.Ide; +using Newtonsoft.Json; +using XmlFormatter; + +namespace PrettyXML.VSMac +{ + public class XMLFormatter : CommandHandler + { + public XMLFormatter() + { + } + + protected override void Run(object dataItem) + { + base.Run(dataItem); + + var editor = IdeApp.Workbench.ActiveDocument.Editor; + var xmlText = editor.Text; + + //format + + var formatter = new XmlFormatter.Formatter(); + + var dto = new JSInputDTO { IndentLength = 4, UseSelfClosingTags = true, UseSingleQuotes = false, XMLString = xmlText }; + var json = JsonConvert.SerializeObject(dto); + var formattedText = formatter.Format(json).Result; + editor.Text = formattedText.ToString(); + } + + protected override void Update(CommandInfo info) + { + info.Enabled = IdeApp.Workbench.ActiveDocument?.Editor != null; + } + } +} diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/lib/XmlFormatter.dll b/PrettyXML.VSMac/PrettyXML.VSMac/lib/XmlFormatter.dll new file mode 100644 index 0000000000000000000000000000000000000000..2a7369e80222ee8e73dca21565e4a99cfc8b9db2 GIT binary patch literal 10240 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

9~=L6*?$G#4CCV0IL)LOfE8+m*A1wk)gl*q zayV)6%M_VELXNaAlNb6ywDL*o$=g5?a*pf{Eb^SO14>u~7*2K`<1{?7Kw-N=IRq>ZeGYVwfnUTw8#tG((zj%FH~6^Hi4EhB zD%<#3I@+)=t0{XAh;FZ zQn(vc_MI82a-0aSeH_zH%!UUa$1u}*c$dT~&0`~RT833*+^mGGD47cT<; E3kSF6RR910 literal 0 HcmV?d00001 From a6da74e63a55d3d1ace2ae77255b4436671e77e8 Mon Sep 17 00:00:00 2001 From: Prateek Mahendrakar Date: Wed, 16 Sep 2020 23:04:39 -0400 Subject: [PATCH 2/3] updated --- .../PrettyXML.VSMac/PrettyXMLCommands.cs | 3 +- .../PrettyXML.VSMac/Properties/AddinInfo.cs | 8 +- .../Properties/Manifest.addin.xml | 55 ++++++++----- .../PrettyXML.VSMac/ReleaseNotes.md | 4 + .../PrettyXML.VSMac/XMLFormatter.cs | 75 ++++++++++++++---- .../PrettyXML.VSMac/lib/XmlFormatter.dll | Bin 10240 -> 9216 bytes PrettyXML.VSMac/PrettyXML.VSMac/logo.png | Bin 0 -> 2118 bytes 7 files changed, 109 insertions(+), 36 deletions(-) create mode 100644 PrettyXML.VSMac/PrettyXML.VSMac/ReleaseNotes.md create mode 100644 PrettyXML.VSMac/PrettyXML.VSMac/logo.png diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXMLCommands.cs b/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXMLCommands.cs index b604bba..4a1234c 100644 --- a/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXMLCommands.cs +++ b/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXMLCommands.cs @@ -1,5 +1,4 @@ -using System; -namespace PrettyXML.VSMac +namespace PrettyXML.VSMac { public enum PrettyXMLCommands { diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs index 743567c..4de7349 100644 --- a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs +++ b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs @@ -29,10 +29,14 @@ [assembly: Addin( "PrettyXML VS Mac", Namespace = "PrettyXML.VSMac", - Version = "1.0" + Version = "1.0", + Category = "Language Bindings", + Flags = AddinFlags.None, + EnabledByDefault = true, + Url = "https://github.com/pmahend1/PrettyXML.VSMac" )] [assembly: AddinName("PrettyXML.VSMac")] [assembly: AddinCategory("IDE extensions")] [assembly: AddinDescription("PrettyXML.VSMac")] -[assembly: AddinAuthor("Prateek Mahendrakar")] +[assembly: AddinAuthor("Prateek Mahendrakar")] \ No newline at end of file diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml index a7e9475..107ba6e 100644 --- a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml +++ b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml @@ -1,19 +1,38 @@  - - - - - - - - - - - - - - \ No newline at end of file + +

+ logo.png + MySpecialTag:Important Minor + + {{0.0.7, 2020-09-16}} + First version + +
+ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/ReleaseNotes.md b/PrettyXML.VSMac/PrettyXML.VSMac/ReleaseNotes.md new file mode 100644 index 0000000..bd19791 --- /dev/null +++ b/PrettyXML.VSMac/PrettyXML.VSMac/ReleaseNotes.md @@ -0,0 +1,4 @@ +## ReleaseNotes + +### 0.0.7 2020-09-16 +- First version diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/XMLFormatter.cs b/PrettyXML.VSMac/PrettyXML.VSMac/XMLFormatter.cs index 66b8be3..64fff1a 100644 --- a/PrettyXML.VSMac/PrettyXML.VSMac/XMLFormatter.cs +++ b/PrettyXML.VSMac/PrettyXML.VSMac/XMLFormatter.cs @@ -1,36 +1,83 @@ -using MonoDevelop.Components.Commands; +using System.Diagnostics; +using System.Linq; +using Microsoft.CodeAnalysis.Text; +using Microsoft.VisualStudio.Text; +using Microsoft.VisualStudio.Text.Editor; +using MonoDevelop.Components.Commands; using MonoDevelop.Ide; -using Newtonsoft.Json; using XmlFormatter; namespace PrettyXML.VSMac { public class XMLFormatter : CommandHandler { - public XMLFormatter() - { - } protected override void Run(object dataItem) { base.Run(dataItem); + var textBuffer = IdeApp.Workbench.ActiveDocument?.GetContent(); + var textview = IdeApp.Workbench.ActiveDocument.GetContent(); + + + var textdocument = textBuffer?.Properties?.PropertyList?.FirstOrDefault(x =>x.Key is ITextDocument || x.Value is ITextDocument); + var documentvalue = textdocument?.Value as ITextDocument; + + var ext = documentvalue?.FilePath?.Substring(documentvalue?.FilePath?.LastIndexOf(".")??0); - var editor = IdeApp.Workbench.ActiveDocument.Editor; - var xmlText = editor.Text; + var contentType = textBuffer?.ContentType; + var currentDocumentText = textBuffer?.CurrentSnapshot?.AsText()?.ToString(); + var formatter = new Formatter(); - //format - var formatter = new XmlFormatter.Formatter(); + var contentTypeDisplayName = contentType?.DisplayName?.ToLower() ?? string.Empty; + if (contentTypeDisplayName.EndsWith("xml") || + contentTypeDisplayName.EndsWith("resx") || + contentTypeDisplayName.EndsWith("xsd") || + contentTypeDisplayName.EndsWith("xaml")) + { + if (currentDocumentText != null) + { + var formattedText = formatter.Format(currentDocumentText); + var span = new Span(0, textBuffer.CurrentSnapshot.Length); + textBuffer.Replace(span, formattedText); + } + else + { + Debug.WriteLine("Editor text is null"); + } + + } + else + { + if(ext.EndsWith("csproj") || + ext.EndsWith("config") || + ext.EndsWith("mobileconfig") || + ext.EndsWith("xsd") || + ext.EndsWith("xml") || + ext.EndsWith("xsl") || + ext.EndsWith("xaml") || + ext.EndsWith("axml")|| + ext.EndsWith("resx")) + { + + var formattedText = formatter.Format(currentDocumentText); + var span = new Span(0, textBuffer.CurrentSnapshot.Length); + textBuffer.Replace(span, formattedText); + } + } + - var dto = new JSInputDTO { IndentLength = 4, UseSelfClosingTags = true, UseSingleQuotes = false, XMLString = xmlText }; - var json = JsonConvert.SerializeObject(dto); - var formattedText = formatter.Format(json).Result; - editor.Text = formattedText.ToString(); } protected override void Update(CommandInfo info) { - info.Enabled = IdeApp.Workbench.ActiveDocument?.Editor != null; + + var textBuffer = IdeApp.Workbench.ActiveDocument.GetContent(); + if (textBuffer != null && textBuffer.AsTextContainer() is SourceTextContainer container) + { + var document = container.GetTextBuffer(); + info.Enabled = document != null; + } } } } diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/lib/XmlFormatter.dll b/PrettyXML.VSMac/PrettyXML.VSMac/lib/XmlFormatter.dll index 2a7369e80222ee8e73dca21565e4a99cfc8b9db2..b6901dda89e63471fa9573ab2986aa22cb8a6e84 100644 GIT binary patch delta 4103 zcmZ`+4RBP|6+ZXA_wIZ9vMjrALv}X_*-ap1$tE%UlMoOzAWV+;h)8H_5NeFWFWAbjD8=6%m~h6b96R!G5O zqE>BRWi+^+CNQ(TPJR$ddu(iCZF#oC@J4Ag-loqoDZ+6fsBm zNR%AXZLYb z$FoSumIKuZ&7F+-1J$M3N-0QJfb+wz)yoSuUv~-@+3CtWuBM_n!!goH<)`4Vx?Z1F zoH5cV-?^{$l~!4H)>W%z7eI8Sq90ruNf&8^cPTJU<#IgCvPW|M-m<7Z>?x+XRchII zwnGUn+ho^O%Upg-q2-@<;z}*o*BVq>rIEnpg@9EP z{!aLaj8_$wpZrX*=Hia#?7EUWsJLPS*QPFByjW2GnznLbHyuR63fBzf zo=NL~ZOA68j~8-R2w7hDwWG4cOQLpW6>LyBcEolwGH*qZB6U9!4bux$X+yF=l{HL~ zw}|vaLr_=O)h+Qho3R_^<#y`;GoSWvSH*%Z6^^`Vr3>0G(Mfy3;!8|o!EDg}xsJ!? zyhCDqlux|*V2-N;A~B^#L_@8pO|Kg!jw-%^#*%a7vnyI)&aQZ~D~ zlz%|c@hg_y1y`~c9VVmP^ zuU;$82s3>ROwxD-?E0wbDrN?lK_pTHGeR~^5geQ;*RPJbxa@Xy;X=ultva?}MzhtF z?40f#NtU>C{b8OQ%;F2ooiC}Fi$}zsUB1 zPES+JeonnXbR!>}h@eL0`aHeRI~ABWqm#!+kt3bQM$xgQ7*1*{czTf>oBfe%qv+8( z#3OONRML~q2%Y4&L>O;v0IZ?A8OLWN#C<6^=sKlAfswnO=r2d5cEUk?k%<0 zQ_96l3LjGjPngoh3z{^3QXw$Jb$wlyJO0HGS zO`-rXXx^y>jgA}=AEwUya`Rr`8ziw#(Jv~xUAvd&QjqOno%#7neq6~r75$E)|H7oz zOA3pX{23)rf}TsAkTd#{zQY(Lbcw?(2V5w219OYjM2_wUb1Sft9@ZXYD^qf3-={jiE<=8EXAKBra)(zz?R&k9^FVZ6wKq~YZtdevH|9b$8eZa26v26 zuaZwi*>gf`gyd~J5sctVdlQcKKva(jY4#`um{fX``U{S}huI}enjJQNKnZ4>W6JeU zpmPq#6=BzD2QfR0BRESNO&Q9t*-9VKb=t3iQhz#o-h3HWJH<(QfYvGhKQ-T{*K(BC zKBU8HH-~9Vd6JJg9vN`emHwVcM!od|W$EzoMh;0`{~}vsfEDgyQN|9-dVg zLbHmo5Lqa^5IXK;U>LN6qZk5ROjW>gssZLw)QDj!%>$;X1z1Pd0vo9nIGb(&&Zl+2 z7V2dUD62PsQ92DQqw~NiD1`>f&^+KQY6C8yPT=*l0eF*=uLh=AH*MyN6|Ps9XWh#o zdRj3rD;(oe>A1oV6eiKB?xs`N6GNkx9Ve)tK>7XKcojINaJTkHuhOZx!@+IQ^RgT- z{{_*AWeXqwh1jQxtfp(J2H$G>1$E%-rr%3>+tSV32KutSxA*t0pFu6{?j76u`xepa z9fL!C0}XAS9j!dFEV@(k-YY5fqOsN9Q0%cI(RdF_7F4cx`}_Mg3~h2Z57I_AJJ35c zgg0r$7VltUjkDtRyD&$~Hf0BgR%BcIHuicorLTEkmM%`T4c@Y?zkfw`>A;qu9YjUl zG=gIor5H@wG-mnUyCOzt#= zEK_rqI7^*2Jw?veqA+8VoE@x!oKf9o&Qd9;AYY`VC}a>1g+fM(IZJ@#E|C_{?tcb{C9h1?Kv-s$B2Tx=khyD2P f1xcs&RhICv<|C()!|X_?>OUHPrTIuC^*Q?=acPMs literal 10240 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

9~=L6*?$G#4CCV0IL)LOfE8+m*A1wk)gl*q zayV)6%M_VELXNaAlNb6ywDL*o$=g5?a*pf{Eb^SO14>u~7*2K`<1{?7Kw-N=IRq>ZeGYVwfnUTw8#tG((zj%FH~6^Hi4EhB zD%<#3I@+)=t0{XAh;FZ zQn(vc_MI82a-0aSeH_zH%!UUa$1u}*c$dT~&0`~RT833*+^mGGD47cT<; E3kSF6RR910 diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/logo.png b/PrettyXML.VSMac/PrettyXML.VSMac/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f34a7e1122012a120eebb5eb3eab35b51ab55eae GIT binary patch literal 2118 zcmV-M2)Xx(P)Hg1+lHrgWSWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6 zwD^Ni=!>T7nL9I?X}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8re zhoBb*p;u8ID_yBf0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J z`jH<$>RKN5V(7OqK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYv zwjAKwmYb0gKL(K8-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z> z!FI&AHCpoWI|RUqx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVT zrI(b06~u#xf1yS}_UGdMvD``!0~u->P=lA4?YN`hilQ z|3tHka)7T{2CGqwjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^ z7T9R1gAN8V6s;5)ieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2b zW$~+pTw@bIek?ZvKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L z_AC5qq~L$#SMj%U$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6= zb6>{xYV#Ue-+LB$7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re z4r3qYr~6#KE>;1F`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+ z5K}u-6REM(K@W$srgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5 zh^QEb$V`rCQ-|7ZS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX z2i^rZ^Mu;6+rb@?NPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV z0id6JRRdfL?*IS*Y-LzUW=%~1DgXcg2mk~D8UO_V00031002G#8vq3W00031002e- zC;$Th000310ssJqX#fNO00031002$^00000003YB00031003YB000310-yo_1ONa4 z0RR91AfN*P1ONa40RR91AOHXW08mTNsQ>@~32;bRa{vGi!~g&e!~vBn4jTXf16xT% zK~z`??N&`lR8bT@?`QsWP{+*tL!z{_WJEGF{}%}rWo4s>#EleC=uz;xUdLdC2A^9{Q$t@tQexr-WH6O#Ogc49!|d#= zO>P-)UJfH8a((653hv~E*F7E7@#&)ntsNTtPc$gLc#fE{b6_ZLCMt;r!bJ!=J3B4T znEv<12J#CF%^2t1_V(&{9&*7|p&<9O4!zjPkziYnDsFU%Xe0teHPHc|&y9tJg&1Pz zfUkma)*jJ5D^o${kOucn>l%6(XB;dV6R{14pXiQE8UnHiL%?MW4D>nq670>*O_Y_D zMb^e{?yV7cstlh&{EWyk;{s9wRdmy)2&aHsbk-AjL@5G+0M^!46G-D7U2yE?_xI7(b}zhf`U1qi0`a|v=q=$)=thwnTvk!q zytZMhDlad`*49=^0*v6fxgT(QSZMlPi1#fd{VOp`As;9r@wrA0oG4&oVj^X7Yr&)5 z7d%KN@7+rw_aSNDDPW2|%|4(r)3jp+)YjI*D5{gTrKMl+`*~XRDn;;ltJfjg;m!w=JdW6!4-0U+ z-I$-BKPhLzx{;9)i{Q9EETEsi@2AW@cuL;i)v%lhoDK w$@22@k^Avqm6?GfgZ|}Y%702vTgIjSW&i*H literal 0 HcmV?d00001 From f42a25a81791cfeb5515a5ba3c18321aaf915a55 Mon Sep 17 00:00:00 2001 From: Prateek Mahendrakar Date: Mon, 21 Sep 2020 00:41:13 -0400 Subject: [PATCH 3/3] added msbuild properties and tasks --- .../PrettyXML.VSMac/PrettyXML.VSMac.csproj | 17 +++++++- .../PrettyXML.VSMac/Properties/AddinInfo.cs | 8 ++-- .../Properties/Manifest.addin.xml | 41 +++++-------------- 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXML.VSMac.csproj b/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXML.VSMac.csproj index adc6e49..2b1de67 100644 --- a/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXML.VSMac.csproj +++ b/PrettyXML.VSMac/PrettyXML.VSMac/PrettyXML.VSMac.csproj @@ -1,6 +1,11 @@ + - net471 + net48 + True + True + + @@ -10,4 +15,14 @@ lib\XmlFormatter.dll + + + PreserveNewest + + + + + PreserveNewest + + diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs index 4de7349..46b5835 100644 --- a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs +++ b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs @@ -29,14 +29,14 @@ [assembly: Addin( "PrettyXML VS Mac", Namespace = "PrettyXML.VSMac", - Version = "1.0", - Category = "Language Bindings", + Version = "1.0.0-beta", + Category = "Code formatters", Flags = AddinFlags.None, EnabledByDefault = true, Url = "https://github.com/pmahend1/PrettyXML.VSMac" )] -[assembly: AddinName("PrettyXML.VSMac")] -[assembly: AddinCategory("IDE extensions")] +[assembly: AddinName("PrettyXML VS Mac")] +[assembly: AddinCategory("Code formatters")] [assembly: AddinDescription("PrettyXML.VSMac")] [assembly: AddinAuthor("Prateek Mahendrakar")] \ No newline at end of file diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml index 107ba6e..b5bd4ed 100644 --- a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml +++ b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/Manifest.addin.xml @@ -1,38 +1,17 @@  - -

- logo.png - MySpecialTag:Important Minor - - {{0.0.7, 2020-09-16}} - First version - -
- + - + - - + - + - - - - - - \ No newline at end of file + \ No newline at end of file