Skip to content

Commit efb8106

Browse files
mast-eumast-eu
committed
Merge branch 'master' into release/1.1
# Conflicts: # appveyor.yml
2 parents 73aad57 + 35e16e6 commit efb8106

File tree

12 files changed

+31
-145
lines changed

12 files changed

+31
-145
lines changed

‎LICENSE‎ renamed to ‎LICENSE.md‎

File renamed without changes.

‎appveyor.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#---------------------------------#
44

55
# version format
6-
version: 1.0.0.{build}
6+
version: 1.1.0.{build}
77

88
# version suffix, if any (e.g. '-RC1', '-beta' otherwise '')
99
environment:
@@ -12,9 +12,6 @@ environment:
1212
# Do not build on tags (GitHub and BitBucket)
1313
skip_tags: true
1414

15-
# Maximum number of concurrent jobs for the project
16-
max_jobs: 1
17-
1815
#---------------------------------#
1916
# environment configuration #
2017
#---------------------------------#

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,26 @@
1313
<PropertyGroup>
1414
<PackageManagerTargetPath>PackageManager\PackageManager.UI.exe</PackageManagerTargetPath>
1515
<PackageManagerSourcePath>..\PackageManager.UI\bin\$(Configuration)\$(TargetFramework)\PackageManager.UI.exe</PackageManagerSourcePath>
16-
<GitExtensionsDebugPluginsPath>..\..\references\GitExtensions\UserPlugins\GitExtensions.PluginManager\</GitExtensionsDebugPluginsPath>
17-
<GitExtensionsReferenceSource>appveyor</GitExtensionsReferenceSource>
18-
<GitExtensionsReferenceVersion>v3.2.0.5938</GitExtensionsReferenceVersion>
1916
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2017
</PropertyGroup>
2118

19+
<ItemGroup>
20+
<PackageReference Include="GitExtensions.Extensibility" Version="0.1.1" />
21+
</ItemGroup>
22+
2223
<ItemGroup>
2324
<Compile Include="..\PackageManager.UI\Args.cs" Link="Args.cs" />
2425
</ItemGroup>
2526

2627
<ItemGroup>
2728
<Reference Include="GitUI">
28-
<HintPath>..\..\references\GitExtensions\GitUI.dll</HintPath>
29+
<HintPath>$(GitExtensionsPath)\GitUI.dll</HintPath>
2930
</Reference>
3031
<Reference Include="GitUIPluginInterfaces">
31-
<HintPath>..\..\references\GitExtensions\GitUIPluginInterfaces.dll</HintPath>
32+
<HintPath>$(GitExtensionsPath)\GitUIPluginInterfaces.dll</HintPath>
3233
</Reference>
3334
<Reference Include="ResourceManager">
34-
<HintPath>..\..\references\GitExtensions\ResourceManager.dll</HintPath>
35+
<HintPath>$(GitExtensionsPath)\ResourceManager.dll</HintPath>
3536
</Reference>
3637
<Reference Include="System.ComponentModel.Composition" />
3738
<Reference Include="System.Windows.Forms" />
@@ -53,15 +54,9 @@
5354
</EmbeddedResource>
5455
</ItemGroup>
5556

56-
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
57-
<Exec Command="powershell.exe -ExecutionPolicy Unrestricted ..\..\tools\Download-GitExtensions.ps1 -Version $(GitExtensionsReferenceVersion) -Source $(GitExtensionsReferenceSource)" />
58-
</Target>
59-
<Target Name="CopyPackageManager" AfterTargets="ResolveReferences">
60-
<Copy SourceFiles="$(PackageManagerSourcePath)" DestinationFolder="$(TargetDir)PackageManager" />
61-
</Target>
62-
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
63-
<Copy SourceFiles="$(TargetDir)$(PackageManagerTargetPath)" DestinationFolder="$(GitExtensionsDebugPluginsPath)PackageManager" />
64-
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(GitExtensionsDebugPluginsPath)" />
57+
<Target Name="CopyPackageManager" AfterTargets="PostBuildEvent">
58+
<Copy SourceFiles="$(PackageManagerSourcePath)" DestinationFiles="$(TargetDir)$(PackageManagerTargetPath)" />
59+
<Copy SourceFiles="$(PackageManagerSourcePath)" DestinationFiles="$(GitExtensionsPluginsPath)\$(ProjectName)\$(PackageManagerTargetPath)" />
6560
</Target>
6661
<Target Name="PreClean" BeforeTargets="Clean">
6762
<Message Text="Deleting PackageManager" Importance="high" />

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<PropertyGroup>
3+
<GitExtensionsDownloadPath>..\..\..\gitextensions.shared</GitExtensionsDownloadPath> <!-- path is relative to $(ProjectDir) -->
4+
<GitExtensionsReferenceVersion>latest</GitExtensionsReferenceVersion> <!-- 'latest' or 'v3.1' (= tag from GitHub releases) or 'v3.1.0.5877' (= build number from AppVeyor)-->
5+
<GitExtensionsReferenceSource>GitHub</GitExtensionsReferenceSource> <!-- 'GitHub' or 'AppYevor' -->
6+
<GitExtensionsPath></GitExtensionsPath> <!-- for local builds (no download) -->
7+
</PropertyGroup>
8+
</Project>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
<description>$description$</description>
88
<projectUrl>$projectUrl$</projectUrl>
99
<tags>$tags$</tags>
10+
<license type="file">LICENSE.md</license>
1011
<dependencies>
11-
<dependency id="GitExtensions.Extensibility" version="[3.2.0, 3.3.0)" />
12+
<dependency id="GitExtensions.Extensibility" version="[0.1.0, 1.0.0)" />
1213
</dependencies>
1314
</metadata>
1415
<files>
16+
<file src="../../LICENSE.md" target="/" />
1517
<file src="bin/$configuration$/net461/GitExtensions.PluginManager.dll" target="lib/" />
1618
<file src="bin/$configuration$/net461/PackageManager/PackageManager.UI.exe" target="lib/PackageManager/" />
1719
</files>

‎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 Git Extensions before starting PluginManager", false);
16+
public static BoolSetting CloseInstancesProperty { get; } = new BoolSetting("CloseInstances", "Close all instances of Git Extensions before starting Plugin Manager", false);
1717

1818
private readonly ISettingsSource source;
1919

‎src/GitExtensions.PluginManager/Properties/launchSettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"profiles": {
33
"GitExtensions.PluginManager": {
44
"commandName": "Executable",
5-
"executablePath": "$(SolutionDir)\\references\\GitExtensions\\GitExtensions.exe"
5+
"executablePath": "$(GitExtensionsExecutablePath)"
66
}
77
}
88
}

‎src/PackageManager.UI/App.xaml.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected override void OnStartup(StartupEventArgs e)
5656

5757
if (!Directory.Exists(Args.Path))
5858
{
59-
Navigator.Notify("Packages", "Missing argument '--path' - a target path to install packages to.", Navigator.MessageType.Error);
59+
Navigator.Notify("Plugin Manager", "Missing argument '--path' - a target path to install packages to.", Navigator.MessageType.Error);
6060
Shutdown();
6161
return;
6262
}
@@ -104,10 +104,8 @@ protected override void OnStartup(StartupEventArgs e)
104104

105105
wnd.Show();
106106

107-
/*
108107
if (Args.IsSelfUpdate)
109108
RunSelfUpdate(wnd);
110-
*/
111109
}
112110

113111
private void BuildExceptionHandler()
@@ -194,13 +192,13 @@ private void RunSelfUpdate(MainWindow wnd)
194192
}
195193
else
196194
{
197-
Navigator.Notify("Self Update Error", $"Unnable to find update package (version {Args.SelfUpdateVersion}) for PackageManager.", Navigator.MessageType.Error);
195+
Navigator.Notify("Self Update Error", $"Unnable to find update package (version {Args.SelfUpdateVersion}) for Plugin Manager.", Navigator.MessageType.Error);
198196
}
199197
}
200198
}
201199
else
202200
{
203-
Navigator.Notify("Self Update Error", $"Unnable to find update package for PackageManager.", Navigator.MessageType.Error);
201+
Navigator.Notify("Self Update Error", $"Unnable to find update package for Plugin Manager.", Navigator.MessageType.Error);
204202
}
205203

206204
if (canUpdate)

‎src/PackageManager.UI/Views/MainWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:converters="clr-namespace:PackageManager.Views.Converters"
99
xmlns:views="clr-namespace:PackageManager.Views"
1010
mc:Ignorable="d" d:DataContext="{x:Static dd:ViewModelLocator.Main}"
11-
Title="Packages" Height="600" Width="800" Icon="{StaticResource AppIcon}" WindowStartupLocation="CenterScreen">
11+
Title="Plugin Manager" Height="600" Width="800" Icon="{StaticResource AppIcon}" WindowStartupLocation="CenterScreen">
1212
<Window.Resources>
1313
<converters:ValidUrlToTrueConverter x:Key="ValidUrlToTrueConverter" />
1414
</Window.Resources>

‎src/PackageManager.UI/Views/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private Task<bool> OnBeforeChange()
5252
if (context.IsExecutable)
5353
{
5454
bool result = navigator.Confirm(
55-
"PluginManager",
55+
"Plugin Manager",
5656
"Plugin Manager is going to write to files that are holded by other executables. " + Environment.NewLine +
5757
"Do you want to kill all instances of these applications?"
5858
);

0 commit comments

Comments
 (0)