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

Commit c66af97

Browse files
committed
Bump octokit (0.19.0) and switch to nuget libgit2sharp 0.22 because it's signed
1 parent d1dad3f commit c66af97

File tree

24 files changed

+127
-206
lines changed

24 files changed

+127
-206
lines changed

.gitmodules

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

GitHubVS.sln

Lines changed: 5 additions & 28 deletions
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.24720.0
4+
VisualStudioVersion = 14.0.25029.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,10 +26,6 @@ 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
3329
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1}"
3430
ProjectSection(SolutionItems) = preProject
3531
script\Modules\BuildUtils.psm1 = script\Modules\BuildUtils.psm1
@@ -42,23 +38,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Script", "Script", "{7B6C5F
4238
ProjectSection(SolutionItems) = preProject
4339
.gitattributes = .gitattributes
4440
.gitignore = .gitignore
41+
script\Announce.ps1 = script\Announce.ps1
4542
script\Bootstrap.ps1 = script\Bootstrap.ps1
4643
build.cmd = build.cmd
4744
script\Bump-Version.ps1 = script\Bump-Version.ps1
4845
script\cibuild.ps1 = script\cibuild.ps1
4946
script\common.ps1 = script\common.ps1
5047
script\Deploy.ps1 = script\Deploy.ps1
5148
script\Get-CheckedOutBranch.ps1 = script\Get-CheckedOutBranch.ps1
49+
script\Get-HeadSha1.ps1 = script\Get-HeadSha1.ps1
5250
script\HubotTell-NativeRoom.ps1 = script\HubotTell-NativeRoom.ps1
5351
nuget.config = nuget.config
5452
script\Require-CleanWorkTree.ps1 = script\Require-CleanWorkTree.ps1
55-
script\SolutionInfo.cs = script\SolutionInfo.cs
56-
script\Upload-DirectoryToS3.ps1 = script\Upload-DirectoryToS3.ps1
57-
script\Announce.ps1 = script\Announce.ps1
58-
script\Get-HeadSha1.ps1 = script\Get-HeadSha1.ps1
5953
script\Run-NUnit.ps1 = script\Run-NUnit.ps1
6054
script\Run-XUnit.ps1 = script\Run-XUnit.ps1
61-
55+
script\SolutionInfo.cs = script\SolutionInfo.cs
56+
script\Upload-DirectoryToS3.ps1 = script\Upload-DirectoryToS3.ps1
6257
EndProjectSection
6358
EndProject
6459
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8A7DA2E7-262B-4581-807A-1C45CE79CDFD}"
@@ -247,22 +242,6 @@ Global
247242
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
248243
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.XamlDesign|x86.ActiveCfg = Release|Any CPU
249244
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.XamlDesign|x86.Build.0 = Release|Any CPU
250-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
251-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|Any CPU.Build.0 = Debug|Any CPU
252-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|x86.ActiveCfg = Debug|Any CPU
253-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Debug|x86.Build.0 = Debug|Any CPU
254-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|Any CPU.ActiveCfg = Release|Any CPU
255-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|Any CPU.Build.0 = Release|Any CPU
256-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|x86.ActiveCfg = Release|Any CPU
257-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Publish|x86.Build.0 = Release|Any CPU
258-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|Any CPU.ActiveCfg = Release|Any CPU
259-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|Any CPU.Build.0 = Release|Any CPU
260-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|x86.ActiveCfg = Release|Any CPU
261-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.Release|x86.Build.0 = Release|Any CPU
262-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.XamlDesign|Any CPU.ActiveCfg = Debug|Any CPU
263-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.XamlDesign|Any CPU.Build.0 = Debug|Any CPU
264-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.XamlDesign|x86.ActiveCfg = Debug|Any CPU
265-
{EE6ED99F-CB12-4683-B055-D28FC7357A34}.XamlDesign|x86.Build.0 = Debug|Any CPU
266245
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
267246
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
268247
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -588,8 +567,6 @@ Global
588567
GlobalSection(NestedProjects) = preSolution
589568
{596595A6-2A3C-469E-9386-9E3767D863A5} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
590569
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
591-
{8446C785-A5B4-4676-9B38-560FCA0563E0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
592-
{EE6ED99F-CB12-4683-B055-D28FC7357A34} = {8446C785-A5B4-4676-9B38-560FCA0563E0}
593570
{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1} = {7B6C5F8D-14B3-443D-B044-0E209AE12BDF}
594571
{1ED83084-2A57-4F89-915C-8A2167C0D6BC} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFF}
595572
{1E7F7253-A6AF-43C4-A955-37BEDDA01AC0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}

src/GitHub.App/GitHub.App.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -51,6 +52,10 @@
5152
<DelaySign>false</DelaySign>
5253
</PropertyGroup>
5354
<ItemGroup>
55+
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
57+
<Private>True</Private>
58+
</Reference>
5459
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
5560
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
5661
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
@@ -231,11 +236,6 @@
231236
<Project>{252ce1c2-027a-4445-a3c2-e4d6c80a935a}</Project>
232237
<Name>Splat-Net45</Name>
233238
</ProjectReference>
234-
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
235-
<Project>{EE6ED99F-CB12-4683-B055-D28FC7357A34}</Project>
236-
<Name>LibGit2Sharp</Name>
237-
<Private>False</Private>
238-
</ProjectReference>
239239
<ProjectReference Include="..\CredentialManagement\CredentialManagement.csproj">
240240
<Project>{41a47c5b-c606-45b4-b83c-22b9239e4da0}</Project>
241241
<Name>CredentialManagement</Name>
@@ -279,6 +279,7 @@
279279
</PropertyGroup>
280280
<Error Condition="!Exists('..\..\packages\Fody.1.28.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.28.0\build\Fody.targets'))" />
281281
<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'))" />
282+
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props'))" />
282283
</Target>
283284
<Import Project="..\..\packages\Fody.1.28.0\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.28.0\build\Fody.targets')" />
284285
<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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
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.22.0" targetFramework="net461" />
5+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net461" />
46
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
57
<package id="NLog" version="3.1.0.0" targetFramework="net45" />
68
<package id="NullGuard.Fody" version="1.4.1" targetFramework="net45" developmentDependency="true" />

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -46,6 +47,10 @@
4647
<DelaySign>false</DelaySign>
4748
</PropertyGroup>
4849
<ItemGroup>
50+
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
51+
<HintPath>..\..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
52+
<Private>True</Private>
53+
</Reference>
4954
<Reference Include="PresentationCore" />
5055
<Reference Include="System" />
5156
<Reference Include="System.ComponentModel.Composition" />
@@ -138,10 +143,6 @@
138143
<Name>Akavache_Net45</Name>
139144
<Private>False</Private>
140145
</ProjectReference>
141-
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
142-
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
143-
<Name>LibGit2Sharp</Name>
144-
</ProjectReference>
145146
<ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj">
146147
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
147148
<Name>Octokit</Name>
@@ -165,6 +166,12 @@
165166
</ItemGroup>
166167
<ItemGroup />
167168
<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.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props'))" />
174+
</Target>
168175
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
169176
Other similar extension points exist, see Microsoft.Common.targets.
170177
<Target Name="BeforeBuild">

src/GitHub.Exports.Reactive/packages.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="LibGit2Sharp" version="0.22.0" targetFramework="net461" />
4+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net461" />
35
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" />
46
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" />
57
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net45" />

src/GitHub.Exports/GitHub.Exports.csproj

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -52,6 +53,10 @@
5253
<Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
5354
<EmbedInteropTypes>false</EmbedInteropTypes>
5455
</Reference>
56+
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
57+
<HintPath>..\..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
58+
<Private>True</Private>
59+
</Reference>
5560
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
5661
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
5762
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
@@ -121,6 +126,7 @@
121126
<Compile Include="..\common\SolutionInfo.cs">
122127
<Link>Properties\SolutionInfo.cs</Link>
123128
</Compile>
129+
<None Include="packages.config" />
124130
</ItemGroup>
125131
<ItemGroup>
126132
<Compile Include="Authentication\AuthenticationResultExtensions.cs" />
@@ -163,11 +169,6 @@
163169
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
164170
<Name>Octokit</Name>
165171
</ProjectReference>
166-
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
167-
<Project>{EE6ED99F-CB12-4683-B055-D28FC7357A34}</Project>
168-
<Name>LibGit2Sharp</Name>
169-
<Private>True</Private>
170-
</ProjectReference>
171172
<ProjectReference Include="..\GitHub.Extensions\GitHub.Extensions.csproj">
172173
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
173174
<Name>GitHub.Extensions</Name>
@@ -186,6 +187,12 @@
186187
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
187188
<Import Project="$(SolutionDir)\src\common\t4.targets" />
188189
<Import Project="$(SolutionDir)\lib\Microsoft.TextTemplating.targets" />
190+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
191+
<PropertyGroup>
192+
<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>
193+
</PropertyGroup>
194+
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props'))" />
195+
</Target>
189196
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
190197
Other similar extension points exist, see Microsoft.Common.targets.
191198
<Target Name="BeforeBuild">

src/GitHub.Exports/packages.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="LibGit2Sharp" version="0.22.0" targetFramework="net461" />
4+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net461" />
5+
</packages>

src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.csproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<MinimumVisualStudioVersion>$(MSBuildToolsVersion)</MinimumVisualStudioVersion>
@@ -13,7 +14,7 @@
1314
<AssemblyName>GitHub.TeamFoundation.14</AssemblyName>
1415
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1516
<FileAlignment>512</FileAlignment>
16-
<OutputPath>..\..\build\$(Configuration)\</OutputPath>
17+
<OutputPath>bin\$(Configuration)\</OutputPath>
1718
<BuildType Condition="Exists('..\..\script\ApiClientConfiguration.cs')">Internal</BuildType>
1819
<NuGetPackageImportStamp>
1920
</NuGetPackageImportStamp>
@@ -40,6 +41,10 @@
4041
<DelaySign>false</DelaySign>
4142
</PropertyGroup>
4243
<ItemGroup>
44+
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
45+
<HintPath>..\..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
46+
<Private>True</Private>
47+
</Reference>
4348
<Reference Include="Microsoft.TeamFoundation.Common">
4449
<HintPath>..\..\lib\14.0\Microsoft.TeamFoundation.Common.dll</HintPath>
4550
<Private>False</Private>
@@ -132,10 +137,6 @@
132137
<None Include="packages.config" />
133138
</ItemGroup>
134139
<ItemGroup>
135-
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
136-
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
137-
<Name>LibGit2Sharp</Name>
138-
</ProjectReference>
139140
<ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj">
140141
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
141142
<Name>Octokit</Name>
@@ -183,6 +184,7 @@
183184
<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>
184185
</PropertyGroup>
185186
<Error Condition="!Exists('..\..\packages\Fody.1.28.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.28.0\build\Fody.targets'))" />
187+
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props'))" />
186188
</Target>
187189
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
188190
Other similar extension points exist, see Microsoft.Common.targets.

src/GitHub.TeamFoundation.14/packages.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
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.22.0" targetFramework="net461" />
5+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net461" />
46
<package id="NullGuard.Fody" version="1.4.1" targetFramework="net45" developmentDependency="true" />
57
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" />
68
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" />

0 commit comments

Comments
 (0)