Merge pull request #112 from laurentkempe/libgit2sharpv0.23.1

Libgit2sharpv0.23.1
laurentkempe · Jan 11, 2017 · f7b05e9 · f7b05e9
2 parents e46eb10 + f7c9783
commit f7b05e9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/GitDiffMargin/GitDiffMargin.csproj b/GitDiffMargin/GitDiffMargin.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.163\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.163\build\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -99,9 +99,8 @@
       <HintPath>..\packages\MvvmLightLibs.5.2.0.0\lib\net40\GalaSoft.MvvmLight.Extras.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibGit2Sharp.0.23.0\lib\net40\LibGit2Sharp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="LibGit2Sharp, Version=0.23.1.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -246,8 +245,8 @@
     <Compile Include="Core\WeakReference.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\packages\LibGit2Sharp.NativeBinaries.1.0.163\runtimes\win7-x86\native\git2-75db289.dll">
-      <Link>git2-75db289.dll</Link>
+    <Content Include="..\packages\LibGit2Sharp.NativeBinaries.1.0.164\runtimes\win7-x86\native\git2-a5cf255.dll">
+      <Link>git2-a5cf255.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
@@ -314,7 +313,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.163\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.163\build\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/GitDiffMargin/Properties/AssemblyInfo.cs b/GitDiffMargin/Properties/AssemblyInfo.cs
@@ -31,9 +31,9 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.1.0")]
-[assembly: AssemblyFileVersion("3.2.1.0")]
-[assembly: AssemblyInformationalVersion("3.2.1.0")]
+[assembly: AssemblyVersion("3.2.2.0")]
+[assembly: AssemblyFileVersion("3.2.2.0")]
+[assembly: AssemblyInformationalVersion("3.2.2.0")]
 
 #if true // Use this block if Visual Studio 2010 still needs to be supported
 [assembly: Guid("c279cada-3e46-4971-9355-50f43053d1b3")]

diff --git a/GitDiffMargin/packages.config b/GitDiffMargin/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.3" targetFramework="net40" />
-  <package id="LibGit2Sharp" version="0.23.0" targetFramework="net40" />
-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.163" targetFramework="net40" />
+  <package id="LibGit2Sharp" version="0.23.1" targetFramework="net40" />
+  <package id="LibGit2Sharp.NativeBinaries" version="1.0.164" targetFramework="net40" />
   <package id="MvvmLightLibs" version="5.2.0.0" targetFramework="net40" />
   <package id="Tvl.VisualStudio.Shell.Utility.10" version="1.0.0" targetFramework="net40" />
   <package id="Tvl.VisualStudio.Text.Utility.10" version="1.0.0" targetFramework="net40" />

diff --git a/GitDiffMargin/source.extension.vsixmanifest b/GitDiffMargin/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="GitDiffMargin..5ef9f816-d9ce-45cd-a8fa-cd67a807df0e">
     <Name>Git Diff Margin</Name>
     <Author>Laurent Kempé</Author>
-    <Version>3.2.1.0</Version>
+    <Version>3.2.2.0</Version>
     <Description xml:space="preserve">Git Diff Margin displays live changes of the currently edited file on Visual Studio 2010+ margin and scroll bar.</Description>
     <MoreInfoUrl>https://github.com/laurentkempe/GitDiffMargin</MoreInfoUrl>
     <GettingStartedGuide>http://visualstudiogallery.msdn.microsoft.com/cf49cf30-2ca6-4ea0-b7cc-6a8e0dadc1a8</GettingStartedGuide>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: '3.2.1.{build}'
+version: '3.2.2.{build}'
 
 image: Visual Studio 2015