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

Commit c4fc33a

Browse files
shanashana
committed
Merge branch 'shana/fix-packaging' into beta-1.0.12
2 parents 0eac63f + 5b45c32 commit c4fc33a

File tree

10 files changed

+167
-25
lines changed

10 files changed

+167
-25
lines changed

‎lib/LibGit2Sharp.dll‎

363 KB
Binary file not shown.

‎src/GitHub.App/GitHub.App.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<DelaySign>false</DelaySign>
5252
</PropertyGroup>
5353
<ItemGroup>
54+
<Reference Include="LibGit2Sharp, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
55+
<HintPath>..\..\lib\LibGit2Sharp.dll</HintPath>
56+
</Reference>
5457
<Reference Include="Microsoft.TeamFoundation.Git.Controls, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5558
<HintPath>..\..\lib\Microsoft.TeamFoundation.Git.Controls.dll</HintPath>
5659
<Private>False</Private>
@@ -209,10 +212,6 @@
209212
<Name>Akavache_Net45</Name>
210213
<Private>False</Private>
211214
</ProjectReference>
212-
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
213-
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
214-
<Name>LibGit2Sharp</Name>
215-
</ProjectReference>
216215
<ProjectReference Include="..\..\submodules\octokit.net\Octokit.Reactive\Octokit.Reactive.csproj">
217216
<Project>{674b69b8-0780-4d54-ae2b-c15821fa51cb}</Project>
218217
<Name>Octokit.Reactive</Name>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,9 @@
138138
<Name>Akavache_Net45</Name>
139139
<Private>False</Private>
140140
</ProjectReference>
141-
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
142-
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
143-
<Name>LibGit2Sharp</Name>
144-
</ProjectReference>
141+
<Reference Include="LibGit2Sharp, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142+
<HintPath>..\..\lib\LibGit2Sharp.dll</HintPath>
143+
</Reference>
145144
<ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj">
146145
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
147146
<Name>Octokit</Name>

‎src/GitHub.Exports/GitHub.Exports.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
<Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
5353
<EmbedInteropTypes>false</EmbedInteropTypes>
5454
</Reference>
55+
<Reference Include="LibGit2Sharp, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
56+
<HintPath>..\..\lib\LibGit2Sharp.dll</HintPath>
57+
</Reference>
5558
<Reference Include="Microsoft.TeamFoundation.Controls, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5659
<HintPath>..\..\lib\\Microsoft.TeamFoundation.Controls.dll</HintPath>
5760
<Private>False</Private>
@@ -136,10 +139,6 @@
136139
<Compile Include="ViewModels\IViewModel.cs" />
137140
</ItemGroup>
138141
<ItemGroup>
139-
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
140-
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
141-
<Name>LibGit2Sharp</Name>
142-
</ProjectReference>
143142
<ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj">
144143
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
145144
<Name>Octokit</Name>

‎src/GitHub.Exports/Services/Services.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,5 +166,10 @@ public static Repository GetRepoFromIGit(this IGitRepositoryInfo repoInfo)
166166
return null;
167167
return new Repository(repoPath);
168168
}
169+
170+
public static UriString GetUriFromRepository(this IGitRepositoryInfo repoInfo)
171+
{
172+
return repoInfo.GetRepoFromIGit()?.GetUri();
173+
}
169174
}
170175
}

‎src/GitHub.VisualStudio/Base/TeamExplorerItemBase.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ protected virtual void RepoChanged()
4747
var repo = ActiveRepo;
4848
if (repo != null)
4949
{
50-
var gitRepo = repo.GetRepoFromIGit();
51-
var uri = gitRepo?.GetUri();
50+
var uri = repo.GetUriFromRepository();
5251
var name = uri?.RepositoryName;
5352
if (name != null)
5453
{

‎src/GitHub.VisualStudio/GitHub.VisualStudio.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
2727
<StartArguments>/rootsuffix Exp</StartArguments>
2828
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
29+
<ZipPackageCompressionLevel>Normal</ZipPackageCompressionLevel>
2930
</PropertyGroup>
3031
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3132
<DebugSymbols>true</DebugSymbols>
@@ -396,12 +397,6 @@
396397
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
397398
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
398399
</ProjectReference>
399-
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
400-
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
401-
<Name>LibGit2Sharp</Name>
402-
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bDebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
403-
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
404-
</ProjectReference>
405400
<ProjectReference Include="..\..\submodules\octokit.net\Octokit.Reactive\Octokit.Reactive.csproj">
406401
<Project>{674b69b8-0780-4d54-ae2b-c15821fa51cb}</Project>
407402
<Name>Octokit.Reactive</Name>
@@ -512,6 +507,7 @@
512507
</PropertyGroup>
513508
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
514509
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
510+
<Import Project="packaging.targets" />
515511
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
516512
<PropertyGroup>
517513
<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>

‎src/GitHub.VisualStudio/packaging.targets‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Target Name="RemoveVSSDKAssemblies"
4+
AfterTargets="GetVsixSourceItems">
5+
<ItemGroup>
6+
<SuppressPackaging Include="@(VSIXSourceItem)"
7+
Condition="
8+
'%(FileName)' == 'EnvDTE' or
9+
'%(FileName)' == 'EnvDTE80' or
10+
'%(FileName)' == 'Microsoft.Build.Conversion.Core' or
11+
'%(FileName)' == 'Microsoft.Build' or
12+
'%(FileName)' == 'Microsoft.Build.Engine' or
13+
'%(FileName)' == 'Microsoft.Build.Framework' or
14+
'%(FileName)' == 'Microsoft.Build.Tasks.Core' or
15+
'%(FileName)' == 'Microsoft.Build.Utilities.Core' or
16+
'%(FileName)' == 'Microsoft.CodeAnalysis.CSharp.Desktop' or
17+
'%(FileName)' == 'Microsoft.CodeAnalysis.CSharp' or
18+
'%(FileName)' == 'Microsoft.CodeAnalysis.Desktop' or
19+
'%(FileName)' == 'Microsoft.CodeAnalysis' or
20+
'%(FileName)' == 'Microsoft.CSharp' or
21+
'%(FileName)' == 'Microsoft.MSXML' or
22+
'%(FileName)' == 'Microsoft.VisualStudio.CommonIDE' or
23+
'%(FileName)' == 'Microsoft.VisualStudio.ComponentModelHost' or
24+
'%(FileName)' == 'Microsoft.VisualStudio.Diagnostics.Assert' or
25+
'%(FileName)' == 'Microsoft.VisualStudio.ExtensibilityHosting' or
26+
'%(FileName)' == 'Microsoft.VisualStudio.GraphModel' or
27+
'%(FileName)' == 'Microsoft.VisualStudio.TemplateWizardInterface' or
28+
'%(FileName)' == 'Microsoft.VisualStudio.Text.Internal' or
29+
'%(FileName)' == 'microsoft.visualstudio.vcprojectengine' or
30+
'%(FileName)' == 'Microsoft.VisualStudio.VSHelp' or
31+
'%(FileName)' == 'Microsoft.VisualStudio.VSHelp80' or
32+
'%(FileName)' == 'mscorlib' or
33+
'%(FileName)' == 'stdole' or
34+
'%(FileName)' == 'System' or
35+
'%(FileName)' == 'System.Collections.Concurrent' or
36+
'%(FileName)' == 'System.Collections' or
37+
'%(FileName)' == 'System.Collections.Immutable' or
38+
'%(FileName)' == 'System.Composition.AttributedModel' or
39+
'%(FileName)' == 'System.Composition.Convention' or
40+
'%(FileName)' == 'System.Composition.Hosting' or
41+
'%(FileName)' == 'System.Composition.Runtime' or
42+
'%(FileName)' == 'System.Composition.TypedParts' or
43+
'%(FileName)' == 'System.Core' or
44+
'%(FileName)' == 'System.Data.DataSetExtensions' or
45+
'%(FileName)' == 'System.Data' or
46+
'%(FileName)' == 'System.Net.Http' or
47+
'%(FileName)' == 'System.Xml' or
48+
'%(FileName)' == 'System.Xml.Linq' or
49+
'%(FileName)' == 'System.Diagnostics.Debug' or
50+
'%(FileName)' == 'System.Diagnostics.Tools' or
51+
'%(FileName)' == 'System.Diagnostics.Tracing' or
52+
'%(FileName)' == 'System.Dynamic.Runtime' or
53+
'%(FileName)' == 'System.Globalization' or
54+
'%(FileName)' == 'System.IO' or
55+
'%(FileName)' == 'System.Linq' or
56+
'%(FileName)' == 'System.Reflection' or
57+
'%(FileName)' == 'System.Reflection.Extensions' or
58+
'%(FileName)' == 'System.Reflection.Metadata' or
59+
'%(FileName)' == 'System.Reflection.Primitives' or
60+
'%(FileName)' == 'System.Resources.ResourceManager' or
61+
'%(FileName)' == 'System.Runtime' or
62+
'%(FileName)' == 'System.Runtime.Extensions' or
63+
'%(FileName)' == 'System.Text.Encoding' or
64+
'%(FileName)' == 'System.Text.Encoding.Extensions' or
65+
'%(FileName)' == 'System.Threading' or
66+
'%(FileName)' == 'System.Threading.Tasks.Dataflow' or
67+
'%(FileName)' == 'System.Threading.Tasks' or
68+
'%(FileName)' == 'VSLangProj' or
69+
'%(FileName)' == 'VSLangProj2' or
70+
'%(FileName)' == 'VSLangProj80' or
71+
'%(FileName)' == 'Microsoft.VisualStudio.ProjectSystem.v14only' or
72+
'%(FileName)' == 'Microsoft.VisualStudio.ProjectSystem.VS.V14Only' or
73+
'%(FileName)' == 'Microsoft.VisualStudio.ProjectSystem.Utilities.v14.0' or
74+
'%(FileName)' == 'Microsoft.VisualStudio.ProjectSystem.Interop' or
75+
'%(FileName)' == 'Microsoft.VisualStudio.Threading' or
76+
'%(FileName)' == 'Microsoft.VisualStudio.Validation' or
77+
'%(FileName)' == 'Microsoft.VisualStudio.Composition' or
78+
'%(FileName)' == 'Microsoft.VisualStudio.Composition.Configuration' or
79+
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Interop.10.0' or
80+
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Interop.11.0' or
81+
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Interop.12.0' or
82+
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Interop.14.0' or
83+
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Interop' or
84+
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.InteropA' or
85+
'%(FileName)' == 'Microsoft.VisualStudio.Designer.Interfaces' or
86+
'%(FileName)' == 'Microsoft.VisualStudio.ManagedInterfaces.9.0' or
87+
'%(FileName)' == 'Microsoft.VisualStudio.ManagedInterfaces' or
88+
'%(FileName)' == 'Microsoft.VisualStudio.ManagedInterfaces.WCF' or
89+
'%(FileName)' == 'Microsoft.VisualStudio.OLE.Interop' or
90+
'%(FileName)' == 'Microsoft.VisualStudio.ProjectAggregator' or
91+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.10.0' or
92+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.8.0' or
93+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.9.0' or
94+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop' or
95+
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.10.0' or
96+
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.8.0' or
97+
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.9.0' or
98+
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop' or
99+
'%(FileName)' == 'Microsoft.VisualStudio.WCFReference.Interop' or
100+
'%(FileName)' == 'Microsoft.Data.ConnectionUI' or
101+
'%(FileName)' == 'Microsoft.VisualStudio.CoreUtility' or
102+
'%(FileName)' == 'Microsoft.VisualStudio.Data.Core' or
103+
'%(FileName)' == 'Microsoft.VisualStudio.Data' or
104+
'%(FileName)' == 'Microsoft.VisualStudio.Data.Framework' or
105+
'%(FileName)' == 'Microsoft.VisualStudio.Data.Services' or
106+
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Engine' or
107+
'%(FileName)' == 'Microsoft.VisualStudio.Editor' or
108+
'%(FileName)' == 'Microsoft.VisualStudio.ImageCatalog' or
109+
'%(FileName)' == 'Microsoft.VisualStudio.Imaging' or
110+
'%(FileName)' == 'Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime' or
111+
'%(FileName)' == 'Microsoft.VisualStudio.Language.Intellisense' or
112+
'%(FileName)' == 'Microsoft.VisualStudio.Language.StandardClassification' or
113+
'%(FileName)' == 'Microsoft.VisualStudio.Package.LanguageService.14.0' or
114+
'%(FileName)' == 'Microsoft.VisualStudio.QualityTools.Vsip' or
115+
'%(FileName)' == 'Microsoft.VisualStudio.Settings.14.0' or
116+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.14.0' or
117+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Design' or
118+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Immutable.10.0' or
119+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Immutable.11.0' or
120+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Immutable.12.0' or
121+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Immutable.14.0' or
122+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.11.0' or
123+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.12.0' or
124+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime' or
125+
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime' or
126+
'%(FileName)' == 'Microsoft.VisualStudio.Text.Data' or
127+
'%(FileName)' == 'Microsoft.VisualStudio.Text.Logic' or
128+
'%(FileName)' == 'Microsoft.VisualStudio.Text.UI' or
129+
'%(FileName)' == 'Microsoft.VisualStudio.Text.UI.Wpf' or
130+
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.11.0' or
131+
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.12.0' or
132+
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime' or
133+
'%(FileName)' == 'Microsoft.VisualStudio.TextTemplating.14.0' or
134+
'%(FileName)' == 'Microsoft.VisualStudio.TextTemplating.Interfaces.10.0' or
135+
'%(FileName)' == 'Microsoft.VisualStudio.TextTemplating.Interfaces.11.0' or
136+
'%(FileName)' == 'Microsoft.VisualStudio.TextTemplating.Interfaces.14.0' or
137+
'%(FileName)' == 'Microsoft.VisualStudio.TextTemplating.VSHost.14.0' or
138+
'%(FileName)' == 'Microsoft.VisualStudio.Utilities' or
139+
'%(FileName)' == 'Microsoft.VSSDK.UnitTestLibrary' or
140+
'%(FileName)' == 'Microsoft.Windows.Simulator.Client'
141+
"/>
142+
<VSIXSourceItem Remove="@(SuppressPackaging)" />
143+
</ItemGroup>
144+
<Message Text='Suppressed "%(SuppressPackaging.FileName)%(SuppressPackaging.Extension)" from being included in VSIX.' />
145+
</Target>
146+
</Project>

‎src/UnitTests/UnitTests.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
<HintPath>..\..\packages\EntryExitDecorator.Fody.0.3.0\lib\net45\EntryExitDecoratorInterfaces.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
41+
<Reference Include="LibGit2Sharp">
42+
<HintPath>..\..\lib\LibGit2Sharp.dll</HintPath>
43+
</Reference>
4144
<Reference Include="Microsoft.Reactive.Testing, Version=2.2.5.0, Culture=neutral, PublicKeyToken=62aa029873c516b4, processorArchitecture=MSIL">
4245
<HintPath>..\..\packages\Rx-Testing.2.2.5-custom\lib\net45\Microsoft.Reactive.Testing.dll</HintPath>
4346
<Private>True</Private>
@@ -183,10 +186,6 @@
183186
<Project>{B4E665E5-6CAF-4414-A6E2-8DE1C3BCF203}</Project>
184187
<Name>Akavache_Net45</Name>
185188
</ProjectReference>
186-
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
187-
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
188-
<Name>LibGit2Sharp</Name>
189-
</ProjectReference>
190189
<ProjectReference Include="..\..\submodules\octokit.net\Octokit.Reactive\Octokit.Reactive.csproj">
191190
<Project>{674B69B8-0780-4D54-AE2B-C15821FA51CB}</Project>
192191
<Name>Octokit.Reactive</Name>

‎submodules/libgit2sharp‎

0 commit comments

Comments
 (0)