From f6b95a1ffeca54fae0f69af2a826f8b5f50d8420 Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Sun, 19 Jul 2015 00:21:33 -0700 Subject: [PATCH] Add libgit2sharp submodule so we can have it signed (sigh) --- .gitmodules | 3 +++ GitHubVS.sln | 20 ++++++++++++++++++- src/GitHub.App/GitHub.App.csproj | 10 ++++------ src/GitHub.App/packages.config | 1 - .../GitHub.Exports.Reactive.csproj | 15 ++++---------- src/GitHub.Exports.Reactive/packages.config | 1 - src/GitHub.Exports/GitHub.Exports.csproj | 16 ++++----------- src/GitHub.Exports/packages.config | 4 ---- .../GitHub.VisualStudio.csproj | 10 ++++------ src/GitHub.VisualStudio/packages.config | 1 - src/UnitTests/UnitTests.csproj | 10 ++++------ src/UnitTests/packages.config | 1 - submodules/libgit2sharp | 1 + 13 files changed, 43 insertions(+), 50 deletions(-) delete mode 100644 src/GitHub.Exports/packages.config create mode 160000 submodules/libgit2sharp diff --git a/.gitmodules b/.gitmodules index f3c93811e..cf21440d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "submodules/akavache"] path = submodules/akavache url = git@github.com:shana/Akavache +[submodule "submodules/libgit2sharp"] + path = submodules/libgit2sharp + url = git@github.com:shana/libgit2sharp.git diff --git a/GitHubVS.sln b/GitHubVS.sln index e8f713dd0..682edeb70 100644 --- a/GitHubVS.sln +++ b/GitHubVS.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22809.0 +VisualStudioVersion = 14.0.23023.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\GitHub.VisualStudio\GitHub.VisualStudio.csproj", "{11569514-5AE5-4B5B-92A2-F10B0967DE5F}" EndProject @@ -26,6 +26,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Submodules", "Submodules", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rothko", "submodules\Rothko\src\Rothko.csproj", "{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LibGit2Sharp", "LibGit2Sharp", "{8446C785-A5B4-4676-9B38-560FCA0563E0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibGit2Sharp", "submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj", "{EE6ED99F-CB12-4683-B055-D28FC7357A34}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1}" ProjectSection(SolutionItems) = preProject script\Modules\BuildUtils.psm1 = script\Modules\BuildUtils.psm1 @@ -196,6 +200,18 @@ Global {4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|Any CPU.Build.0 = Release|Any CPU {4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|x86.ActiveCfg = Release|Any CPU {4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|x86.Build.0 = Release|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|x86.ActiveCfg = Debug|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|x86.Build.0 = Debug|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|Any CPU.ActiveCfg = Release|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|Any CPU.Build.0 = Release|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|x86.ActiveCfg = Release|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|x86.Build.0 = Release|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|Any CPU.Build.0 = Release|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|x86.ActiveCfg = Release|Any CPU + {EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|x86.Build.0 = Release|Any CPU {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -409,5 +425,7 @@ Global {252CE1C2-027A-4445-A3C2-E4D6C80A935A} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AF9} {0EC8DBA1-D745-4EE5-993A-6026440EC3BF} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AF9} {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9} + {8446C785-A5B4-4676-9B38-560FCA0563E0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8} + {EE6ED99F-CB12-4683-B055-D28FC7357A34} = {8446C785-A5B4-4676-9B38-560FCA0563E0} EndGlobalSection EndGlobal diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj index f856089f3..e5d7b62be 100644 --- a/src/GitHub.App/GitHub.App.csproj +++ b/src/GitHub.App/GitHub.App.csproj @@ -1,6 +1,5 @@  - Debug @@ -52,10 +51,6 @@ false - - ..\..\packages\LibGit2Sharp.0.21.0.176\lib\net40\LibGit2Sharp.dll - True - ..\..\lib\Microsoft.TeamFoundation.Git.Controls.dll False @@ -214,6 +209,10 @@ Akavache_Net45 False + + {ee6ed99f-cb12-4683-b055-d28fc7357a34} + LibGit2Sharp + {674b69b8-0780-4d54-ae2b-c15821fa51cb} Octokit.Reactive @@ -267,7 +266,6 @@ - diff --git a/src/GitHub.App/packages.config b/src/GitHub.App/packages.config index 569246923..a9595ff7e 100644 --- a/src/GitHub.App/packages.config +++ b/src/GitHub.App/packages.config @@ -1,7 +1,6 @@  - diff --git a/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj b/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj index 09c5cdba4..f1bd98ce0 100644 --- a/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj +++ b/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj @@ -1,6 +1,5 @@  - Debug @@ -47,10 +46,6 @@ false - - ..\..\packages\LibGit2Sharp.0.21.0.176\lib\net40\LibGit2Sharp.dll - True - @@ -143,6 +138,10 @@ Akavache_Net45 False + + {ee6ed99f-cb12-4683-b055-d28fc7357a34} + LibGit2Sharp + {08dd4305-7787-4823-a53f-4d0f725a07f3} Octokit @@ -166,12 +165,6 @@ - - - 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}. - - -