From a04b6b5e911efb889f687f3992e08d5cd61b33ac Mon Sep 17 00:00:00 2001 From: DaPa Date: Mon, 30 Sep 2019 00:27:29 +0300 Subject: [PATCH 1/2] get build running with vs 2019 --- src/MatchMargin/MatchMargin.csproj | 214 +++++++++--------- src/MatchMargin/Strings.Designer.cs | Bin 6364 -> 3185 bytes src/MatchMargin/source.extension.vsixmanifest | 31 +-- 3 files changed, 124 insertions(+), 121 deletions(-) diff --git a/src/MatchMargin/MatchMargin.csproj b/src/MatchMargin/MatchMargin.csproj index 686cd35..9b2b7c4 100644 --- a/src/MatchMargin/MatchMargin.csproj +++ b/src/MatchMargin/MatchMargin.csproj @@ -1,109 +1,109 @@ - - - - - - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {4133D566-F45A-4E14-94E1-305E244A8671} - Library - Properties - Microsoft.VisualStudio.PowerTools.MatchMargin - Microsoft.VisualStudio.PowerTools.MatchMargin - v4.5.2 - false - 14.0 - - - - - 4.0 - - - + + + + + + {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {4133D566-F45A-4E14-94E1-305E244A8671} + Library + Properties + Microsoft.VisualStudio.PowerTools.MatchMargin + Microsoft.VisualStudio.PowerTools.MatchMargin + v4.7.2 + false + 14.0 + + + + + 4.0 + + + - true - true - false - false - true - - - - False - false - - - False - false - - - False - false - - - False - false - - - False - false - - - False - false - - - False - false - - - False - false - - - False - false - - - False - false - - - False - false - - - False - false - - - - - - - - - true - Always - - - Designer - ResXFileCodeGenerator - Strings.Designer.cs - - - True - True - Strings.resx - - - - - Designer - - - - - + and if we're being built standalone (not as a part of the Pro Power Tools package). --> + true + true + false + false + true + + + + False + false + + + False + false + + + False + false + + + False + false + + + False + false + + + False + false + + + False + false + + + False + false + + + False + false + + + False + false + + + False + false + + + False + false + + + + + + + + + true + Always + + + Designer + ResXFileCodeGenerator + Strings.Designer.cs + + + True + True + Strings.resx + + + + + Designer + + + + + \ No newline at end of file diff --git a/src/MatchMargin/Strings.Designer.cs b/src/MatchMargin/Strings.Designer.cs index 8e6faed06a97e7a852c89ccd6617cd10f09b866e..769e398a8cbdb844bc4d62995e67802c2cdc9c05 100644 GIT binary patch literal 3185 zcmdT`U2oeq6nzhn|8U`#*+3%OYf)@jI>2>`qCmX`aS{v|_CQP5GFOV!NXmvf?3eXn zKWTqq_ezv3Yfj(-eVOxNnkJ9VJ@?#8{`2|o@%ZwqzRu6aW4IQDHJo% zy5C3#u}Khi!a=(LRwW4V#;B-WdRJ&KGlWO9P8xmnGMYp$CNHMnM=!sfOeVapT|3_h zouVTI@ce|eR0x?UAr^&0kUBQjV(ejs8?lwfg3t-rvO5+wh=7RZe@(FooFN4N7GL}zkL1dw)<6f6$v=CZQEUk^{b0~)|!F^YyOMaqf8Xe6Gd4h|#q-;itzKVhw!R9XCo?9$QuJNn>q&at8ir<7b%{G%qebHL_77_KZb+u6nlQQd0(7C& z=pc0sLIr- zQKw+KQFH<(j!gB)!j5B`y|%JsTa|~^&Wk#GI>QqU|MM2Dl?mT7*zyHkDYU1tMUi~t zU|vr=ybsNQn|_Ygm(`(3rFr-mXlYglYLUBeYF9TH7tX&*y8bczzptIA8)~E7X*JW! z_kX)^FX#Nx9WTGeat(pkuobGnp6@!Q=?o7O+q+otGwX)=f$mL|fP#@6BYkNGNIdkv1=ic$(f9;3;aPK4jeHuOy!u^nigD?o|unG&IJrCnB z*O9AjrSm9!8;YKpdh>e~-h@e5>T0OBM(US^3%x;0eS|EWhD$ve=wOybn1;QEQICXT zt{#&xizA*y9829V)c!a;(p&d+Jkqp@W-SKmjes-)`_)cgC8UbV=1OxxR zhBM7DjWf>F52Qn#*Xql| zgtINi0vjlprLd#fmAUGcEL-hBzPp~^K6V!3vANcQ*O%d~u7=Sj&thNPPywv}N-pj>KTsFm@S@<*h!u^1+X+PJK zV=(}ajfLmyN-uEw8|7=F$l?fOGyMiaak+^cf5Urm-`Bw$tc_Wx>U~f5ms&kBm+1+% zSZKU_V~wGD5n;>lxt^ct8N7pEi}2eP{aPbfD;%Dx{g2IvHlMB1#u!J-7^hN{u&Zk| zRUL42g%Y%}(>1~Qk1xyCc(t{~QDTWFvI+5u>f{ywm=_8=WidWcowD*^orx?))Y;h2 zbPXrWqGg7`hBC)euVVqUWFRzn%|^g?GhM%nb1*l|o<-HjqxbOfL?dTfrTI7$R}IZi zYAqDW>;pPR&9!!}%ed>9&>-G3jboko68nPit*%T_;ZcG3bZgf#suNit(>wU)S0OT4O|Q0JN6<$k6SO>=X#nElH+$KUB|HgHcgIvHvlc0w;1 z-)vDt3Q=EHfZH;w7d_S6W*sumea*fbeyOmoYyF2pKah>)S~p%m)4+JB)v&5_{aE{t zdOi=Y^^ChV3)~bzHLun^a2#hOm!Z30OMO)LP?Kj;TxbnG%XNkuWVu2m%rCA-sUo`` zmD%lWuyLa3vI@nNlxy%)f1rt1v9XCQX&X5M#O9Z}7Tfb`Zg6aOjrUn;HE6l56QodNR9ep%0gp|6kGIziBx+dRSabwIqG_ZyKn1!u5x%s z+He(*-&ZulM{Ht?*9ix*&(+n0kKnzzhsVZ-x!x_*pEXkfS!L11c2zZDy!!WeuI7XkT~{^X{ks_Fx&;5p*(h|DLjSaiLlzJ5E2NkJK>jy}UR3pG^51Z7wPa z5S;1Ab(npghTp|FqI9X=w3q8((_Z3yu3kj)ZcEhp-08X9@2OQ#uCy)95w>5T_WmYf z8;g5)pNpt|n)I+-v%Ra|PyUDI8wS9Wu z>|wK`TeUf7r6VWtzQwOj*bkW+m zV{h_V>`5I^^mwg`p;{SuozEUL*BE>W@qMOc&9>EGoz$1b{*=5A+VW1j$Rp@ndG`nU z>+OaA&pXvDM+E=3dFM72YRbFz405wP(;nZ|ncH=xIig(!(7fwszcezcI85!R5vGce zafgC7<7#egi`bi2m_I0c^R>w$nQX_`4fb1YUz^yW@lBT - - - Match Margin - This extension draws matchs that match the word under the caret in the scroll bar and in the editor. - - - - - - - - - - + + + Match Margin + This extension draws matchs that match the word under the caret in the scroll bar and in the editor. + + + + + + + + + + + + + From 47f774390dd9c816e4ff2e85cb334e1826efe5eb Mon Sep 17 00:00:00 2001 From: DaPa Date: Mon, 30 Sep 2019 00:29:49 +0300 Subject: [PATCH 2/2] better default background color for dark theme in output window --- src/MatchMargin/MatchMarginElement.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MatchMargin/MatchMarginElement.cs b/src/MatchMargin/MatchMarginElement.cs index 834bc90..3a5205c 100644 --- a/src/MatchMargin/MatchMarginElement.cs +++ b/src/MatchMargin/MatchMarginElement.cs @@ -49,7 +49,7 @@ public MatchColorFormat() { this.DisplayName = Strings.MatchColor; this.ForegroundColor = Color.FromRgb(147, 112, 219); //Color of the margin mark - this.BackgroundColor = Color.FromRgb(228, 219, 246); //Color of the adornment + this.BackgroundColor = Color.FromRgb(103, 109, 91); //Color of the adornment. Old: (228, 219, 246); } }