From 451e8f0d95b87a66241d657a5376cd27f0b0ff58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Kemp=C3=A9?= Date: Thu, 1 May 2014 11:41:45 +0200 Subject: [PATCH 01/31] Update solution to Visual Studio 2013 Update LibGit2Sharp to 0.17 --- .../Git/GitDiffParserTests.cs | 2 +- .../GitDiffMargin.Unit.Tests.csproj | 9 ++-- GitDiffMargin.Unit.Tests/packages.config | 4 +- GitDiffMargin.sln | 14 +++--- GitDiffMargin/GitDiffMargin.csproj | 48 +++++++------------ GitDiffMargin/packages.config | 2 +- 6 files changed, 35 insertions(+), 44 deletions(-) diff --git a/GitDiffMargin.Unit.Tests/Git/GitDiffParserTests.cs b/GitDiffMargin.Unit.Tests/Git/GitDiffParserTests.cs index f55ae9d..0d37fcd 100644 --- a/GitDiffMargin.Unit.Tests/Git/GitDiffParserTests.cs +++ b/GitDiffMargin.Unit.Tests/Git/GitDiffParserTests.cs @@ -10,7 +10,7 @@ namespace GitDiffMargin.Unit.Tests.Git // ReSharper disable InconsistentNaming [TestFixture] - public class Tests1 + public class GitDiffParserTests { /* git diff --unified=0 Sources/skyeEditor/Core/Model/Dependency/IModelDependency.cs diff --git a/GitDiffMargin.Unit.Tests/GitDiffMargin.Unit.Tests.csproj b/GitDiffMargin.Unit.Tests/GitDiffMargin.Unit.Tests.csproj index e434d56..dfe07eb 100644 --- a/GitDiffMargin.Unit.Tests/GitDiffMargin.Unit.Tests.csproj +++ b/GitDiffMargin.Unit.Tests/GitDiffMargin.Unit.Tests.csproj @@ -37,12 +37,13 @@ - + False - ..\packages\NUnit.2.6.2\lib\nunit.framework.dll + ..\packages\NUnit.2.6.3\lib\nunit.framework.dll - - ..\packages\Shouldly.1.1.1.1\lib\35\Shouldly.dll + + False + ..\packages\Shouldly.2.1.1\lib\net40\Shouldly.dll diff --git a/GitDiffMargin.Unit.Tests/packages.config b/GitDiffMargin.Unit.Tests/packages.config index 5d23e6a..37e9079 100644 --- a/GitDiffMargin.Unit.Tests/packages.config +++ b/GitDiffMargin.Unit.Tests/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/GitDiffMargin.sln b/GitDiffMargin.sln index 9d2d1f1..30dff94 100644 --- a/GitDiffMargin.sln +++ b/GitDiffMargin.sln @@ -1,16 +1,18 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitDiffMargin", "GitDiffMargin\GitDiffMargin.csproj", "{233B6F13-7687-4823-870B-A8F44B79D4F0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitDiffMargin.Unit.Tests", "GitDiffMargin.Unit.Tests\GitDiffMargin.Unit.Tests.csproj", "{B954F515-AC6F-40D4-8169-03985AC62B06}" -EndProject +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30110.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{0A0AF18B-6698-4A12-B5AB-C37929F583E4}" ProjectSection(SolutionItems) = preProject .nuget\NuGet.exe = .nuget\NuGet.exe .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitDiffMargin", "GitDiffMargin\GitDiffMargin.csproj", "{233B6F13-7687-4823-870B-A8F44B79D4F0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitDiffMargin.Unit.Tests", "GitDiffMargin.Unit.Tests\GitDiffMargin.Unit.Tests.csproj", "{B954F515-AC6F-40D4-8169-03985AC62B06}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/GitDiffMargin/GitDiffMargin.csproj b/GitDiffMargin/GitDiffMargin.csproj index 7c55ede..3195529 100644 --- a/GitDiffMargin/GitDiffMargin.csproj +++ b/GitDiffMargin/GitDiffMargin.csproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,14 @@ true true 4.0.30816.0 - 11.0 + 12.0 4.0 + false publish\ true Disk @@ -38,7 +39,6 @@ true 0 1.0.0.%2a - false false true @@ -77,32 +77,18 @@ ..\packages\MvvmLightPreview.4.1.21.1\lib\net40\GalaSoft.MvvmLight.WPF4.dll - - False - ..\packages\LibGit2Sharp.0.16.0.0\lib\net35\LibGit2Sharp.dll - - + False - ..\..\..\..\Program Files (x86)\Microsoft Visual Studio 11.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.CoreUtility.dll + ..\packages\LibGit2Sharp.0.17.0.0\lib\net35\LibGit2Sharp.dll - + + - - False - ..\..\..\..\Program Files (x86)\Microsoft Visual Studio 11.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Text.Data.dll - - - False - ..\..\..\..\Program Files (x86)\Microsoft Visual Studio 11.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Text.Logic.dll - - - False - ..\..\..\..\Program Files (x86)\Microsoft Visual Studio 11.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Text.UI.dll - - - False - ..\..\..\..\Program Files (x86)\Microsoft Visual Studio 11.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Text.UI.Wpf.dll - + + + + + @@ -139,8 +125,8 @@ - - git2-65e9dc6.dll + + git2-06d772d.dll PreserveNewest true @@ -184,6 +170,8 @@ MSBuild:Compile MSBuild:Compile Designer + MSBuild:Compile + Designer @@ -224,9 +212,9 @@ if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\a xcopy /s /y "$(SolutionDir)packages\LibGit2Sharp.0.12.0.0\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64" if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries" if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86" -xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.16.0.0\lib\net35\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86" +xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.17.0.0\lib\net35\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86" if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64" -xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.16.0.0\lib\net35\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64" +xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.17.0.0\lib\net35\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"