Merge branch 'master' into release/0.1

# Conflicts:
#	appveyor.yml

Author: mast-eu

appveyor.yml

@@ -3,14 +3,11 @@
 #---------------------------------#
 
 # version format
-version: 0.1.0.{build}
+version: 0.1.1.{build}
 
 # Do not build on tags (GitHub and BitBucket)
 skip_tags: true
 
-# Maximum number of concurrent jobs for the project
-max_jobs: 1
-
 #---------------------------------#
 #      environment configuration  #
 #---------------------------------#
@@ -29,4 +26,4 @@ build_script:
 #      artifacts                  #
 #---------------------------------#
 artifacts:
-- path: .\*.nupkg
+- path: .\GitExtensions.Extensibility.*.nupkg

src/GitExtensions.Extensibility/GitExtensions.Extensibility.nuspec

@@ -9,7 +9,6 @@
   </metadata>
   <files>
     <file src="lib/net461/_._" target="lib/net461/_._" />
-    <file src="build/net461/GitExtensions.Extensibility.props" target="build/net461/GitExtensions.Extensibility.props" />
     <file src="build/net461/GitExtensions.Extensibility.targets" target="build/net461/GitExtensions.Extensibility.targets" />
 
     <file src="../../LICENSE.md" target="LICENSE.md" />

src/GitExtensions.Extensibility/build/net461/GitExtensions.Extensibility.props

@@ -1,24 +1,37 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <!-- The following properties may be overwritten by plugins. In case they are not defined, they assume default values. -->
+    <PropertyGroup>
+        <GitExtensionsDownloadPath Condition="$(GitExtensionsDownloadPath) == ''">..\..\gitextensions.shared</GitExtensionsDownloadPath> <!-- path is relative to $(ProjectDir) -->
+        <GitExtensionsReferenceVersion Condition="$(GitExtensionsReferenceVersion) == ''">latest</GitExtensionsReferenceVersion> <!-- 'latest' or 'v3.1' (= tag from GitHub releases) or 'v3.1.0.5877' (= build number from AppVeyor)-->
+        <GitExtensionsReferenceSource Condition="$(GitExtensionsReferenceSource) == ''">GitHub</GitExtensionsReferenceSource> <!-- 'GitHub' or 'AppYevor' -->
+        <GitExtensionsPath Condition="$(GitExtensionsPath) == ''">$([System.IO.Path]::Combine('$(ProjectDir)', '$(GitExtensionsDownloadPath)', 'GitExtensions'))</GitExtensionsPath> <!-- for local builds (no download) -->
+    </PropertyGroup>
+
+    <!-- The following properties are derived from the above ones. All of them necessitate absolute paths. -->
+    <!-- Plugins are supposed to consume them "read-only". -->
     <PropertyGroup>
-        <!-- It's required to pass absolute paths to the PS1 script, otherwise it's based wrong. -->
         <_GitExtensionsDownloadPath>$([System.IO.Path]::Combine('$(ProjectDir)', '$(GitExtensionsDownloadPath)'))</_GitExtensionsDownloadPath>
         <_GitExtensionsDownloadScriptPath>$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', '..\..\tools\Download-GitExtensions.ps1'))</_GitExtensionsDownloadScriptPath>
-        <!-- It's required to pass absolute paths as launch profile don't like relative ones. -->
-        <GitExtensionsPath Condition="$(GitExtensionsPath) == ''">$([System.IO.Path]::Combine('$(ProjectDir)', '$(GitExtensionsDownloadPath)\GitExtensions'))</GitExtensionsPath>
-        <GitExtensionsPluginsPath>$(GitExtensionsPath)\Plugins</GitExtensionsPluginsPath>
+        <GitExtensionsPluginsPath>$([System.IO.Path]::Combine('$(GitExtensionsPath)', 'UserPlugins'))</GitExtensionsPluginsPath>
         <GitExtensionsExecutablePath>$([System.IO.Path]::Combine('$(GitExtensionsPath)', 'GitExtensions.exe'))</GitExtensionsExecutablePath>
-        <GitExtensionsReferenceSource Condition="$(GitExtensionsReferenceSource) == ''">GitHub</GitExtensionsReferenceSource>
-        <GitExtensionsReferenceVersion Condition="$(GitExtensionsReferenceVersion) == ''">latest</GitExtensionsReferenceVersion>
     </PropertyGroup>
 
+    <!-- The postbuild event is available in VS projects referencing "GitExtensions.Extensibility". -->
+    <!-- It copies your locally build binaries to $(GitExtensionsPluginsPath)/$(ProjectName) for testing and debugging.-->
     <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+        <Message Text="Executing postbuild event provided by GitExtensions.Extensibility" />
         <MakeDir Directories="$(GitExtensionsPluginsPath)" />
-        <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(GitExtensionsPluginsPath)" />
+        <Copy SourceFiles="$(TargetPath)" DestinationFolder="$([System.IO.Path]::Combine('$(GitExtensionsPluginsPath)', '$(ProjectName)'))" />
+        <Message Text="Completed postbuild event provided by GitExtensions.Extensibility" />
     </Target>
 
+    <!-- The prebuild event is available in VS projects referencing "GitExtensions.Extensibility". -->
+    <!-- It downloads $(GitExtensionsReferenceVersion) from $(GitExtensionsReferenceSource) and extracts it to $(GitExtensionsPath) -->
     <Target Name="PreBuild" BeforeTargets="$(BuildDependsOn)">
+        <Message Text="Executing prebuild event provided by GitExtensions.Extensibility" />
         <MakeDir Directories="$(_GitExtensionsDownloadPath)" />
         <Error Condition="!Exists($(GitExtensionsExecutablePath)) and !Exists($(_GitExtensionsDownloadScriptPath))" Text="Path to Git Extensions portable download script is wrong. Current value '$(_GitExtensionsDownloadScriptPath)'." />
         <Exec Condition="!Exists($(GitExtensionsExecutablePath))" Command="powershell.exe -ExecutionPolicy Unrestricted $(_GitExtensionsDownloadScriptPath) -ExtractRootPath $(_GitExtensionsDownloadPath) -Version $(GitExtensionsReferenceVersion) -Source $(GitExtensionsReferenceSource)" />
+        <Message Text="Completed prebuild event provided by GitExtensions.Extensibility" />
     </Target>
-</Project>
+</Project>

src/GitExtensions.Extensibility/build/net461/GitExtensions.Extensibility.targets

@@ -85,7 +85,7 @@ function Find-ArchiveUrlFromGitHub
     {
         foreach ($Asset in $SelectedRelease.assets)
         {
-            if ($Asset.content_type -eq "application/zip" -and $Asset.name.Contains('Portable'))
+            if ($Asset.name.Contains('Portable') -and $Asset.name.EndsWith('.zip'))
             {
                 Write-Host "Selected asset '$($Asset.name)'.";
                 return $Version,$Asset.browser_download_url;