Converted to asyncpackage with background load

madskristensen · Mar 27, 2018 · 15b44ec · 15b44ec
1 parent 8d14326
commit 15b44ec
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 23 deletions.
diff --git a/BrowserReloadOnSave.sln b/BrowserReloadOnSave.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27522.3005
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserReloadOnSave", "src\BrowserReloadOnSave.csproj", "{0920B3C4-E178-43B5-B316-8C06649A52F8}"
 EndProject
@@ -25,4 +25,7 @@ Global
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE
  EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {080FC637-E8BC-409A-86B8-425AA1A0BA33}
+ EndGlobalSection
 EndGlobal
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-os: Visual Studio 2015
+os: Visual Studio 2017
 
 install:
  - ps: (new-object Net.WebClient).DownloadString("https://raw.github.com/madskristensen/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex

diff --git a/src/BrowserLink/ReloadFactory.cs b/src/BrowserLink/ReloadFactory.cs
@@ -39,7 +39,7 @@ public BrowserLinkExtension CreateExtensionInstance(BrowserLinkConnection connec
 
  public string GetScript()
  {
- using (var stream = GetType().Assembly.GetManifestResourceStream("BrowserReloadOnSave.BrowserLink.Reload.js"))
+ using (Stream stream = GetType().Assembly.GetManifestResourceStream("BrowserReloadOnSave.BrowserLink.Reload.js"))
  using (var reader = new StreamReader(stream))
  {
  return reader.ReadToEnd();
@@ -57,7 +57,7 @@ static void _solutionEvents_ProjectRemoved(Project Project)
 
  static void SolutionEvents_AfterClosing()
  {
- foreach (var project in Extensions.Keys)
+ foreach (Project project in Extensions.Keys)
  {
  Extensions[project].Dispose();
  }

diff --git a/src/BrowserReloadOnSave.csproj b/src/BrowserReloadOnSave.csproj
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http:https://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
+ <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.props')" />
  <PropertyGroup>
- <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+ <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
  <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
  <StartAction>Program</StartAction>
  <StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
  <StartArguments>/rootsuffix Exp</StartArguments>
  <UseCodebase>true</UseCodebase>
  <VsixType>v3</VsixType>
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
  </PropertyGroup>
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
@@ -227,10 +229,10 @@
  <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:https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
  </PropertyGroup>
- <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props'))" />
- <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
+ <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.props'))" />
+ <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets'))" />
  </Target>
- <Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.12-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
+ <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets')" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">

diff --git a/src/VSPackage.cs b/src/VSPackage.cs
@@ -7,12 +7,12 @@
 
 namespace BrowserReloadOnSave
 {
- [PackageRegistration(UseManagedResourcesOnly = true)]
+ [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
  [InstalledProductRegistration("#110", "#112", Vsix.Version, IconResourceID = 400)]
  [ProvideMenuResource("Menus.ctmenu", 1)]
  [ProvideOptionPage(typeof(Options), "Web", Vsix.Name, 101, 102, true, new string[0], ProvidesLocalizedCategoryName = false)]
- [ProvideAutoLoad(ActivationContextGuid)]
- [ProvideUIContextRule(ActivationContextGuid, "Load Package",
+ [ProvideAutoLoad(_activationContextGuid, PackageAutoLoadFlags.BackgroundLoad)]
+ [ProvideUIContextRule(_activationContextGuid, "Load Package",
  "WAP | WebSite | ProjectK | DotNetCoreWeb",
  new string[] {
  "WAP",
@@ -29,7 +29,7 @@ namespace BrowserReloadOnSave
  [Guid(PackageGuids.guidBrowserReloadPackageString)]
  public sealed class VSPackage : AsyncPackage
  {
- private const string ActivationContextGuid = "{4b6c8d76-4918-45aa-9b26-8f246c1773aa}";
+ private const string _activationContextGuid = "{4b6c8d76-4918-45aa-9b26-8f246c1773aa}";
 
  public static Options Options
  {
@@ -39,13 +39,12 @@ public static Options Options
 
  protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
  {
- Options = (Options)GetDialogPage(typeof(Options));
  var commandService = await GetServiceAsync(typeof(IMenuCommandService)) as OleMenuCommandService;
 
- if (commandService != null)
- {
-  EnableReloadCommand.Initialize(this, commandService);
- }
+ await JoinableTaskFactory.SwitchToMainThreadAsync();
+
+ Options = (Options)GetDialogPage(typeof(Options));
+ EnableReloadCommand.Initialize(this, commandService);
  }
  }
 }
diff --git a/src/packages.config b/src/packages.config
@@ -2,7 +2,6 @@
 <packages>
  <package id="Microsoft.VisualStudio.Imaging" version="14.3.25407" targetFramework="net451" />
  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net451" />
- <package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.0.12-pre" targetFramework="net451" developmentDependency="true" />
  <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net451" />
  <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net451" />
  <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net451" />
@@ -19,4 +18,5 @@
  <package id="Microsoft.VisualStudio.Threading" version="14.1.131" targetFramework="net451" />
  <package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net451" />
  <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net451" />
+ <package id="Microsoft.VSSDK.BuildTools" version="15.6.170" targetFramework="net451" developmentDependency="true" />
 </packages>
diff --git a/src/source.extension.cs b/src/source.extension.cs
@@ -1,6 +1,6 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
-// This file was generated by Extensibility Tools v1.10.188
+// This file was generated by Extensibility Tools v1.10.198
 // </auto-generated>
 // ------------------------------------------------------------------------------
 namespace BrowserReloadOnSave
@@ -11,7 +11,7 @@ static class Vsix
  public const string Name = "Browser Reload on Save";
  public const string Description = @"A Visual Studio extension for ASP.NET projects that leverages Browser Link to to reload all connected browsers when files are saved in Visual Studio.";
  public const string Language = "en-US";
- public const string Version = "1.0";
+ public const string Version = "1.1";
  public const string Author = "Mads Kristensen";
  public const string Tags = "Browser Link, ASP.NET, Reload, JavaScript";
  }

diff --git a/src/source.extension.vsixmanifest b/src/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http:https://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http:https://schemas.microsoft.com/developer/vsx-schema-design/2011">
  <Metadata>
- <Identity Id="2d8aa02a-8810-421f-97b9-86efc573fea3" Version="1.0" Language="en-US" Publisher="Mads Kristensen" />
+ <Identity Id="2d8aa02a-8810-421f-97b9-86efc573fea3" Version="1.1" Language="en-US" Publisher="Mads Kristensen" />
  <DisplayName>Browser Reload on Save</DisplayName>
  <Description xml:space="preserve">A Visual Studio extension for ASP.NET projects that leverages Browser Link to to reload all connected browsers when files are saved in Visual Studio.</Description>
  <MoreInfo>https://github.com/madskristensen/BrowserReloadOnSave</MoreInfo>