Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade LibGit2Sharp from v0.23 to v0.24 #1248

Closed
wants to merge 3 commits into from

Conversation

asbjornu
Copy link
Member

This PR upgrades LibGit2Sharp from version 0.23 to version 0.24 and LibGit2Sharp.NativeBinaries from version 1.0.160 to version 1.0.185.

@asbjornu
Copy link
Member Author

Hm. Looks like this wasn't an as straight-forward upgrade as I had hoped. Need to investigate why so many tests are failing with 1 exit codes. 😕

@ghost
Copy link

ghost commented Sep 18, 2017

Hi @asbjornu, are you still working to fix this PR?

Thanks

@asbjornu asbjornu force-pushed the feature/libgit2sharp0.24 branch 2 times, most recently from 606968a to 727ad87 Compare September 18, 2017 13:29
@asbjornu
Copy link
Member Author

@LoeLobo: Rebased on latest master now, so let's see how the tests go.

@asbjornu asbjornu force-pushed the feature/libgit2sharp0.24 branch from d275e14 to 59c3aa2 Compare September 22, 2017 12:22
@asbjornu
Copy link
Member Author

Seems like the problem is still prevalent in v0.25-preview0033 of LibGit2Sharp. 😞

@Ivan-L
Copy link

Ivan-L commented May 18, 2018

Do you think using v0.25 (released March 2018) might yield better results?

@nlowe
Copy link

nlowe commented May 30, 2018

Upgrading libgit2sharp, GitTools.Core, and GitTools.Testing to the latest version across the solution made the tests pass locally for me in visual studio. Note that this required going to 4.6.1 since libgit2sharp version 0.25.2 targets netstandard2.0. There appears to be a problem with libgit2sharp targets and 4.6.1 where I get an MSB4041 error when building via the cake script.

Upgrading just GitTools.Core and GitTools.Testing also seems to work (requires the .Tests projects to go to 4.5.2 for GitTools.Testing update):

Diff
diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
index b2ac1b60..58d05e8e 100644
--- a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
+++ b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GitVersionCore.Tests</RootNamespace>
     <AssemblyName>GitVersionCore.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <LangVersion>6</LangVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -42,18 +42,20 @@
       <HintPath>..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="GitTools.Core, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.2.1-beta0001\lib\net45\GitTools.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GitTools.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.3.1\lib\net45\GitTools.Core.dll</HintPath>
     </Reference>
-    <Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Testing.1.1.1-beta0001\lib\net4\GitTools.Testing.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GitTools.Testing, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Testing.1.2.0\lib\net452\GitTools.Testing.dll</HintPath>
+    </Reference>
+    <Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="LibGit2Sharp, Version=0.25.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
       <HintPath>..\packages\LibGit2Sharp.0.25.0-preview-0033\lib\net40\LibGit2Sharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
       <HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
       <Private>True</Private>
@@ -68,6 +70,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/src/GitVersionCore.Tests/app.config b/src/GitVersionCore.Tests/app.config
index da441cca..5b4177b4 100644
--- a/src/GitVersionCore.Tests/app.config
+++ b/src/GitVersionCore.Tests/app.config
@@ -12,4 +12,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
diff --git a/src/GitVersionCore.Tests/packages.config b/src/GitVersionCore.Tests/packages.config
index a72f89db..868be80e 100644
--- a/src/GitVersionCore.Tests/packages.config
+++ b/src/GitVersionCore.Tests/packages.config
@@ -2,15 +2,19 @@
 <packages>
   <package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
   <package id="Fody" version="2.0.8" targetFramework="net45" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net45" />
-  <package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
+  <package id="GitTools.Core" version="1.3.1" targetFramework="net452" />
+  <package id="GitTools.Testing" version="1.2.0" targetFramework="net452" />
+  <package id="JetBrains.Annotations" version="10.4.0" targetFramework="net452" />
   <package id="LibGit2Sharp" version="0.25.0-preview-0033" targetFramework="net45" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net45" />
+  <package id="Microsoft.CSharp" version="4.3.0" targetFramework="net452" />
   <package id="ModuleInit.Fody" version="1.6.0" targetFramework="net45" developmentDependency="true" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
   <package id="NUnit" version="3.6.0" targetFramework="net45" />
   <package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net45" />
   <package id="Shouldly" version="2.7.0" targetFramework="net45" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net452" />
+  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net452" />
   <package id="TestStack.ConventionTests" version="3.0.0" targetFramework="net45" />
   <package id="YamlDotNet" version="3.8.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
index 8c9325c6..73390242 100644
--- a/src/GitVersionCore/GitVersionCore.csproj
+++ b/src/GitVersionCore/GitVersionCore.csproj
@@ -39,9 +39,11 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GitTools.Core, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.2.1-beta0001\lib\net4\GitTools.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GitTools.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.3.1\lib\net40\GitTools.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="LibGit2Sharp, Version=0.25.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
       <HintPath>..\packages\LibGit2Sharp.0.25.0-preview-0033\lib\net40\LibGit2Sharp.dll</HintPath>
diff --git a/src/GitVersionCore/packages.config b/src/GitVersionCore/packages.config
index 54f04535..72e2717e 100644
--- a/src/GitVersionCore/packages.config
+++ b/src/GitVersionCore/packages.config
@@ -2,7 +2,8 @@
 <packages>
   <package id="Caseless.Fody" version="1.5.0" targetFramework="net40" developmentDependency="true" />
   <package id="Fody" version="2.0.8" targetFramework="net40" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net40" />
+  <package id="GitTools.Core" version="1.3.1" targetFramework="net40" />
+  <package id="JetBrains.Annotations" version="10.4.0" targetFramework="net40" />
   <package id="LibGit2Sharp" version="0.25.0-preview-0033" targetFramework="net40" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net40" />
   <package id="PepitaPackage" version="1.21.4" targetFramework="net4" developmentDependency="true" />
diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
index 65d79ebb..ff18baf0 100644
--- a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
+++ b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
@@ -10,11 +10,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GitVersionExe.Tests</RootNamespace>
     <AssemblyName>GitVersionExe.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <LangVersion>6</LangVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -35,13 +36,14 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GitTools.Core, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.2.1-beta0001\lib\net45\GitTools.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GitTools.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.3.1\lib\net45\GitTools.Core.dll</HintPath>
     </Reference>
-    <Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Testing.1.1.1-beta0001\lib\net4\GitTools.Testing.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GitTools.Testing, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Testing.1.2.0\lib\net452\GitTools.Testing.dll</HintPath>
+    </Reference>
+    <Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="LibGit2Sharp, Version=0.25.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
       <HintPath>..\packages\LibGit2Sharp.0.25.0-preview-0033\lib\net40\LibGit2Sharp.dll</HintPath>
@@ -77,6 +79,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/src/GitVersionExe.Tests/app.config b/src/GitVersionExe.Tests/app.config
index da441cca..2f21c15a 100644
--- a/src/GitVersionExe.Tests/app.config
+++ b/src/GitVersionExe.Tests/app.config
@@ -1,15 +1,15 @@
-???<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
+        <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="LibGit2Sharp" publicKeyToken="7cbde695407f0333" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.25.0.0" newVersion="0.25.0.0" />
+        <assemblyIdentity name="LibGit2Sharp" publicKeyToken="7cbde695407f0333" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-0.25.0.0" newVersion="0.25.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/src/GitVersionExe.Tests/packages.config b/src/GitVersionExe.Tests/packages.config
index fb51994c..5493660b 100644
--- a/src/GitVersionExe.Tests/packages.config
+++ b/src/GitVersionExe.Tests/packages.config
@@ -1,12 +1,16 @@
 ???<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net45" />
-  <package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
+  <package id="GitTools.Core" version="1.3.1" targetFramework="net452" />
+  <package id="GitTools.Testing" version="1.2.0" targetFramework="net452" />
+  <package id="JetBrains.Annotations" version="10.4.0" targetFramework="net452" />
   <package id="LibGit2Sharp" version="0.25.0-preview-0033" targetFramework="net45" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net45" />
+  <package id="Microsoft.CSharp" version="4.3.0" targetFramework="net452" />
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
   <package id="NUnit" version="3.6.0" targetFramework="net45" />
   <package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net45" />
   <package id="Shouldly" version="2.7.0" targetFramework="net45" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net452" />
+  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
index c43e0ea3..780c8048 100644
--- a/src/GitVersionExe/GitVersionExe.csproj
+++ b/src/GitVersionExe/GitVersionExe.csproj
@@ -41,17 +41,22 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GitTools.Core, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.2.1-beta0001\lib\net4\GitTools.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GitTools.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.3.1\lib\net40\GitTools.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="LibGit2Sharp, Version=0.25.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
       <HintPath>..\packages\LibGit2Sharp.0.25.0-preview-0033\lib\net40\LibGit2Sharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
diff --git a/src/GitVersionExe/packages.config b/src/GitVersionExe/packages.config
index 37957815..67b43829 100644
--- a/src/GitVersionExe/packages.config
+++ b/src/GitVersionExe/packages.config
@@ -2,8 +2,9 @@
 <packages>
   <package id="Caseless.Fody" version="1.5.0" targetFramework="net40" developmentDependency="true" />
   <package id="Fody" version="2.0.8" targetFramework="net40" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net40" />
+  <package id="GitTools.Core" version="1.3.1" targetFramework="net40" />
   <package id="ILRepack" version="2.0.13" targetFramework="net40" />
+  <package id="JetBrains.Annotations" version="10.4.0" targetFramework="net40" />
   <package id="LibGit2Sharp" version="0.25.0-preview-0033" targetFramework="net40" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net40" />
   <package id="PepitaPackage" version="1.21.4" targetFramework="net4" developmentDependency="true" />
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
index 2fe6f2fb..6bd9c270 100644
--- a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
+++ b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -1,5 +1,5 @@
 ???<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GitVersionTask.Tests</RootNamespace>
     <AssemblyName>GitVersionTask.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <LangVersion>6</LangVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -44,9 +44,11 @@
       <HintPath>..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="GitTools.Core, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.2.1-beta0001\lib\net45\GitTools.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GitTools.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.3.1\lib\net45\GitTools.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="LibGit2Sharp, Version=0.25.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
       <HintPath>..\packages\LibGit2Sharp.0.25.0-preview-0033\lib\net40\LibGit2Sharp.dll</HintPath>
@@ -70,6 +72,7 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
diff --git a/src/GitVersionTask.Tests/app.config b/src/GitVersionTask.Tests/app.config
index 0dad977e..487756fc 100644
--- a/src/GitVersionTask.Tests/app.config
+++ b/src/GitVersionTask.Tests/app.config
@@ -20,4 +20,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
diff --git a/src/GitVersionTask.Tests/packages.config b/src/GitVersionTask.Tests/packages.config
index a94306d9..b01d7b95 100644
--- a/src/GitVersionTask.Tests/packages.config
+++ b/src/GitVersionTask.Tests/packages.config
@@ -2,16 +2,20 @@
 <packages>
   <package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
   <package id="Fody" version="2.0.8" targetFramework="net45" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net45" />
+  <package id="GitTools.Core" version="1.3.1" targetFramework="net452" />
+  <package id="JetBrains.Annotations" version="10.4.0" targetFramework="net452" />
   <package id="LibGit2Sharp" version="0.25.0-preview-0033" targetFramework="net45" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.VisualBasic" version="1.3.2" targetFramework="net45" />
+  <package id="Microsoft.CSharp" version="4.3.0" targetFramework="net452" />
   <package id="ModuleInit.Fody" version="1.6.0" targetFramework="net45" developmentDependency="true" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
   <package id="NUnit" version="3.6.0" targetFramework="net45" />
   <package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net45" />
   <package id="Shouldly" version="2.7.0" targetFramework="net45" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net452" />
+  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj
index 92c5ceb8..cad1467d 100644
--- a/src/GitVersionTask/GitVersionTask.csproj
+++ b/src/GitVersionTask/GitVersionTask.csproj
@@ -39,9 +39,11 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GitTools.Core, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.2.1-beta0001\lib\net4\GitTools.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="GitTools.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.3.1\lib\net40\GitTools.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="LibGit2Sharp, Version=0.25.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
       <HintPath>..\packages\LibGit2Sharp.0.25.0-preview-0033\lib\net40\LibGit2Sharp.dll</HintPath>
diff --git a/src/GitVersionTask/packages.config b/src/GitVersionTask/packages.config
index b8976b6d..8fefcc42 100644
--- a/src/GitVersionTask/packages.config
+++ b/src/GitVersionTask/packages.config
@@ -2,8 +2,9 @@
 <packages>
   <package id="Caseless.Fody" version="1.5.0" targetFramework="net40" developmentDependency="true" />
   <package id="Fody" version="2.0.8" targetFramework="net40" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net40" />
+  <package id="GitTools.Core" version="1.3.1" targetFramework="net40" />
   <package id="ILRepack" version="2.0.13" targetFramework="net40" />
+  <package id="JetBrains.Annotations" version="10.4.0" targetFramework="net40" />
   <package id="LibGit2Sharp" version="0.25.0-preview-0033" targetFramework="net40" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net40" />
   <package id="PepitaPackage" version="1.21.4" targetFramework="net4" developmentDependency="true" />

@asbjornu
Copy link
Member Author

@nlowe: Sounds good. Could you please submit that as a PR so we can see whether it passes the build on Travis and AppVeyor as well?

@dazinator
Copy link
Member

Sorry guys, it looks like multiple people have tried to do the same thing and there are overlapping pr's. Im closing this one in favour of #1422
If that is wrong, please colloborate / re-open as necessary.

@dazinator dazinator closed this Jul 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants