11using System ;
22using System . ComponentModel . Composition ;
3- using System . Diagnostics ;
43using System . Runtime . InteropServices ;
54using System . Threading ;
65using System . Threading . Tasks ;
2423namespace GitHub . VisualStudio
2524{
2625 [ PackageRegistration ( UseManagedResourcesOnly = true , AllowsBackgroundLoading = true ) ]
27- [ InstalledProductRegistration ( "#110" , "#112" , System . AssemblyVersionInformation . Version , IconResourceID = 400 ) ]
26+ [ InstalledProductRegistration ( "#110" , "#112" , AssemblyVersionInformation . Version , IconResourceID = 400 ) ]
2827 [ Guid ( Guids . guidGitHubPkgString ) ]
2928 [ ProvideMenuResource ( "Menus.ctmenu" , 1 ) ]
3029 // Only initialize when we're in the context of a Git repository.
@@ -35,7 +34,6 @@ public class GitHubPackage : AsyncPackage
3534 {
3635 static readonly ILogger log = LogManager . ForContext < GitHubPackage > ( ) ;
3736
38- [ System . Diagnostics . CodeAnalysis . SuppressMessage ( "Microsoft.Performance" , "CA1823:AvoidUnusedPrivateFields" ) ]
3937 readonly IServiceProvider serviceProvider ;
4038
4139 public GitHubPackage ( )
@@ -116,35 +114,8 @@ public GHClient(IProgram program)
116114 public sealed class ServiceProviderPackage : AsyncPackage , IServiceProviderPackage , IGitHubToolWindowManager
117115 {
118116 public const string ServiceProviderPackageId = "D5CE1488-DEDE-426D-9E5B-BFCCFBE33E53" ;
119- const string StartPagePreview4PackageId = "3b764d23-faf7-486f-94c7-b3accc44a70d" ;
120- const string StartPagePreview5PackageId = "3b764d23-faf7-486f-94c7-b3accc44a70e" ;
121117 static readonly ILogger log = LogManager . ForContext < ServiceProviderPackage > ( ) ;
122118
123- Version vsversion ;
124- Version VSVersion
125- {
126- get
127- {
128- if ( vsversion == null )
129- {
130- var asm = typeof ( ITaskList ) . Assembly ;
131- try
132- {
133- // this will return Microsoft.VisualStudio.Shell.Immutable.14.0 in VS15
134- // but Microsoft.VisualStudio.Shell.Framework in Dev15
135- var vinfo = FileVersionInfo . GetVersionInfo ( asm . Location ) ;
136- vsversion = new Version ( vinfo . FileMajorPart , vinfo . FileMinorPart , vinfo . FileBuildPart , vinfo . FilePrivatePart ) ;
137- }
138- catch
139- {
140- // something wrong, fallback to assembly version
141- vsversion = asm . GetName ( ) . Version ;
142- }
143- }
144- return vsversion ;
145- }
146- }
147-
148119 protected override Task InitializeAsync ( CancellationToken cancellationToken , IProgress < ServiceProgressData > progress )
149120 {
150121 AddService ( typeof ( IGitHubServiceProvider ) , CreateService , true ) ;
0 commit comments