Merge branch 'vs2019' into updates-from-downstream

lukesdm · Oct 26, 2020 · 573541c · 573541c
2 parents 72f7aab + cdbb774
commit 573541c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 23 deletions.
diff --git a/ImageCommentsExtension/CommentImage.cs b/ImageCommentsExtension/CommentImage.cs
@@ -24,7 +24,7 @@ public ImageAttributes()
             Opacity = 1.0;
         }
 
-        public override bool Equals(object obj)
+        public   bool IsEquals(object obj)
         {
             if (obj == null)
                 return false;

diff --git a/ImageCommentsExtension/ImageAdornmentManager.cs b/ImageCommentsExtension/ImageAdornmentManager.cs
@@ -152,7 +152,7 @@ private void CreateVisuals(ITextViewLine line, int lineNumber, string absFilenam
                 CommentImage image = Images.ContainsKey(lineNumber) ? Images[lineNumber] : null;
                 if (image != null)
                 {
-                    if (!image.Attributes.Equals(parsedImgData)) // URL different, so set new source
+                    if (!image.Attributes.IsEquals(parsedImgData)) // URL different, so set new source
                     {
                         image.TrySet(directory, parsedImgData, out loadingMessage, () => CreateVisuals(line, lineNumber, absFilename));
                     }

diff --git a/ImageCommentsExtension/ImageCommentsEditorComponent.csproj b/ImageCommentsExtension/ImageCommentsEditorComponent.csproj
@@ -5,6 +5,7 @@
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <UseCodebase>true</UseCodebase>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -24,7 +25,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LM.ImageComments</RootNamespace>
     <AssemblyName>ImageCommentsExtension</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -468,11 +469,6 @@
         <Reference Include="System.Net.Http">
           <Paket>True</Paket>
         </Reference>
-        <Reference Include="StreamJsonRpc">
-          <HintPath>..\packages\StreamJsonRpc\lib\net45\StreamJsonRpc.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
       </ItemGroup>
     </When>
   </Choose>

diff --git a/ImageCommentsPackage/ImageCommentsPackage.csproj b/ImageCommentsPackage/ImageCommentsPackage.csproj
@@ -5,6 +5,7 @@
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <UseCodebase>true</UseCodebase>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -23,7 +24,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LM.ImageComments</RootNamespace>
     <AssemblyName>ImageComments</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
@@ -453,11 +454,6 @@
         <Reference Include="System.Net.Http">
           <Paket>True</Paket>
         </Reference>
-        <Reference Include="StreamJsonRpc">
-          <HintPath>..\packages\StreamJsonRpc\lib\net45\StreamJsonRpc.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
       </ItemGroup>
     </When>
   </Choose>

diff --git a/ImageCommentsPackage/app.config b/ImageCommentsPackage/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
 
   <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>
-    <assemblyIdentity name="Microsoft.VisualStudio.Validation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
+    <assemblyIdentity name="Microsoft.VisualStudio.Validation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+    <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0"/>
   </dependentAssembly>
 </assemblyBinding></runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
diff --git a/ImageCommentsPackage/source.extension.vsixmanifest b/ImageCommentsPackage/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="ImageComments.2980fb0d-ba9d-4373-9178-d27a98f0c9b1" Version="1.1.4.4" Language="en-US" Publisher="Luke McQuade, Lionsoft, Oleg K, Thomas P, Mark L." />
+        <Identity Id="ImageComments.2980fb0d-ba9d-4373-9178-d27a98f0c9b1" Version="1.2.0.0" Language="en-US" Publisher="Luke McQuade, Lionsoft, Oleg K, Thomas P, Mark L." />
         <DisplayName>ImageComments</DisplayName>
 
         <Description xml:space="preserve">Use images in code comments within Python, C#, C, C++, F#, DocFX and VB source files.
@@ -13,16 +13,16 @@ Written by Luke McQuade. Contributions by Lionsoft, Oleg K, Thomas P, Mark L.
         <Tags>image folding</Tags>
     </Metadata>
     <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,16.0)" />
-        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
-        <InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,17.0)" />
+        <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
+        <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,)" />
         <Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0]" />
     </Dependencies>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,17.0)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />

diff --git a/Output/ImageComments.vsix b/Output/ImageComments.vsix