From e930eb23f9d19ef94fbea960d8511a49d360166a Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Sat, 16 Aug 2025 23:49:00 +0200 Subject: [PATCH 1/7] feat: Extensibility 0.4.0 for GE6 --- Directory.Build.props | 2 +- Directory.Packages.props | 3 ++- appveyor.yml | 2 +- .../GitExtensions.Extensibility.0.1.0.nupkg | Bin 1784 -> 0 bytes .../GitExtensions.Extensibility.0.2.0.nupkg | Bin 1784 -> 0 bytes .../GitExtensions.PluginManager.csproj | 2 +- .../GitExtensions.PluginManager.nuspec | 6 +++--- src/GitExtensions.PluginManager/Plugin.cs | 5 ++--- .../Services/SearchService.cs | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 data/NuGetFeed/GitExtensions.Extensibility.0.1.0.nupkg delete mode 100644 data/NuGetFeed/GitExtensions.Extensibility.0.2.0.nupkg diff --git a/Directory.Build.props b/Directory.Build.props index 467a37d..430c115 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - net8.0-windows + net9.0-windows latest $(NoWarn);1573;1591;1712 true diff --git a/Directory.Packages.props b/Directory.Packages.props index 1843833..dd85899 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,12 +5,13 @@ true true + $(NoWarn);NU1602;NU1604;NU1701 - + diff --git a/appveyor.yml b/appveyor.yml index a76e794..0cd9921 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ # version format -version: 3.0.0.{build} +version: 3.1.0.{build} matrix: fast_finish: true diff --git a/data/NuGetFeed/GitExtensions.Extensibility.0.1.0.nupkg b/data/NuGetFeed/GitExtensions.Extensibility.0.1.0.nupkg deleted file mode 100644 index 026c1f3485770b77509b231c83e48b9470054226..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1784 zcmWIWW@Zs#U|`^2kSr+Qm6unOw&3tFFI-=%qM4HH{=MVh%#9k~6I{;BVV`YwidEU5 zH!&gZM7bfu=1*aEudYzD+o}({U7tlNHpzCsj$>(AkSH?PtS)R^LYq`p$6tqb+ zk>QO-_0=6#$~XL1&WN3FU3;P8<-YNn>3c#S7oDkG@3l{O?HaGRsaq!rF@#M1 znNjs}eP3#z{`J&}{oT{_XD$0%G-tzZ`MGt#koy0hnIQlrELRGg>(Ky)r8+Pym4GVT zGfP}6N>cNRGxPI`^`Ok8%$&@UO1-?&;)2xVl8FcX4jb^az4zGTJjL4cIBUx#KWhf@ zBdzKmg35cZsi>CS{FWnAp%T}~6O_qOw)t=UwtDsX@8#2Wes8Wg?4s8er5B>g$|fBx zZnkyKj@`Sao__Y}P*1}44UQ8(I&6J2^SJfeliyx6PANBY?UL1&-uo}{GfQo(u2$^b z7X}wQ!rrc&S~)}Dn6fiB&;7`AvA1ok_T4vbTPz%;8ngT0$Ad4{h;ORM)tY)%%67SH zYv=D7D?UyrSZ(D#*1f*)i^#AHk z^38j)cx!xn=i{e~_AI-&JSOw4P{p02TVe$l#`E)~hyU+jXH=~?=cF6YcjU#=1P|#a z?K9Uc6{(6_a6Z@I*OO?UpKdw(u!i&Q1#){X0A(ft!&(?fM?2@|0fV_DKBTfBwK!I< zA~$Ewgo9p341j63>AgVFRI{ti9b0y{Up2oW&T%vQ zq-0U#qFbAL8kK8~2p$f;Y{PzHiAU7S(!;lB6~C3{E1Y|E?|k0ek4>8^%5OZ$UjKPw zrJumn3X8!1YeQ;7vv%*XG*X?$F1&}^J}qLJ+>d(26Rg^LZry5sj9ph79MWIO)3r-? z%foL+cZ0GdW!^yHR&(d#-oF^h>LidV>X{jTV2j`uRPy<#C$#Mb}5Q z^Ci!^Z?xOO`;Zajh zS_f_yTJ(D3L%wn+ZARWL2`9UI(v@cJVY%@uzj1}nxn}dp*%EAaPcClvxa_mX*8Xqc z`wORbZk)Fy)F4Rs;o>)yKUVR2z1=YNNpg$ds=ap(YF-N3;t=FL=~2kdJ+r;MowoLf zMy(ZTQfUv>7W}ryOfEp|k&}hAX+`U@#TO2}x_IGm$m)iKO6L_9}r}f diff --git a/data/NuGetFeed/GitExtensions.Extensibility.0.2.0.nupkg b/data/NuGetFeed/GitExtensions.Extensibility.0.2.0.nupkg deleted file mode 100644 index bd5721a34437c561eab3c8fc72a564be8442ff0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1784 zcmWIWW@Zs#U|`^2P$?-6o+4`8t<1>4z{$kGzzr0QFG|fR*4G1(QzqWcVlotHea~In zKB3zDW^8GB_v#&C-ud170+Vl=UimYjXHowBDNzAl3-?+dKJ(L}eWvcYXAXV>i^{ew ztvsg5s6F>mS;kAj-+{j3pO3fSl$K#xHhaf)yGbdVHZHAp`F|v0O0|Jf+PP-m+4oqL z4SEw3;!czsGH6@O-&AmVL8sRV+37j@a&-Z{(+;{`Pga||lPP#t%NfhZqQ-|_$teYG z5=~^t(X76>!%q3e`5?pHr{>ya>`D11Ve8=)7wUcgTItr4)6cGY9rkot^}L`%|D;~W zr_N*)@mi2@iB;m~ggcC;M`mBR|BmC~64gKN5*KBBx*H+tyYNZG*R$(hgkBQnRDHs= z>Wus1CHu>C)JpfotUJAG-iN;HPs5K(?*9Ga4>JS9|NqPk0VrWPqe}Ref2Mn9{m1@S9qsHmSyl% z5s93f*c(@hp1gbJr#I`hwynf&V`&jd{*cqUp9}aM%DV4O_;hZW$HwH;#qIKD{tcC; zs~7BQHMrCeCc9#4z@4WnU(Vk^(#p|||ovgTXd`q;@!uaoe>f!%8+!MV%%xR6HM`o}v1NDrRr4F-9G5etbJU&FcCE?Zzd72! ziA(PA_p|>UZ~d*Dd6%<$iO<~nHPY`VD17fcc5b~@h<@Gv-TSlq=l4AFQG5Ak$*J{< z96mc-RvIfyN)|;fy0y8dQMu-b;NjrQHtZ*sctpJ{J$!ps@mp!W!ns%X&gaej*tEH# z{Kk{)^`9qJ`UzaEun7FWHl#K*Yxf>YBh_i_!h5*w(;}wH{is(w!K$t2)~)u(*mbqR zA^nv+UAuI*Jp6WaHz-eH2Eds^yWLBGp05F>v_PPWg2d$P#Pn4C;?$zD%;eN!{oK@& z#FWI6ME&IaqEy|2qWpr?qLNIYM52+UVUkITk)=^evPnvsWs*@^3XpA@oNAnEn38I) zS5Tarl3b88>8#&t1A*4>;g4k3tckYHT(Dpg3ujA2%#KwoPC2pFL2J~?Oy*7a_O@`X zK$YO9W7jP2_dH*|!>J)r7sjaBAnqc}qeKf`lI~epC5l6|dLZ4O5>axA?7^d*_hhrJyYiLEe)dMcmvo z+soT&YmaEuT9GD|_E2rXvOQ*U0b-9_ei&ta;PQ1}*m|{j;cweU+i#aQCkvS^>wU5E zYtE5gzOzPK8UM_G_P8`z%DKH`euT0u-#V|KP0L$iEmUz?wuscrmzq8n zEf=@9zl#6QaOC>O$%(IwzgguSp0xa-j-Gz{n|1js+%*d)ZZXz=(uIF(Z=*1MZ?37|%!msh|$https://github.com/gitextensions/gitextensions.pluginmanager OnOutputUpdated $(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec - 1701;1702;NU5100;NU5101;NU5103;NU5128 + 1701;1702;NU5100;NU5101;NU5103;NU5128;NU1604;NU1701 false diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec index d6a7d5c..064fa76 100644 --- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec +++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec @@ -9,12 +9,12 @@ $tags$ LICENSE.md - + - - + + \ No newline at end of file diff --git a/src/GitExtensions.PluginManager/Plugin.cs b/src/GitExtensions.PluginManager/Plugin.cs index ce70878..da46467 100644 --- a/src/GitExtensions.PluginManager/Plugin.cs +++ b/src/GitExtensions.PluginManager/Plugin.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.ComponentModel.Composition; using System.Diagnostics; using System.IO; using System.Windows.Forms; @@ -23,7 +22,7 @@ public class Plugin : GitPluginBase public const string PackageId = @"GitExtensions.PluginManager"; public const string GitExtensionsRelativePath = @"GitExtensions.exe"; public const string PluginManagerRelativePath = @"PackageManager\PackageManager.UI.exe"; - public static readonly List FrameworkMonikers = new List() { "net5.0", "net6.0", "net7.0", "net8.0", "any", "netstandard2.0" }; + public static readonly List FrameworkMonikers = new List() { "net5.0", "net6.0", "net7.0", "net8.0", "net9.0", "any", "netstandard2.0" }; internal PluginSettings Configuration { get; private set; } @@ -52,7 +51,7 @@ public override bool Execute(GitUIEventArgs gitUiCommands) Args args = new Args(); args.Path = pluginsPath; - args.Dependencies = new List() { new Args.Dependency("GitExtensions.Extensibility", "0.3.0") }; + args.Dependencies = new List() { new Args.Dependency("GitExtensions.Extensibility", "0.4.0") }; args.Tags = "GitExtensions"; args.Monikers = FrameworkMonikers; args.SelfPackageId = PackageId; diff --git a/test/PackageManager.NuGet.Tests/Services/SearchService.cs b/test/PackageManager.NuGet.Tests/Services/SearchService.cs index 4c9dcba..c485bf5 100644 --- a/test/PackageManager.NuGet.Tests/Services/SearchService.cs +++ b/test/PackageManager.NuGet.Tests/Services/SearchService.cs @@ -45,7 +45,7 @@ public static (ISearchService search, IPackageSourceCollection sources) Create(s ), new DependencyNuGetPackageFilter( new DefaultLog(), - new List() { new Args.Dependency("GitExtensions.Extensibility", "0.2.0") }, + new List() { new Args.Dependency("GitExtensions.Extensibility", "0.4.0") }, frameworks ) ); From 5bfd98d54311768159a89bc1345cdf87d85ead1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Tue, 26 Aug 2025 20:09:55 +0200 Subject: [PATCH 2/7] Pin Microsoft.VisualStudio.Threading --- Directory.Packages.props | 1 + .../GitExtensions.PluginManager.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index dd85899..6ad01e8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,6 +11,7 @@ + diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj index 707fd5b..bfbf6b9 100644 --- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj +++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj @@ -16,6 +16,7 @@ + From db8013c4399439af0fee5d9602eadd57218907e1 Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Tue, 26 Aug 2025 22:25:19 +0200 Subject: [PATCH 3/7] fixup! feat: Extensibility 0.4.0 for GE6 --- src/GitExtensions.PluginManager/Plugin.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/GitExtensions.PluginManager/Plugin.cs b/src/GitExtensions.PluginManager/Plugin.cs index da46467..d02813c 100644 --- a/src/GitExtensions.PluginManager/Plugin.cs +++ b/src/GitExtensions.PluginManager/Plugin.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.Composition; using System.Diagnostics; using System.IO; using System.Windows.Forms; From 07c750b4705cc1be383bf2957910f3b49c03847c Mon Sep 17 00:00:00 2001 From: Gerhard Olsson Date: Tue, 26 Aug 2025 22:52:56 +0200 Subject: [PATCH 4/7] fixup! feat: Extensibility 0.4.0 for GE6 --- Directory.Packages.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 6ad01e8..10d39c7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,8 +11,8 @@ - - + + @@ -22,7 +22,7 @@ - + From 9bf26b4d9a490a14be909e500ac6aff1a8424909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Wed, 27 Aug 2025 09:19:42 +0200 Subject: [PATCH 5/7] Revert test changes --- .../GitExtensions.Extensibility.0.1.0.nupkg | Bin 0 -> 1784 bytes .../GitExtensions.Extensibility.0.2.0.nupkg | Bin 0 -> 1784 bytes .../Services/SearchService.cs | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 data/NuGetFeed/GitExtensions.Extensibility.0.1.0.nupkg create mode 100644 data/NuGetFeed/GitExtensions.Extensibility.0.2.0.nupkg diff --git a/data/NuGetFeed/GitExtensions.Extensibility.0.1.0.nupkg b/data/NuGetFeed/GitExtensions.Extensibility.0.1.0.nupkg new file mode 100644 index 0000000000000000000000000000000000000000..026c1f3485770b77509b231c83e48b9470054226 GIT binary patch literal 1784 zcmWIWW@Zs#U|`^2kSr+Qm6unOw&3tFFI-=%qM4HH{=MVh%#9k~6I{;BVV`YwidEU5 zH!&gZM7bfu=1*aEudYzD+o}({U7tlNHpzCsj$>(AkSH?PtS)R^LYq`p$6tqb+ zk>QO-_0=6#$~XL1&WN3FU3;P8<-YNn>3c#S7oDkG@3l{O?HaGRsaq!rF@#M1 znNjs}eP3#z{`J&}{oT{_XD$0%G-tzZ`MGt#koy0hnIQlrELRGg>(Ky)r8+Pym4GVT zGfP}6N>cNRGxPI`^`Ok8%$&@UO1-?&;)2xVl8FcX4jb^az4zGTJjL4cIBUx#KWhf@ zBdzKmg35cZsi>CS{FWnAp%T}~6O_qOw)t=UwtDsX@8#2Wes8Wg?4s8er5B>g$|fBx zZnkyKj@`Sao__Y}P*1}44UQ8(I&6J2^SJfeliyx6PANBY?UL1&-uo}{GfQo(u2$^b z7X}wQ!rrc&S~)}Dn6fiB&;7`AvA1ok_T4vbTPz%;8ngT0$Ad4{h;ORM)tY)%%67SH zYv=D7D?UyrSZ(D#*1f*)i^#AHk z^38j)cx!xn=i{e~_AI-&JSOw4P{p02TVe$l#`E)~hyU+jXH=~?=cF6YcjU#=1P|#a z?K9Uc6{(6_a6Z@I*OO?UpKdw(u!i&Q1#){X0A(ft!&(?fM?2@|0fV_DKBTfBwK!I< zA~$Ewgo9p341j63>AgVFRI{ti9b0y{Up2oW&T%vQ zq-0U#qFbAL8kK8~2p$f;Y{PzHiAU7S(!;lB6~C3{E1Y|E?|k0ek4>8^%5OZ$UjKPw zrJumn3X8!1YeQ;7vv%*XG*X?$F1&}^J}qLJ+>d(26Rg^LZry5sj9ph79MWIO)3r-? z%foL+cZ0GdW!^yHR&(d#-oF^h>LidV>X{jTV2j`uRPy<#C$#Mb}5Q z^Ci!^Z?xOO`;Zajh zS_f_yTJ(D3L%wn+ZARWL2`9UI(v@cJVY%@uzj1}nxn}dp*%EAaPcClvxa_mX*8Xqc z`wORbZk)Fy)F4Rs;o>)yKUVR2z1=YNNpg$ds=ap(YF-N3;t=FL=~2kdJ+r;MowoLf zMy(ZTQfUv>7W}ryOfEp|k&}hAX+`U@#TO2}x_IGm$m)iKO6L_9}r}f literal 0 HcmV?d00001 diff --git a/data/NuGetFeed/GitExtensions.Extensibility.0.2.0.nupkg b/data/NuGetFeed/GitExtensions.Extensibility.0.2.0.nupkg new file mode 100644 index 0000000000000000000000000000000000000000..bd5721a34437c561eab3c8fc72a564be8442ff0b GIT binary patch literal 1784 zcmWIWW@Zs#U|`^2P$?-6o+4`8t<1>4z{$kGzzr0QFG|fR*4G1(QzqWcVlotHea~In zKB3zDW^8GB_v#&C-ud170+Vl=UimYjXHowBDNzAl3-?+dKJ(L}eWvcYXAXV>i^{ew ztvsg5s6F>mS;kAj-+{j3pO3fSl$K#xHhaf)yGbdVHZHAp`F|v0O0|Jf+PP-m+4oqL z4SEw3;!czsGH6@O-&AmVL8sRV+37j@a&-Z{(+;{`Pga||lPP#t%NfhZqQ-|_$teYG z5=~^t(X76>!%q3e`5?pHr{>ya>`D11Ve8=)7wUcgTItr4)6cGY9rkot^}L`%|D;~W zr_N*)@mi2@iB;m~ggcC;M`mBR|BmC~64gKN5*KBBx*H+tyYNZG*R$(hgkBQnRDHs= z>Wus1CHu>C)JpfotUJAG-iN;HPs5K(?*9Ga4>JS9|NqPk0VrWPqe}Ref2Mn9{m1@S9qsHmSyl% z5s93f*c(@hp1gbJr#I`hwynf&V`&jd{*cqUp9}aM%DV4O_;hZW$HwH;#qIKD{tcC; zs~7BQHMrCeCc9#4z@4WnU(Vk^(#p|||ovgTXd`q;@!uaoe>f!%8+!MV%%xR6HM`o}v1NDrRr4F-9G5etbJU&FcCE?Zzd72! ziA(PA_p|>UZ~d*Dd6%<$iO<~nHPY`VD17fcc5b~@h<@Gv-TSlq=l4AFQG5Ak$*J{< z96mc-RvIfyN)|;fy0y8dQMu-b;NjrQHtZ*sctpJ{J$!ps@mp!W!ns%X&gaej*tEH# z{Kk{)^`9qJ`UzaEun7FWHl#K*Yxf>YBh_i_!h5*w(;}wH{is(w!K$t2)~)u(*mbqR zA^nv+UAuI*Jp6WaHz-eH2Eds^yWLBGp05F>v_PPWg2d$P#Pn4C;?$zD%;eN!{oK@& z#FWI6ME&IaqEy|2qWpr?qLNIYM52+UVUkITk)=^evPnvsWs*@^3XpA@oNAnEn38I) zS5Tarl3b88>8#&t1A*4>;g4k3tckYHT(Dpg3ujA2%#KwoPC2pFL2J~?Oy*7a_O@`X zK$YO9W7jP2_dH*|!>J)r7sjaBAnqc}qeKf`lI~epC5l6|dLZ4O5>axA?7^d*_hhrJyYiLEe)dMcmvo z+soT&YmaEuT9GD|_E2rXvOQ*U0b-9_ei&ta;PQ1}*m|{j;cweU+i#aQCkvS^>wU5E zYtE5gzOzPK8UM_G_P8`z%DKH`euT0u-#V|KP0L$iEmUz?wuscrmzq8n zEf=@9zl#6QaOC>O$%(IwzgguSp0xa-j-Gz{n|1js+%*d)ZZXz=(uIF(Z=*1MZ?37|%!msh|$() { new Args.Dependency("GitExtensions.Extensibility", "0.4.0") }, + new List() { new Args.Dependency("GitExtensions.Extensibility", "0.2.0") }, frameworks ) ); From 09a7bd6459ee91a2013732a401ecce243b690909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Wed, 27 Aug 2025 09:24:04 +0200 Subject: [PATCH 6/7] Floating GitExtensions.Extensibilit version --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 10d39c7..fa69f3b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,7 +2,7 @@ - + true true $(NoWarn);NU1602;NU1604;NU1701 @@ -12,7 +12,7 @@ - + From a8888d37134b74e89100468479f9ad6a550e520d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Mon, 1 Sep 2025 10:42:55 +0200 Subject: [PATCH 7/7] Fix GitExtensions.Extensibility dependency version range Updated dependency version range for GitExtensions.Extensibility. --- .../GitExtensions.PluginManager.nuspec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec index 064fa76..be019f5 100644 --- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec +++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec @@ -9,7 +9,7 @@ $tags$ LICENSE.md - + @@ -17,4 +17,5 @@ - \ No newline at end of file + +