Skip to content

Commit a35ea4c

Browse files
authored
build: Update for GE 7.0.0
- Bump version to 7.1.0 (not same due to postponed GE release) - Download GE extensibility from GitHub - Update NuGet.Packaging and NuGet.PackageManagement to 7.6.0 due to a known critical severity vulnerability - Replace deprecated Provider.SaveActivePackageSource(null) Co-authored-by: 198982749+Copilot@users.noreply.github.com Refs: #91
1 parent 133433a commit a35ea4c

4 files changed

Lines changed: 25 additions & 5 deletions

File tree

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<PackageVersion Include="Neptuo" Version="6.0.2" />
1717
<PackageVersion Include="Neptuo.Exceptions" Version="1.2.2" />
1818
<PackageVersion Include="Neptuo.Observables" Version="2.1.1" />
19-
<PackageVersion Include="NuGet.Packaging" Version="6.8.1" />
20-
<PackageVersion Include="NuGet.PackageManagement" Version="6.8.1" />
19+
<PackageVersion Include="NuGet.Packaging" Version="7.6.0" />
20+
<PackageVersion Include="NuGet.PackageManagement" Version="7.6.0" />
2121
<PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
2222
</ItemGroup>
2323

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# version format
2-
version: 7.0.0.{build}
2+
version: 7.1.0.{build}
33

44
matrix:
55
fast_finish: true

src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj.user

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<GitExtensionsDownloadPath>..\..\..\gitextensions.shared</GitExtensionsDownloadPath> <!-- path is relative to $(ProjectDir) -->
44
<GitExtensionsReferenceVersion>latest</GitExtensionsReferenceVersion> <!-- 'latest' or 'v3.1' (= tag from GitHub releases) or 'v3.1.0.5877' (= build number from AppVeyor)-->
5-
<GitExtensionsReferenceSource>AppVeyor</GitExtensionsReferenceSource> <!-- 'GitHub' or 'AppVeyor' -->
5+
<GitExtensionsReferenceSource>GitHub</GitExtensionsReferenceSource> <!-- 'GitHub' or 'AppVeyor' -->
66
<GitExtensionsPath>$(GitExtensionsDownloadPath)</GitExtensionsPath>
77
</PropertyGroup>
88
</Project>

src/PackageManager.NuGet/Models/NuGetPackageSourceCollection.cs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,31 @@ public void MarkAsPrimary(IPackageSource source)
6767
return;
6868

6969
if (source == null)
70-
Provider.SaveActivePackageSource(null);
70+
ClearActivePackageSource();
7171
else
7272
Provider.SaveActivePackageSource(UnWrap(source));
7373
}
7474

75+
private void ClearActivePackageSource()
76+
{
77+
if (Provider is not PackageSourceProvider concreteProvider)
78+
{
79+
return;
80+
}
81+
82+
if (concreteProvider.Settings.GetSection("activePackageSource") is not { } section)
83+
{
84+
return;
85+
}
86+
87+
foreach (SettingItem item in section.Items)
88+
{
89+
concreteProvider.Settings.Remove("activePackageSource", item);
90+
}
91+
92+
concreteProvider.Settings.SaveToDisk();
93+
}
94+
7595
internal void SavePackageSources(bool isOrderChanged = false)
7696
{
7797
// This is a workaround for change/bug in the underlaying package source provider,

0 commit comments

Comments
 (0)