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

Commit

Permalink
Merge branch 'shana/fix-packaging' into beta-1.0.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@shana
shana committed Aug 12, 2015
2 parents 0eac63f + 5b45c32 commit c4fc33a
Show file tree
Hide file tree
Showing 10 changed files with 167 additions and 25 deletions.
Binary file added lib/LibGit2Sharp.dll
View file
Binary file not shown.
7 changes: 3 additions & 4 deletions src/GitHub.App/GitHub.App.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
<DelaySign>false</DelaySign>
</PropertyGroup>
<ItemGroup>
<Reference Include="LibGit2Sharp, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\lib\LibGit2Sharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.TeamFoundation.Git.Controls, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\lib\Microsoft.TeamFoundation.Git.Controls.dll</HintPath>
<Private>False</Private>
Expand Down Expand Up @@ -209,10 +212,6 @@
<Name>Akavache_Net45</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
<Name>LibGit2Sharp</Name>
</ProjectReference>
<ProjectReference Include="..\..\submodules\octokit.net\Octokit.Reactive\Octokit.Reactive.csproj">
<Project>{674b69b8-0780-4d54-ae2b-c15821fa51cb}</Project>
<Name>Octokit.Reactive</Name>
Expand Down
7 changes: 3 additions & 4 deletions src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,9 @@
<Name>Akavache_Net45</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
<Name>LibGit2Sharp</Name>
</ProjectReference>
<Reference Include="LibGit2Sharp, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\lib\LibGit2Sharp.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj">
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
<Name>Octokit</Name>
Expand Down
7 changes: 3 additions & 4 deletions src/GitHub.Exports/GitHub.Exports.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>false</EmbedInteropTypes>
</Reference>
<Reference Include="LibGit2Sharp, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\lib\LibGit2Sharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.TeamFoundation.Controls, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\lib\\Microsoft.TeamFoundation.Controls.dll</HintPath>
<Private>False</Private>
Expand Down Expand Up @@ -136,10 +139,6 @@
<Compile Include="ViewModels\IViewModel.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
<Name>LibGit2Sharp</Name>
</ProjectReference>
<ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj">
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
<Name>Octokit</Name>
Expand Down
5 changes: 5 additions & 0 deletions src/GitHub.Exports/Services/Services.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,10 @@ public static Repository GetRepoFromIGit(this IGitRepositoryInfo repoInfo)
return null;
return new Repository(repoPath);
}

public static UriString GetUriFromRepository(this IGitRepositoryInfo repoInfo)
{
return repoInfo.GetRepoFromIGit()?.GetUri();
}
}
}
3 changes: 1 addition & 2 deletions src/GitHub.VisualStudio/Base/TeamExplorerItemBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ protected virtual void RepoChanged()
var repo = ActiveRepo;
if (repo != null)
{
var gitRepo = repo.GetRepoFromIGit();
var uri = gitRepo?.GetUri();
var uri = repo.GetUriFromRepository();
var name = uri?.RepositoryName;
if (name != null)
{
Expand Down
8 changes: 2 additions & 6 deletions src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
<StartArguments>/rootsuffix Exp</StartArguments>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<ZipPackageCompressionLevel>Normal</ZipPackageCompressionLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -396,12 +397,6 @@
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
</ProjectReference>
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
<Name>LibGit2Sharp</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bDebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
</ProjectReference>
<ProjectReference Include="..\..\submodules\octokit.net\Octokit.Reactive\Octokit.Reactive.csproj">
<Project>{674b69b8-0780-4d54-ae2b-c15821fa51cb}</Project>
<Name>Octokit.Reactive</Name>
Expand Down Expand Up @@ -512,6 +507,7 @@
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="packaging.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
Expand Down
146 changes: 146 additions & 0 deletions src/GitHub.VisualStudio/packaging.targets
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="RemoveVSSDKAssemblies"
AfterTargets="GetVsixSourceItems">
<ItemGroup>
<SuppressPackaging Include="@(VSIXSourceItem)"
Condition="
'%(FileName)' == 'EnvDTE' or
'%(FileName)' == 'EnvDTE80' or
'%(FileName)' == 'Microsoft.Build.Conversion.Core' or
'%(FileName)' == 'Microsoft.Build' or
'%(FileName)' == 'Microsoft.Build.Engine' or
'%(FileName)' == 'Microsoft.Build.Framework' or
'%(FileName)' == 'Microsoft.Build.Tasks.Core' or
'%(FileName)' == 'Microsoft.Build.Utilities.Core' or
'%(FileName)' == 'Microsoft.CodeAnalysis.CSharp.Desktop' or
'%(FileName)' == 'Microsoft.CodeAnalysis.CSharp' or
'%(FileName)' == 'Microsoft.CodeAnalysis.Desktop' or
'%(FileName)' == 'Microsoft.CodeAnalysis' or
'%(FileName)' == 'Microsoft.CSharp' or
'%(FileName)' == 'Microsoft.MSXML' or
'%(FileName)' == 'Microsoft.VisualStudio.CommonIDE' or
'%(FileName)' == 'Microsoft.VisualStudio.ComponentModelHost' or
'%(FileName)' == 'Microsoft.VisualStudio.Diagnostics.Assert' or
'%(FileName)' == 'Microsoft.VisualStudio.ExtensibilityHosting' or
'%(FileName)' == 'Microsoft.VisualStudio.GraphModel' or
'%(FileName)' == 'Microsoft.VisualStudio.TemplateWizardInterface' or
'%(FileName)' == 'Microsoft.VisualStudio.Text.Internal' or
'%(FileName)' == 'microsoft.visualstudio.vcprojectengine' or
'%(FileName)' == 'Microsoft.VisualStudio.VSHelp' or
'%(FileName)' == 'Microsoft.VisualStudio.VSHelp80' or
'%(FileName)' == 'mscorlib' or
'%(FileName)' == 'stdole' or
'%(FileName)' == 'System' or
'%(FileName)' == 'System.Collections.Concurrent' or
'%(FileName)' == 'System.Collections' or
'%(FileName)' == 'System.Collections.Immutable' or
'%(FileName)' == 'System.Composition.AttributedModel' or
'%(FileName)' == 'System.Composition.Convention' or
'%(FileName)' == 'System.Composition.Hosting' or
'%(FileName)' == 'System.Composition.Runtime' or
'%(FileName)' == 'System.Composition.TypedParts' or
'%(FileName)' == 'System.Core' or
'%(FileName)' == 'System.Data.DataSetExtensions' or
'%(FileName)' == 'System.Data' or
'%(FileName)' == 'System.Net.Http' or
'%(FileName)' == 'System.Xml' or
'%(FileName)' == 'System.Xml.Linq' or
'%(FileName)' == 'System.Diagnostics.Debug' or
'%(FileName)' == 'System.Diagnostics.Tools' or
'%(FileName)' == 'System.Diagnostics.Tracing' or
'%(FileName)' == 'System.Dynamic.Runtime' or
'%(FileName)' == 'System.Globalization' or
'%(FileName)' == 'System.IO' or
'%(FileName)' == 'System.Linq' or
'%(FileName)' == 'System.Reflection' or
'%(FileName)' == 'System.Reflection.Extensions' or
'%(FileName)' == 'System.Reflection.Metadata' or
'%(FileName)' == 'System.Reflection.Primitives' or
'%(FileName)' == 'System.Resources.ResourceManager' or
'%(FileName)' == 'System.Runtime' or
'%(FileName)' == 'System.Runtime.Extensions' or
'%(FileName)' == 'System.Text.Encoding' or
'%(FileName)' == 'System.Text.Encoding.Extensions' or
'%(FileName)' == 'System.Threading' or
'%(FileName)' == 'System.Threading.Tasks.Dataflow' or
'%(FileName)' == 'System.Threading.Tasks' or
'%(FileName)' == 'VSLangProj' or
'%(FileName)' == 'VSLangProj2' or
'%(FileName)' == 'VSLangProj80' or
'%(FileName)' == 'Microsoft.VisualStudio.ProjectSystem.v14only' or
'%(FileName)' == 'Microsoft.VisualStudio.ProjectSystem.VS.V14Only' or
'%(FileName)' == 'Microsoft.VisualStudio.ProjectSystem.Utilities.v14.0' or
'%(FileName)' == 'Microsoft.VisualStudio.ProjectSystem.Interop' or
'%(FileName)' == 'Microsoft.VisualStudio.Threading' or
'%(FileName)' == 'Microsoft.VisualStudio.Validation' or
'%(FileName)' == 'Microsoft.VisualStudio.Composition' or
'%(FileName)' == 'Microsoft.VisualStudio.Composition.Configuration' or
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Interop.10.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Interop.11.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Interop.12.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Interop.14.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Interop' or
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.InteropA' or
'%(FileName)' == 'Microsoft.VisualStudio.Designer.Interfaces' or
'%(FileName)' == 'Microsoft.VisualStudio.ManagedInterfaces.9.0' or
'%(FileName)' == 'Microsoft.VisualStudio.ManagedInterfaces' or
'%(FileName)' == 'Microsoft.VisualStudio.ManagedInterfaces.WCF' or
'%(FileName)' == 'Microsoft.VisualStudio.OLE.Interop' or
'%(FileName)' == 'Microsoft.VisualStudio.ProjectAggregator' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.10.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.8.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.9.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop' or
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.10.0' or
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.8.0' or
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.9.0' or
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop' or
'%(FileName)' == 'Microsoft.VisualStudio.WCFReference.Interop' or
'%(FileName)' == 'Microsoft.Data.ConnectionUI' or
'%(FileName)' == 'Microsoft.VisualStudio.CoreUtility' or
'%(FileName)' == 'Microsoft.VisualStudio.Data.Core' or
'%(FileName)' == 'Microsoft.VisualStudio.Data' or
'%(FileName)' == 'Microsoft.VisualStudio.Data.Framework' or
'%(FileName)' == 'Microsoft.VisualStudio.Data.Services' or
'%(FileName)' == 'Microsoft.VisualStudio.Debugger.Engine' or
'%(FileName)' == 'Microsoft.VisualStudio.Editor' or
'%(FileName)' == 'Microsoft.VisualStudio.ImageCatalog' or
'%(FileName)' == 'Microsoft.VisualStudio.Imaging' or
'%(FileName)' == 'Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime' or
'%(FileName)' == 'Microsoft.VisualStudio.Language.Intellisense' or
'%(FileName)' == 'Microsoft.VisualStudio.Language.StandardClassification' or
'%(FileName)' == 'Microsoft.VisualStudio.Package.LanguageService.14.0' or
'%(FileName)' == 'Microsoft.VisualStudio.QualityTools.Vsip' or
'%(FileName)' == 'Microsoft.VisualStudio.Settings.14.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.14.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Design' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Immutable.10.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Immutable.11.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Immutable.12.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Immutable.14.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.11.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.12.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime' or
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime' or
'%(FileName)' == 'Microsoft.VisualStudio.Text.Data' or
'%(FileName)' == 'Microsoft.VisualStudio.Text.Logic' or
'%(FileName)' == 'Microsoft.VisualStudio.Text.UI' or
'%(FileName)' == 'Microsoft.VisualStudio.Text.UI.Wpf' or
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.11.0' or
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.12.0' or
'%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime' or
'%(FileName)' == 'Microsoft.VisualStudio.TextTemplating.14.0' or
'%(FileName)' == 'Microsoft.VisualStudio.TextTemplating.Interfaces.10.0' or
'%(FileName)' == 'Microsoft.VisualStudio.TextTemplating.Interfaces.11.0' or
'%(FileName)' == 'Microsoft.VisualStudio.TextTemplating.Interfaces.14.0' or
'%(FileName)' == 'Microsoft.VisualStudio.TextTemplating.VSHost.14.0' or
'%(FileName)' == 'Microsoft.VisualStudio.Utilities' or
'%(FileName)' == 'Microsoft.VSSDK.UnitTestLibrary' or
'%(FileName)' == 'Microsoft.Windows.Simulator.Client'
"/>
<VSIXSourceItem Remove="@(SuppressPackaging)" />
</ItemGroup>
<Message Text='Suppressed "%(SuppressPackaging.FileName)%(SuppressPackaging.Extension)" from being included in VSIX.' />
</Target>
</Project>
7 changes: 3 additions & 4 deletions src/UnitTests/UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
<HintPath>..\..\packages\EntryExitDecorator.Fody.0.3.0\lib\net45\EntryExitDecoratorInterfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="LibGit2Sharp">
<HintPath>..\..\lib\LibGit2Sharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Reactive.Testing, Version=2.2.5.0, Culture=neutral, PublicKeyToken=62aa029873c516b4, processorArchitecture=MSIL">
<HintPath>..\..\packages\Rx-Testing.2.2.5-custom\lib\net45\Microsoft.Reactive.Testing.dll</HintPath>
<Private>True</Private>
Expand Down Expand Up @@ -183,10 +186,6 @@
<Project>{B4E665E5-6CAF-4414-A6E2-8DE1C3BCF203}</Project>
<Name>Akavache_Net45</Name>
</ProjectReference>
<ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
<Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
<Name>LibGit2Sharp</Name>
</ProjectReference>
<ProjectReference Include="..\..\submodules\octokit.net\Octokit.Reactive\Octokit.Reactive.csproj">
<Project>{674B69B8-0780-4D54-AE2B-C15821FA51CB}</Project>
<Name>Octokit.Reactive</Name>
Expand Down
2 changes: 1 addition & 1 deletion submodules/libgit2sharp
Submodule libgit2sharp updated 1 files
+1 −7 LibGit2Sharp/LibGit2Sharp.csproj

0 comments on commit c4fc33a

Please sign in to comment.