Skip to content

Commit 9ca83a6

Browse files
marafmaraf
committed
Integration of CI build on AppVeyor.
Fix project URL and tags in nuget package. Publish GE.PM.nuget as AppVeyor artifact. Publish GE.PM.zip as AppVeyor artifact. Integrates SignPath hook on AppVeyor deploy. Review correct "Git Extensions" naming. Change dependency from GitExtensions.Plugins to GitExtensions.Extensibility.
1 parent 5aeb87f commit 9ca83a6

File tree

13 files changed

+48
-42
lines changed

13 files changed

+48
-42
lines changed

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GitExtensions.PluginManager
2-
NuGet based plugin manager for GitExtensions
2+
NuGet based plugin manager for Git Extensions
33

44
![Preview](/assets/screenshot-search.png)
55

@@ -11,20 +11,20 @@ Nightly builds of PluginManager available at Appveyor - https://ci.appveyor.com/
1111
[![Build status](https://ci.appveyor.com/api/projects/status/k3y0frp1pgsyepwh?svg=true)](https://ci.appveyor.com/project/neptuo/gitextensions-pluginmanager)
1212

1313
### Browsing for packages
14-
PluginManager integrated into GitExtensions filters packages with dependency on `GitExtensions.Plugins`. This package is right now a kind of meta package and it is used to mark nuget packages intended as GitExtensions plugins.
14+
PluginManager integrated into Git Extensions filters packages with dependency on `GitExtensions.Extensibility`. This package is right now a kind of meta package and it is used to mark nuget packages intended as Git Extensions plugins.
1515

1616
We are heading to use the official nuget.org feed to distribute plugin packages, but there is a bug (#67) which prevents us from using it.
1717
Right now it is recommended to use https://www.myget.org/F/neptuo-gitextensions/api/v2.
1818

1919
### Command line arguments
20-
PluginManager is designed to be a reusable tool to manage plugins distributed as nuget packages. This repository contains an integration package for GitExtensins.
20+
PluginManager is designed to be a reusable tool to manage plugins distributed as nuget packages. This repository contains an integration package for Git Extensins.
2121
As a standalone application, PluginManager supports these command line arguments:
2222

2323
- `--path` (required) - A root path to a directory where to install packages.
2424
- `--selfpackageid` (optional) - A package id to indicate which package should be treated as a package for self update.
25-
- `--dependencies` (optional) - A comma separated list of package ids and versions that are required in package to be compatible (Eg. `GitExtensions.Plugins-v3.0,TestA,TestB-v1`).
25+
- `--dependencies` (optional) - A comma separated list of package ids and versions that are required in package to be compatible (Eg. `GitExtensions.Extensibility-v3.0,TestA,TestB-v1`).
2626
- `--monikers` (optional) - A comma separated list of .NET framework monikers to filter package content during extraction (Eg. `net461,netstandard2.0`).
27-
- `--processnamestokillbeforechange` - A comma separated list of process names to be killed before any changes being processed (it is used to kill all instances on GitExtensions before installing/uninstalling dlls, that might be locked).
27+
- `--processnamestokillbeforechange` - A comma separated list of process names to be killed before any changes being processed (it is used to kill all instances on Git Extensions before installing/uninstalling dlls, that might be locked).
2828

2929
### Icons
3030

‎appveyor.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
version: '{build}'
2+
3+
image: Visual Studio 2017
4+
5+
build_script:
6+
- ps: .\tools\Prepare-Release.ps1
7+
8+
test_script:
9+
- ps: .\tools\Run-Tests.ps1
10+
11+
artifacts:
12+
- path: .\*.zip
13+
- path: .\*.nupkg
14+
15+
# Commented out as we need to create a new signing policy.
16+
# deploy:
17+
# - provider: Webhook
18+
# on:
19+
# ARTIFACT_SIGNING_ENABLED: true
20+
# url: https://app.signpath.io/API/v1/7c19b2cf-90f7-4d15-9b12-1b615f7c18c4/Integrations/AppVeyor?SigningPolicyId=5c9879c7-0dea-4303-8e5b-fc4192a7b0de
21+
# on_build_success: true
22+
# on_build_failure: false
23+
# on_build_status_changed: false
24+
# method: POST
25+
# authorization:
26+
# secure: RdmJQ3LAsGIbtqbxlcn7wF8ESTbPSDiR0Fmyt11mDl+avSDd0HKexHA+sWQA3cN1K8aVnKTzvjGTQS8DSDmLzQ==

‎src/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

33
<PropertyGroup>
4-
<Authors>GitExtensions</Authors>
5-
<Company>GitExtensions</Company>
4+
<Authors>Git Extensions</Authors>
5+
<Company>Git Extensions</Company>
66
<RepositoryUrl>https://github.com/gitextensions/gitextensions.pluginmanager</RepositoryUrl>
77
<LangVersion>latest</LangVersion>
88

‎src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
<PropertyGroup>
44
<TargetFramework>net461</TargetFramework>
5-
<Description>NuGet-based Plugin Manager for GitExtensions</Description>
6-
<PackageTags>Neptuo GitExtensions</PackageTags>
7-
<PackageProjectUrl>http://www.neptuo.com/project/dev/gitextensions.pluginmanager</PackageProjectUrl>
5+
<Description>NuGet-based Plugin Manager for Git Extensions</Description>
6+
<PackageTags>GitExtensions</PackageTags>
7+
<PackageProjectUrl>https://github.com/gitextensions/gitextensions.pluginmanager</PackageProjectUrl>
88
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
99
<NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
1010
<NoWarn>1701;1702;NU5100</NoWarn>
1111
</PropertyGroup>
1212

1313
<PropertyGroup>
1414
<PackageManagerTargetPath>PackageManager\PackageManager.UI.exe</PackageManagerTargetPath>
15-
<PackageManagerSourcePath>$(SolutionDir)src\PackageManager.UI\bin\$(Configuration)\$(TargetFramework)\PackageManager.UI.exe</PackageManagerSourcePath>
15+
<PackageManagerSourcePath>..\PackageManager.UI\bin\$(Configuration)\$(TargetFramework)\PackageManager.UI.exe</PackageManagerSourcePath>
1616
<GitExtensionsDebugPluginsPath>..\..\references\GitExtensions\UserPlugins\</GitExtensionsDebugPluginsPath>
1717
<GitExtensionsReferenceSource>appveyor</GitExtensionsReferenceSource>
1818
<GitExtensionsReferenceVersion>v3.2.0.5938</GitExtensionsReferenceVersion>
@@ -53,9 +53,11 @@
5353
</ItemGroup>
5454

5555
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
56-
<Copy SourceFiles="$(PackageManagerSourcePath)" DestinationFolder="$(TargetDir)PackageManager" />
5756
<Exec Command="powershell.exe -ExecutionPolicy Unrestricted ..\..\tools\Download-GitExtensions.ps1 -Version $(GitExtensionsReferenceVersion) -Source $(GitExtensionsReferenceSource)" />
5857
</Target>
58+
<Target Name="CopyPackageManager" AfterTargets="ResolveReferences">
59+
<Copy SourceFiles="$(PackageManagerSourcePath)" DestinationFolder="$(TargetDir)PackageManager" />
60+
</Target>
5961
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
6062
<Copy SourceFiles="$(TargetDir)$(PackageManagerTargetPath)" DestinationFolder="$(GitExtensionsDebugPluginsPath)PackageManager" />
6163
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(GitExtensionsDebugPluginsPath)" />

‎src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<projectUrl>$projectUrl$</projectUrl>
99
<tags>$tags$</tags>
1010
<dependencies>
11-
<dependency id="GitExtensions.Plugins" version="[3.2.0, 3.3.0)" />
11+
<dependency id="GitExtensions.Extensibility" version="[3.2.0, 3.3.0)" />
1212
</dependencies>
1313
</metadata>
1414
<files>

‎src/GitExtensions.PluginManager/Plugin.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
namespace GitExtensions.PluginManager
1717
{
1818
/// <summary>
19-
/// GitExtensions plugin for backuping using bundles.
19+
/// A Git Extensions plugin for integrating PackageManager.
2020
/// </summary>
2121
[Export(typeof(IGitPlugin))]
2222
public class Plugin : GitPluginBase
@@ -51,7 +51,7 @@ public override bool Execute(GitUIEventArgs gitUiCommands)
5151

5252
Args args = new Args();
5353
args.Path = pluginsPath;
54-
args.Dependencies = new List<Args.Dependency>() { new Args.Dependency("GitExtensions.Plugins") };
54+
args.Dependencies = new List<Args.Dependency>() { new Args.Dependency("GitExtensions.Extensibility") };
5555
args.Monikers = FrameworkMonikers;
5656
args.SelfPackageId = PackageId;
5757
args.ProcessNamesToKillBeforeChange = new[] { Process.GetCurrentProcess().ProcessName };

‎src/GitExtensions.PluginManager/PluginSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ internal class PluginSettings : IEnumerable<ISetting>
1313
/// <summary>
1414
/// Gets a property holding if asking to close git extensions is required.
1515
/// </summary>
16-
public static BoolSetting CloseInstancesProperty { get; } = new BoolSetting("CloseInstances", "Close all instances of GitExtensions before starting PluginManager", false);
16+
public static BoolSetting CloseInstancesProperty { get; } = new BoolSetting("CloseInstances", "Close all instances of Git Extensions before starting PluginManager", false);
1717

1818
private readonly ISettingsSource source;
1919

‎src/PackageManager.UI/PackageManager.UI.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,4 @@
5050
</ItemGroup>
5151

5252
<Import Project="$(MSBuildProjectDirectory)\..\..\build\Wpf.Build.targets" />
53-
54-
<Target Name="Zip" AfterTargets="Pack">
55-
<Exec Command="powershell $(MSBuildProjectDirectory)\..\..\tools\Zip-PackageManager.ps1 -Version $(PackageVersion) -Configuration $(Configuration)" />
56-
</Target>
5753
</Project>

‎test/PackageManager.NuGet.Tests/Services/InstallService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static IInstallService Create(string extractPath)
3030
var packageFilter = new DependencyNuGetPackageFilter(
3131
new List<Args.Dependency>()
3232
{
33-
new Args.Dependency("GitExtensions.Plugins", null)
33+
new Args.Dependency("GitExtensions.Extensibility", null)
3434
},
3535
frameworks
3636
);

‎test/PackageManager.NuGet.Tests/Services/SearchService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static (ISearchService search, IPackageSourceCollection sources) Create(s
3030
var packageFilter = new DependencyNuGetPackageFilter(
3131
new List<Args.Dependency>()
3232
{
33-
new Args.Dependency("GitExtensions.Plugins", null)
33+
new Args.Dependency("GitExtensions.Extensibility", null)
3434
},
3535
frameworks
3636
);
@@ -45,7 +45,7 @@ public static (ISearchService search, IPackageSourceCollection sources) Create(s
4545
frameworkFilter
4646
),
4747
new DependencyNuGetPackageFilter(
48-
new List<Args.Dependency>() { new Args.Dependency("GitExtensions.Plugins", null) },
48+
new List<Args.Dependency>() { new Args.Dependency("GitExtensions.Extensibility", null) },
4949
frameworks
5050
),
5151
new NuGetFrameworkFilter(frameworks)

0 commit comments

Comments
 (0)