Merge with dev

.hgtags

@@ -6,3 +6,4 @@ f78cdbd81a75d21f3151c2d88d61cd715ba6ed1e 1.2.2
 9ea8bdae25a0cb952ce199d73e4b2cb123e44e53 v1.3.0
 8e823677b641a5321f5f43a2bc643c4b709c8cf6 v1.3.1
 79b45a7ad1f9b99a1df9d7b550ce7748d7791b81 v1.4
+7209e01a88a5b4e9848aea1d54af81075482f6fb 1.4.1

Lombiq.Vsix.Orchard/Constants/ExtensionVersion.cs

@@ -0,0 +1,7 @@
+namespace Lombiq.Vsix.Orchard.Constants
+{
+    internal static class ExtensionVersion
+    {
+        public const string Current = "1.4.2";
+    }
+}

Lombiq.Vsix.Orchard/Lombiq.Vsix.Orchard.csproj

@@ -214,6 +214,7 @@
     <Compile Include="Commands\InjectDependencyCommand.cs" />
     <Compile Include="Constants\CommandBarNames.cs" />
     <Compile Include="Constants\DependencyInjectorErrorCodes.cs" />
+    <Compile Include="Constants\ExtensionVersion.cs" />
     <Compile Include="Exceptions\DependencyToConstructorInjectorException.cs" />
     <Compile Include="Extensions\ServiceContainerExtensions.cs" />
     <Compile Include="Extensions\ServiceProviderExtensions.cs" />

Lombiq.Vsix.Orchard/LombiqOrchardVisualStudioExtensionPackage.cs

@@ -10,6 +10,7 @@
 using System.ComponentModel.Design;
 using System.Runtime.InteropServices;
 using System.Threading;
+using Task = System.Threading.Tasks.Task;
 
 namespace Lombiq.Vsix.Orchard
 {
@@ -19,22 +20,26 @@ namespace Lombiq.Vsix.Orchard
     [ProvideService(typeof(ILogFileWatcher), IsAsyncQueryable = true)]
     [ProvideAutoLoad(VSConstants.UICONTEXT.SolutionExists_string, PackageAutoLoadFlags.BackgroundLoad)]
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [InstalledProductRegistration("#LombiqOrchardVisualStudioExtensionName", "#LombiqOrchardVisualStudioExtensionDescription", "1.0", IconResourceID = 400)]
+    [InstalledProductRegistration(
+        // Such values can supposedly come from resx files (see: https://docs.microsoft.com/en-us/visualstudio/extensibility/creating-an-extension-with-a-vspackage?view=vs-2019)
+        // but that code doesn't work.
+        "Lombiq Orchard Visual Studio Extension", 
+        "Visual Studio extension with many features frequently used by Lombiq developers. Contains Orchard-related as well as generic goodies.",
+        ExtensionVersion.Current,
+        IconResourceID = 400)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideOptionPage(typeof(LogWatcherOptionsPage), "Lombiq Orchard Visual Studio Extension", "Orchard Log Watcher", 120, 121, true)]
     [Guid(PackageGuids.LombiqOrchardVisualStudioExtensionPackageGuidString)]
     public sealed class LombiqOrchardVisualStudioExtensionPackage : AsyncPackage, ILogWatcherSettingsAccessor
     {
-        protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
+        protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
-            await base.InitializeAsync(cancellationToken, progress);
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
 
             RegisterServices();
 
             InjectDependencyCommand.Initialize(this);
             OpenErrorLogCommand.Initialize(this);
-
-            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
         }
 
         protected override void Dispose(bool disposing)

Lombiq.Vsix.Orchard/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
-using System;
+using Lombiq.Vsix.Orchard.Constants;
+using System;
 using System.Reflection;
 using System.Resources;
 using System.Runtime.InteropServices;
@@ -28,8 +29,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.4.1")]
-[assembly: AssemblyFileVersion("1.4.1")]
+[assembly: AssemblyVersion(ExtensionVersion.Current)]
+[assembly: AssemblyFileVersion(ExtensionVersion.Current)]
 
 
 

Lombiq.Vsix.Orchard/Readme.md

@@ -4,7 +4,7 @@
 
 Visual Studio extension with many features frequently used by  [Lombiq](https://lombiq.com/) developers. Contains [Orchard](https://orchardproject.net/)-related (including Orchard Core) as well as generic goodies.
 
-The extension can also be installed from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=LombiqVisualStudioExtension.LombiqOrchardVisualStudioExtension), including installing directly from inside Visual Studio from under Tools > Extensions and Updates.
+The extension can also be installed from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=LombiqVisualStudioExtension.LombiqOrchardVisualStudioExtension), including installing directly from inside Visual Studio from under Extensions > Manage Extensions.
 
 
 ## Tools
@@ -27,6 +27,8 @@ This project is developed by [Lombiq Technologies Ltd](http://lombiq.com/). Comm
 
 ## Release notes
 
+- 1.4.2, 06.11.2019
+    - Fixing Visual Studio 2017 incompatibility issues.
 - 1.4.1, 20.10.2019
     - Fixing incompatibility issues with Visual Studio 2019.
 - 1.4, 17.06.2019
@@ -55,7 +57,7 @@ This project is developed by [Lombiq Technologies Ltd](http://lombiq.com/). Comm
     - New Orchard Error Log Watcher feature.
 - 1.1, 18.03.2017
     - The Dependency Injector tool now creates the constructor if it doesn't exist (i.e. it can be used even if there's no constructor already).
-    - `IEnumerable<T>` and other generic types are handled when generating injected dependency names; e.g. for `IEnumerable<IDependency>` the field name `_dependencies` will be generated.
+    - `IEnumerable<T>` and other generic types are handled when generating injected dependency names; e.g. for `IEnumerable<IDependency>` the field name `_dependencies` will be generated.
 - 1.0, 24.05.2016
     - Dependency Injector tool
     - Templates for content part, shape template, injected dependency, Orchard 1.9 and 1.10 module

Lombiq.Vsix.Orchard/VSPackage.resx

@@ -132,10 +132,4 @@
   <data name="Lombiq" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Lombiq.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="LombiqOrchardVisualStudioExtensionDescription" xml:space="preserve">
-    <value>Visual Studio extension with many features frequently used by Lombiq developers. Contains Orchard-related as well as generic goodies.</value>
-  </data>
-  <data name="LombiqOrchardVisualStudioExtensionName" xml:space="preserve">
-    <value>Lombiq Orchard Visual Studio Extension</value>
-  </data>
 </root>

Lombiq.Vsix.Orchard/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="1a2f7a53-92bd-4396-b49c-98a9bfcc1d41" Version="1.4.1" Language="en-US" Publisher="Lombiq Technologies" />
+        <Identity Id="1a2f7a53-92bd-4396-b49c-98a9bfcc1d41" Version="1.4.2" Language="en-US" Publisher="Lombiq Technologies" />
         <DisplayName>Lombiq Orchard Visual Studio Extension</DisplayName>
         <Description xml:space="preserve">Visual Studio extension with many features and templates frequently used by Lombiq developers. Contains Orchard-related as well as generic goodies.</Description>
         <MoreInfo>https://github.com/Lombiq/Lombiq-Visual-Studio-Extension</MoreInfo>

Readme.md

@@ -4,7 +4,7 @@
 ![image.png](Logos/Logo.png)
 
 
-Visual Studio extension with many features and templates frequently used by  [Lombiq](https://lombiq.com/) developers. Contains [Orchard](http://orchardproject.net/)-related (including Orchard Core) as well as generic goodies.
+Visual Studio extension with many features and templates frequently used by  [Lombiq](https://lombiq.com/) developers. Contains [Orchard](https://orchardproject.net/)-related (including Orchard Core) as well as generic goodies.
 
 Check out the [extension's Readme](Lombiq.Vsix.Orchard/Readme.md) for more info (it's there and not in the root of the repository so it's also accessible from inside VS).