Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit f6b95a1

Browse files
committed
Add libgit2sharp submodule so we can have it signed (sigh)
1 parent 373b0cf commit f6b95a1

File tree

13 files changed

+43
-50
lines changed

13 files changed

+43
-50
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
[submodule "submodules/akavache"]
1414
path = submodules/akavache
1515
url = [email protected]:shana/Akavache
16+
[submodule "submodules/libgit2sharp"]
17+
path = submodules/libgit2sharp
18+
url = [email protected]:shana/libgit2sharp.git

GitHubVS.sln

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.22809.0
4+
VisualStudioVersion = 14.0.23023.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\GitHub.VisualStudio\GitHub.VisualStudio.csproj", "{11569514-5AE5-4B5B-92A2-F10B0967DE5F}"
77
EndProject
@@ -26,6 +26,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Submodules", "Submodules",
2626
EndProject
2727
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rothko", "submodules\Rothko\src\Rothko.csproj", "{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}"
2828
EndProject
29+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LibGit2Sharp", "LibGit2Sharp", "{8446C785-A5B4-4676-9B38-560FCA0563E0}"
30+
EndProject
31+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibGit2Sharp", "submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj", "{EE6ED99F-CB12-4683-B055-D28FC7357A34}"
32+
EndProject
2933
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1}"
3034
ProjectSection(SolutionItems) = preProject
3135
script\Modules\BuildUtils.psm1 = script\Modules\BuildUtils.psm1
@@ -196,6 +200,18 @@ Global
196200
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|Any CPU.Build.0 = Release|Any CPU
197201
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|x86.ActiveCfg = Release|Any CPU
198202
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|x86.Build.0 = Release|Any CPU
203+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
204+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|Any CPU.Build.0 = Debug|Any CPU
205+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|x86.ActiveCfg = Debug|Any CPU
206+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|x86.Build.0 = Debug|Any CPU
207+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|Any CPU.ActiveCfg = Release|Any CPU
208+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|Any CPU.Build.0 = Release|Any CPU
209+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|x86.ActiveCfg = Release|Any CPU
210+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|x86.Build.0 = Release|Any CPU
211+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|Any CPU.ActiveCfg = Release|Any CPU
212+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|Any CPU.Build.0 = Release|Any CPU
213+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|x86.ActiveCfg = Release|Any CPU
214+
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|x86.Build.0 = Release|Any CPU
199215
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
200216
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
201217
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -409,5 +425,7 @@ Global
409425
{252CE1C2-027A-4445-A3C2-E4D6C80A935A} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AF9}
410426
{0EC8DBA1-D745-4EE5-993A-6026440EC3BF} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AF9}
411427
{DD99FD0F-82F6-4C30-930E-4A1D0DF01D65} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9}
428+
{8446C785-A5B4-4676-9B38-560FCA0563E0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
429+
{EE6ED99F-CB12-4683-B055-D28FC7357A34} = {8446C785-A5B4-4676-9B38-560FCA0563E0}
412430
EndGlobalSection
413431
EndGlobal

src/GitHub.App/GitHub.App.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props" Condition="Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -52,10 +51,6 @@
5251
<DelaySign>false</DelaySign>
5352
</PropertyGroup>
5453
<ItemGroup>
55-
<Reference Include="LibGit2Sharp, Version=0.21.0.176, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\LibGit2Sharp.0.21.0.176\lib\net40\LibGit2Sharp.dll</HintPath>
57-
<Private>True</Private>
58-
</Reference>
5954
<Reference Include="Microsoft.TeamFoundation.Git.Controls, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6055
<HintPath>..\..\lib\Microsoft.TeamFoundation.Git.Controls.dll</HintPath>
6156
<Private>False</Private>
@@ -214,6 +209,10 @@
214209
<Name>Akavache_Net45</Name>
215210
<Private>False</Private>
216211
</ProjectReference>
212+
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
213+
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
214+
<Name>LibGit2Sharp</Name>
215+
</ProjectReference>
217216
<ProjectReference Include="..\..\submodules\octokit.net\Octokit.Reactive\Octokit.Reactive.csproj">
218217
<Project>{674b69b8-0780-4d54-ae2b-c15821fa51cb}</Project>
219218
<Name>Octokit.Reactive</Name>
@@ -267,7 +266,6 @@
267266
</PropertyGroup>
268267
<Error Condition="!Exists('..\..\packages\Fody.1.28.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.28.0\build\Fody.targets'))" />
269268
<Error Condition="!Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets'))" />
270-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props'))" />
271269
</Target>
272270
<Import Project="..\..\packages\Fody.1.28.0\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.28.0\build\Fody.targets')" />
273271
<Import Project="..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets" Condition="Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" />

src/GitHub.App/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Fody" version="1.28.0" targetFramework="net45" developmentDependency="true" />
4-
<package id="LibGit2Sharp" version="0.21.0.176" targetFramework="net45" />
54
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
65
<package id="NLog" version="3.1.0.0" targetFramework="net45" />
76
<package id="NullGuard.Fody" version="1.4.1" targetFramework="net45" developmentDependency="true" />

src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props" Condition="Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -47,10 +46,6 @@
4746
<DelaySign>false</DelaySign>
4847
</PropertyGroup>
4948
<ItemGroup>
50-
<Reference Include="LibGit2Sharp, Version=0.21.0.176, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\LibGit2Sharp.0.21.0.176\lib\net40\LibGit2Sharp.dll</HintPath>
52-
<Private>True</Private>
53-
</Reference>
5449
<Reference Include="PresentationCore" />
5550
<Reference Include="System" />
5651
<Reference Include="System.Core" />
@@ -143,6 +138,10 @@
143138
<Name>Akavache_Net45</Name>
144139
<Private>False</Private>
145140
</ProjectReference>
141+
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
142+
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
143+
<Name>LibGit2Sharp</Name>
144+
</ProjectReference>
146145
<ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj">
147146
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
148147
<Name>Octokit</Name>
@@ -166,12 +165,6 @@
166165
</ItemGroup>
167166
<ItemGroup />
168167
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
169-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
170-
<PropertyGroup>
171-
<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>
172-
</PropertyGroup>
173-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props'))" />
174-
</Target>
175168
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
176169
Other similar extension points exist, see Microsoft.Common.targets.
177170
<Target Name="BeforeBuild">

src/GitHub.Exports.Reactive/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="LibGit2Sharp" version="0.21.0.176" targetFramework="net45" />
43
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" />
54
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" />
65
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net45" />

src/GitHub.Exports/GitHub.Exports.csproj

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props" Condition="Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -53,10 +52,6 @@
5352
<Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
5453
<EmbedInteropTypes>false</EmbedInteropTypes>
5554
</Reference>
56-
<Reference Include="LibGit2Sharp, Version=0.21.0.176, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\LibGit2Sharp.0.21.0.176\lib\net40\LibGit2Sharp.dll</HintPath>
58-
<Private>True</Private>
59-
</Reference>
6055
<Reference Include="Microsoft.TeamFoundation.Controls, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6156
<HintPath>..\..\lib\\Microsoft.TeamFoundation.Controls.dll</HintPath>
6257
<Private>False</Private>
@@ -112,7 +107,6 @@
112107
<Compile Include="..\common\SolutionInfo.cs">
113108
<Link>Properties\SolutionInfo.cs</Link>
114109
</Compile>
115-
<None Include="packages.config" />
116110
</ItemGroup>
117111
<ItemGroup>
118112
<Compile Include="Authentication\AuthenticationResultExtensions.cs" />
@@ -142,6 +136,10 @@
142136
<Compile Include="ViewModels\IViewModel.cs" />
143137
</ItemGroup>
144138
<ItemGroup>
139+
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
140+
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
141+
<Name>LibGit2Sharp</Name>
142+
</ProjectReference>
145143
<ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj">
146144
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
147145
<Name>Octokit</Name>
@@ -153,12 +151,6 @@
153151
</ProjectReference>
154152
</ItemGroup>
155153
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
156-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
157-
<PropertyGroup>
158-
<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>
159-
</PropertyGroup>
160-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props'))" />
161-
</Target>
162154
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
163155
Other similar extension points exist, see Microsoft.Common.targets.
164156
<Target Name="BeforeBuild">

src/GitHub.Exports/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
3-
<Import Project="..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props" Condition="Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" />
43
<PropertyGroup>
54
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
65
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
@@ -87,10 +86,6 @@
8786
<Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
8887
<EmbedInteropTypes>false</EmbedInteropTypes>
8988
</Reference>
90-
<Reference Include="LibGit2Sharp, Version=0.21.0.176, Culture=neutral, processorArchitecture=MSIL">
91-
<HintPath>..\..\packages\LibGit2Sharp.0.21.0.176\lib\net40\LibGit2Sharp.dll</HintPath>
92-
<Private>True</Private>
93-
</Reference>
9489
<Reference Include="Microsoft.CSharp" />
9590
<Reference Include="Microsoft.TeamFoundation.Common, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
9691
<HintPath>..\..\lib\Microsoft.TeamFoundation.Common.dll</HintPath>
@@ -402,6 +397,10 @@
402397
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
403398
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
404399
</ProjectReference>
400+
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
401+
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
402+
<Name>LibGit2Sharp</Name>
403+
</ProjectReference>
405404
<ProjectReference Include="..\..\submodules\octokit.net\Octokit.Reactive\Octokit.Reactive.csproj">
406405
<Project>{674b69b8-0780-4d54-ae2b-c15821fa51cb}</Project>
407406
<Name>Octokit.Reactive</Name>
@@ -518,7 +517,6 @@
518517
</PropertyGroup>
519518
<Error Condition="!Exists('..\..\packages\Fody.1.28.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.28.0\build\Fody.targets'))" />
520519
<Error Condition="!Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets'))" />
521-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props'))" />
522520
</Target>
523521
<Import Project="..\..\packages\Fody.1.28.0\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.28.0\build\Fody.targets')" />
524522
<Import Project="..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets" Condition="Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" />

src/GitHub.VisualStudio/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<packages>
33
<package id="EditorUtils2013" version="1.4.1.1" targetFramework="net45" />
44
<package id="Fody" version="1.28.0" targetFramework="net45" developmentDependency="true" />
5-
<package id="LibGit2Sharp" version="0.21.0.176" targetFramework="net45" />
65
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
76
<package id="NLog" version="3.1.0" targetFramework="net45" />
87
<package id="NullGuard.Fody" version="1.4.1" targetFramework="net45" developmentDependency="true" />

0 commit comments

Comments
 (0)