Updated GitVersion dependency to latest version which has fix for Git…

…Tools/GitVersion#217
dazinator · Dec 1, 2015 · dd0319f · dd0319f · dazinator · Dec 1, 2015
1 parent 6ff5344
commit dd0319f
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 35 deletions.
diff --git a/lib/GitVersion.CommandLine.3.3.0/GitVersion.CommandLine.3.3.0.nupkg b/lib/GitVersion.CommandLine.3.3.0/GitVersion.CommandLine.3.3.0.nupkg
diff --git a/lib/GitVersion.CommandLine.3.3.0/tools/GitVersion.exe b/lib/GitVersion.CommandLine.3.3.0/tools/GitVersion.exe
diff --git a/lib/GitVersion.CommandLine.3.3.0/tools/GitVersion.pdb b/lib/GitVersion.CommandLine.3.3.0/tools/GitVersion.pdb
diff --git a/lib/GitVersion.CommandLine.3.3.0/tools/NativeBinaries/amd64/git2-e0902fb.dll b/lib/GitVersion.CommandLine.3.3.0/tools/NativeBinaries/amd64/git2-e0902fb.dll
diff --git a/lib/GitVersion.CommandLine.3.3.0/tools/NativeBinaries/x86/git2-e0902fb.dll b/lib/GitVersion.CommandLine.3.3.0/tools/NativeBinaries/x86/git2-e0902fb.dll
diff --git a/lib/NUnitTestAdapter.2.0.0/NUnitTestAdapter.2.0.0.nupkg b/lib/NUnitTestAdapter.2.0.0/NUnitTestAdapter.2.0.0.nupkg
diff --git a/lib/NUnitTestAdapter.2.0.0/lib/NUnit.VisualStudio.TestAdapter.dll b/lib/NUnitTestAdapter.2.0.0/lib/NUnit.VisualStudio.TestAdapter.dll
diff --git a/lib/NUnitTestAdapter.2.0.0/lib/nunit.core.dll b/lib/NUnitTestAdapter.2.0.0/lib/nunit.core.dll
diff --git a/lib/NUnitTestAdapter.2.0.0/lib/nunit.core.interfaces.dll b/lib/NUnitTestAdapter.2.0.0/lib/nunit.core.interfaces.dll
diff --git a/lib/NUnitTestAdapter.2.0.0/lib/nunit.util.dll b/lib/NUnitTestAdapter.2.0.0/lib/nunit.util.dll
diff --git a/lib/NUnitTestAdapter.2.0.0/tools/install.ps1 b/lib/NUnitTestAdapter.2.0.0/tools/install.ps1
diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config
@@ -2,6 +2,5 @@
 <packages>
   <package id="GithubReleaseCreator" version="1.1.0" />
   <package id="GitReleaseNotes" version="0.6.0" />
-  <package id="GitVersion.CommandLine" version="2.0.1" />
   <package id="NuGet.CommandLine" version="2.8.3" />
 </packages>
diff --git a/src/DnnPackager.Tests/CreateDnnExtensionInstallationZipTest.cs b/src/DnnPackager.Tests/CreateDnnExtensionInstallationZipTest.cs
@@ -77,9 +77,7 @@ public void CanLocateManifestFile(string manifestFileName)
                 string path = Path.Combine(projectDir, @"obj\DnnPackager\resources.zip");
                 CheckForLock(path);
                 throw;
-            }        
-
-
+            }                   
 
 
         }

diff --git a/src/DnnPackager.Tests/DnnPackager.Tests.csproj b/src/DnnPackager.Tests/DnnPackager.Tests.csproj
@@ -35,25 +35,9 @@
     </Reference>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="nunit.core">
-      <HintPath>..\..\lib\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="nunit.core.interfaces">
-      <HintPath>..\..\lib\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\..\lib\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.util">
-      <HintPath>..\..\lib\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="NUnit.VisualStudio.TestAdapter">
-      <HintPath>..\..\lib\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Rhino.Mocks">
       <HintPath>..\..\lib\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
     </Reference>

diff --git a/src/DnnPackager.Tests/packages.config b/src/DnnPackager.Tests/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NUnit" version="2.6.4" targetFramework="net451" />
-  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net451" />
   <package id="RhinoMocks" version="3.6.1" targetFramework="net451" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
 </packages>
diff --git a/src/DnnPackager.sln b/src/DnnPackager.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{6D1CB3CF-B089-436F-B358-EA3890568CF5}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/src/DnnPackager/packages.config b/src/DnnPackager/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GitVersion.CommandLine" version="3.3.0" targetFramework="net4" developmentDependency="true" />
   <package id="Microsoft.Web.Administration" version="7.0.0.0" targetFramework="net40" />
   <package id="MSBuildTasks" version="1.4.0.61" targetFramework="net40" />
 </packages>
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,9 +77,7 @@ public void CanLocateManifestFile(string manifestFileName) @@
                     string path = Path.Combine(projectDir, @"obj\DnnPackager\resources.zip");
                     CheckForLock(path);
                     throw;
-                }
+                }
             }
@@ Expand Down @@