From 3431138e2e9dc32e788e1c45b8b22b3f0465aa45 Mon Sep 17 00:00:00 2001
From: Robin <robin@getgreenshot.org>
Date: Thu, 13 Dec 2018 12:57:50 +0100
Subject: [PATCH] This change uses Microsoft.mshtml also for the net471 build
 via an unofficial nuget package, solving the issue that on Azure DevOps this
 file is not at the same location.

---
 .../Greenshot.Addon.Office.csproj                      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
index 1c5734ca4..67b7e1def 100644
--- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
+++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
@@ -12,15 +12,8 @@
     </None>
   </ItemGroup>
   
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net471'">
 	<Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -54,6 +47,9 @@
     <PackageReference Include="Microsoft.Office.Interop.PowerPoint" Version="15.0.4420.1017" />
     <PackageReference Include="Microsoft.Office.Interop.Word" Version="15.0.4797.1003" />
     <PackageReference Include="MicrosoftOfficeCore" Version="15.0.0" />
+    <PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </PackageReference>
     <PackageReference Include="Fody" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>