diff --git a/build/Wpf.Build.targets b/build/Wpf.Build.targets deleted file mode 100644 index 6542ee3..0000000 --- a/build/Wpf.Build.targets +++ /dev/null @@ -1,52 +0,0 @@ - - - - winexe - winexe - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - True - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - True - Settings.settings - - - MSBuild:Compile - Designer - - - Designer - %(Filename) - - - MsBuild:Compile - Designer - - - - - - 4.0 - - - - - - - - - \ No newline at end of file diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj index 2069d9c..e7fd671 100644 --- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj +++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj @@ -1,7 +1,8 @@  - net461 + net5.0-windows + true NuGet-based Plugin Manager for Git Extensions GitExtensions https://github.com/gitextensions/gitextensions.pluginmanager @@ -12,12 +13,14 @@ PackageManager\PackageManager.UI.exe - ..\PackageManager.UI\bin\$(Configuration)\$(TargetFramework)\PackageManager.UI.exe + ..\PackageManager.UI\bin\Release\$(TargetFramework)\publish\PackageManager.UI.exe true - + + + @@ -34,8 +37,6 @@ $(GitExtensionsPath)\ResourceManager.dll - - diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec index 3172acd..33ddddc 100644 --- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec +++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec @@ -14,7 +14,7 @@ - - + + \ No newline at end of file diff --git a/src/GitExtensions.PluginManager/Plugin.cs b/src/GitExtensions.PluginManager/Plugin.cs index c302c92..fa53978 100644 --- a/src/GitExtensions.PluginManager/Plugin.cs +++ b/src/GitExtensions.PluginManager/Plugin.cs @@ -24,7 +24,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() { "net461", "any", "netstandard2.0" }; + public static readonly List FrameworkMonikers = new List() { "net5.0", "any", "netstandard2.0" }; internal PluginSettings Configuration { get; private set; } diff --git a/src/GitExtensions.PluginManager/PluginSettings.cs b/src/GitExtensions.PluginManager/PluginSettings.cs index 36b35af..5594bca 100644 --- a/src/GitExtensions.PluginManager/PluginSettings.cs +++ b/src/GitExtensions.PluginManager/PluginSettings.cs @@ -20,7 +20,7 @@ internal class PluginSettings : IEnumerable /// /// Gets current value of . /// - public bool CloseInstances => source.GetValue(CloseInstancesProperty.Name, CloseInstancesProperty.DefaultValue, t => bool.Parse(t)); + public bool CloseInstances => source.GetBool(CloseInstancesProperty.Name, CloseInstancesProperty.DefaultValue); public PluginSettings(ISettingsSource source) { diff --git a/src/PackageManager.Cli/FodyWeavers.xml b/src/PackageManager.Cli/FodyWeavers.xml deleted file mode 100644 index 95147e2..0000000 --- a/src/PackageManager.Cli/FodyWeavers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/PackageManager.Cli/PackageManager.Cli.csproj b/src/PackageManager.Cli/PackageManager.Cli.csproj index 0e8f809..ac8922c 100644 --- a/src/PackageManager.Cli/PackageManager.Cli.csproj +++ b/src/PackageManager.Cli/PackageManager.Cli.csproj @@ -2,7 +2,7 @@ Exe - net461 + net5.0 PackageManager latest @@ -16,9 +16,8 @@ - - + diff --git a/src/PackageManager.NuGet/Models/NuGetPackageSourceCollection.cs b/src/PackageManager.NuGet/Models/NuGetPackageSourceCollection.cs index 317e5d5..d8b3f00 100644 --- a/src/PackageManager.NuGet/Models/NuGetPackageSourceCollection.cs +++ b/src/PackageManager.NuGet/Models/NuGetPackageSourceCollection.cs @@ -36,7 +36,7 @@ protected override void DisposeManagedResources() Provider.PackageSourcesChanged -= OnProviderChanged; } - private void OnProviderChanged(object sender, EventArgs e) + private void OnProviderChanged(object sender, EventArgs e) => Changed?.Invoke(); private NuGetPackageSource EnsureType(IPackageSource source, string argumentName = null) @@ -48,7 +48,7 @@ private NuGetPackageSource EnsureType(IPackageSource source, string argumentName throw new InvalidPackageSourceImplementationException(); } - private PackageSource UnWrap(IPackageSource source, string argumentName = null) + private PackageSource UnWrap(IPackageSource source, string argumentName = null) => EnsureType(source, argumentName).Original; public IPackageSourceBuilder Add() @@ -75,8 +75,15 @@ public void MarkAsPrimary(IPackageSource source) Provider.SaveActivePackageSource(UnWrap(source)); } - internal void SavePackageSources() - => Provider.SavePackageSources(Sources.Select(s => s.Original)); + internal void SavePackageSources(bool isOrderChanged = false) + { + // This is a workaround for change/bug in the underlaying package source provider, + // which ignores changed order. So we save an empty list and than the actual. + if (isOrderChanged) + Provider.SavePackageSources(Enumerable.Empty()); + + Provider.SavePackageSources(Sources.Select(s => s.Original)); + } public int MoveUp(IPackageSource source) { @@ -86,7 +93,7 @@ public int MoveUp(IPackageSource source) { Sources.RemoveAt(index); Sources.Insert(--index, target); - SavePackageSources(); + SavePackageSources(true); } return index; diff --git a/src/PackageManager.NuGet/PackageManager.NuGet.csproj b/src/PackageManager.NuGet/PackageManager.NuGet.csproj index 8775246..d5027f3 100644 --- a/src/PackageManager.NuGet/PackageManager.NuGet.csproj +++ b/src/PackageManager.NuGet/PackageManager.NuGet.csproj @@ -1,14 +1,14 @@  - net461 + net5.0 PackageManager latest - + diff --git a/src/PackageManager.UI/App.config b/src/PackageManager.UI/App.config deleted file mode 100644 index deaa9e2..0000000 --- a/src/PackageManager.UI/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/PackageManager.UI/FodyWeavers.xml b/src/PackageManager.UI/FodyWeavers.xml deleted file mode 100644 index 95147e2..0000000 --- a/src/PackageManager.UI/FodyWeavers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/PackageManager.UI/PackageManager.UI.csproj b/src/PackageManager.UI/PackageManager.UI.csproj index 6cb2862..8eb1142 100644 --- a/src/PackageManager.UI/PackageManager.UI.csproj +++ b/src/PackageManager.UI/PackageManager.UI.csproj @@ -1,9 +1,11 @@ - + + net5.0-windows + WinExe + true PackageManager PackageManager.UI - net461 Views\Assets\box-search-result.ico PackageManager.Program @@ -13,7 +15,6 @@ - @@ -49,6 +50,4 @@ Settings.Designer.cs - - \ No newline at end of file diff --git a/src/PackageManager/PackageManager.csproj b/src/PackageManager/PackageManager.csproj index ffdf1b0..4ed56b8 100644 --- a/src/PackageManager/PackageManager.csproj +++ b/src/PackageManager/PackageManager.csproj @@ -1,7 +1,7 @@  - net461 + net5.0 latest diff --git a/test/PackageManager.NuGet.Tests/Models/TestPackageSourceCollection.cs b/test/PackageManager.NuGet.Tests/Models/TestPackageSourceCollection.cs index d23f794..367ebd8 100644 --- a/test/PackageManager.NuGet.Tests/Models/TestPackageSourceCollection.cs +++ b/test/PackageManager.NuGet.Tests/Models/TestPackageSourceCollection.cs @@ -100,7 +100,7 @@ public void Move() var sources = CreateSourceCollection(); sources.Remove(sources.All.First()); var test1 = sources.Add().Name("Test1").Uri(new Uri("http://test1")).Save(); - var test2 = sources.Add().Name("Test2").Uri(new Uri("http://test1")).Save(); + var test2 = sources.Add().Name("Test2").Uri(new Uri("http://test2")).Save(); sources = CreateSourceCollection(); test1 = sources.All.First(); diff --git a/test/PackageManager.NuGet.Tests/PackageManager.NuGet.Tests.csproj b/test/PackageManager.NuGet.Tests/PackageManager.NuGet.Tests.csproj index e844e18..99c0d9a 100644 --- a/test/PackageManager.NuGet.Tests/PackageManager.NuGet.Tests.csproj +++ b/test/PackageManager.NuGet.Tests/PackageManager.NuGet.Tests.csproj @@ -1,7 +1,7 @@  - net461 + net5.0 diff --git a/test/PackageManager.Tests/PackageManager.Tests.csproj b/test/PackageManager.Tests/PackageManager.Tests.csproj index 5d06a62..556d84c 100644 --- a/test/PackageManager.Tests/PackageManager.Tests.csproj +++ b/test/PackageManager.Tests/PackageManager.Tests.csproj @@ -1,7 +1,7 @@  - net461 + net5.0 diff --git a/tools/Prepare-Release.ps1 b/tools/Prepare-Release.ps1 index 2eb4c87..9612cde 100644 --- a/tools/Prepare-Release.ps1 +++ b/tools/Prepare-Release.ps1 @@ -12,15 +12,18 @@ If (!$isAppveyor) } dotnet restore ..\GitExtensions.PluginManager.sln - -msbuild ..\GitExtensions.PluginManager.sln /p:Configuration=Release -verbosity:minimal +dotnet publish ..\src\PackageManager.UI\PackageManager.UI.csproj -c Release -p:PublishProfile=FolderProfile +dotnet publish ..\src\GitExtensions.PluginManager\GitExtensions.PluginManager.csproj --configuration Release -verbosity:minimal if (!($LastExitCode -eq 0)) { + Pop-Location; Write-Error -Message "MSBuild failed with $LastExitCode" -ErrorAction Stop } -$packPath = Join-Path ".." $targetPath; -dotnet pack ..\src\GitExtensions.PluginManager -c Release -o $packPath --no-build +if (!(Test-Path $targetPath)) +{ + New-Item -ItemType Directory -Force -Path $targetPath +} Copy-Item ..\src\GitExtensions.PluginManager\bin\Release\GitExtensions.PluginManager.*.zip $targetPath Copy-Item ..\src\GitExtensions.PluginManager\bin\Release\GitExtensions.PluginManager.*.nupkg $targetPath diff --git a/tools/Zip-GitExtensionsPlugin.ps1 b/tools/Zip-GitExtensionsPlugin.ps1 index 1c5911a..311be89 100644 --- a/tools/Zip-GitExtensionsPlugin.ps1 +++ b/tools/Zip-GitExtensionsPlugin.ps1 @@ -17,8 +17,8 @@ $tempPmPath = Join-Path $tempPath -ChildPath "PackageManager"; New-Item -Force -ItemType Directory $tempPath | Out-Null; New-Item -Force -ItemType Directory $tempPmPath | Out-Null; -Copy-Item -Force ($sourceBasePath + "\net461\GitExtensions.PluginManager.dll") $tempPath | Out-Null; -Copy-Item -Force ($sourceBasePath + "\net461\PackageManager\PackageManager.UI.exe") $tempPmPath | Out-Null; +Copy-Item -Force ($sourceBasePath + "\net5.0-windows\GitExtensions.PluginManager.dll") $tempPath | Out-Null; +Copy-Item -Force ($sourceBasePath + "\net5.0-windows\PackageManager\PackageManager.UI.exe") $tempPmPath | Out-Null; Compress-Archive -Path ($tempPath + "\*") -DestinationPath $target -Force; Write-Host ("Created release zip at '" + $target + "'");