Merge pull request #190 from gep13/UpdateChocolateyPackage

Update chocolatey package

ChocolateyPackage/GitDiffMargin/GitDiffMargin.nuspec

@@ -6,10 +6,10 @@
     <version>3.1.0</version>
     <authors>Laurent Kempé</authors>
     <owners>Laurent Kempé</owners>
-    <summary>Git Diff Margin displays live Git changes of the currently edited file on Visual Studio margin and scroll bar. Supports Visual Studio 2010 through Visual Studio 2015.</summary>
+    <summary>Git Diff Margin displays live Git changes of the currently edited file on Visual Studio margin and scroll bar. Supports Visual Studio 2012 through Visual Studio 2019 Preview.</summary>
     <description>Git Diff Margin displays live Git changes of the currently edited file on Visual Studio margin and scroll bar.
-	
-* Supports Visual Studio 2010 through Visual Studio 2015
+
+* Supports Visual Studio 2012 through Visual Studio 2019 Preview
 * Quickly view all current file changes on
 * Left margin
 * Scroll Bars in map and bar mode with and without source overview
@@ -27,9 +27,12 @@
   </description>
   <releaseNotes></releaseNotes>
     <projectUrl>https://github.com/laurentkempe/GitDiffMargin</projectUrl>
-    <tags>git visualstudio vs vs2010 vs2012 vs2013 vs2015 2010 2012 2013 2015</tags>
+    <tags>git visualstudio vs vs2010 vs2012 vs2013 vs2015 2010 2012 2013 2015 2017 2019</tags>
     <licenseUrl>https://raw.githubusercontent.com/laurentkempe/GitDiffMargin/master/LICENSE.md</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <iconUrl>https://raw.githubusercontent.com/laurentkempe/GitDiffMargin/master/GitDiffMargin/Resources/GitDiffMargin-Thumb.png</iconUrl>
+    <dependencies>
+      <dependency id="chocolatey-visualstudio.extension" version="1.6.0" />
+    </dependencies>
   </metadata>
-</package>
+</package>

ChocolateyPackage/GitDiffMargin/tools/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2012-2016 Laurent Kempé
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

ChocolateyPackage/GitDiffMargin/tools/VERIFICATION.txt

@@ -0,0 +1,6 @@
+
+VERIFICATION
+Verification is intended to assist the Chocolatey moderators and community
+in verifying that this package's contents are trustworthy.
+
+This package is published by the GitDiffMArgin Project itself.

ChocolateyPackage/GitDiffMargin/tools/chocolateyInstall.ps1

@@ -1,15 +1,14 @@
-try {
-  $package = 'GitDiffMargin'
+$ErrorActionPreference = 'Stop';
 
-  $params = @{
-    PackageName = $package;
-    VsixUrl = 'https://visualstudiogallery.msdn.microsoft.com/cf49cf30-2ca6-4ea0-b7cc-6a8e0dadc1a8/file/101267/12/GitDiffMargin.vsix';
-  }
+$toolsPath = Split-Path $MyInvocation.MyCommand.Definition
+$filePath = "$toolsPath\GitDiffMargin.vsix"
 
-  Install-ChocolateyVsixPackage @params
+$package = 'GitDiffMargin'
+$vsixUrl = "file://" + $filePath.Replace("\", "/")
 
-  Write-ChocolateySuccess $package
-} catch {
-  Write-ChocolateyFailure $package "$($_.Exception.Message)"
-  throw
+$params = @{
+    PackageName = $package;
+    VsixUrl     = $vsixUrl;
 }
+
+Install-VisualStudioVsixExtension @params

azure-pipelines.yml

@@ -52,6 +52,20 @@ steps:
     targetFolder: '$(Build.ArtifactStagingDirectory)'
     flattenFolders: true
 
+- task: CopyFiles@2
+  displayName: 'Copy Vsix to Chocolatey'
+  inputs: 
+    contents: '**\?(*.vsix)'
+    targetFolder: '$(Build.Repository.LocalPath)/ChocolateyPackage/GitDiffMargin/tools/'
+    flattenFolders: true
+
+- task: gep13.chocolatey-azuredevops.chocolatey-azuredevops.ChocolateyCommand@0
+  displayName: 'Chocolatey pack'
+  inputs:
+    packWorkingDirectory: '$(Build.Repository.LocalPath)/ChocolateyPackage/GitDiffMargin/'
+    packNuspecFileName: GitDiffMargin.nuspec
+    packVersion: '$(Build.BuildNumber)'
+
 #- task: PowerShell@2
 #  displayName: 'Rename Build Artifacts'
 #  inputs: