Fixed C++ projects processing regression. Updated DI 3rd party package.

sergey-visual-studio · Apr 26, 2020 · 6b2e392 · 6b2e392
1 parent 5110816
commit 6b2e392
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/DPackRx.Tests/DPackRx.Tests.csproj b/DPackRx.Tests/DPackRx.Tests.csproj
@@ -38,8 +38,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="LightInject, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LightInject.6.2.0\lib\net46\LightInject.dll</HintPath>
+    <Reference Include="LightInject, Version=6.3.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.6.3.2\lib\net46\LightInject.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.15.8.525\lib\net46\Microsoft.VisualStudio.CoreUtility.dll</HintPath>

diff --git a/DPackRx.Tests/packages.config b/DPackRx.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="4.4.0" targetFramework="net461" />
-  <package id="LightInject" version="6.2.0" targetFramework="net461" />
+  <package id="LightInject" version="6.3.2" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.8.525" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.ImageCatalog" version="15.9.28307" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.Imaging" version="15.9.28307" targetFramework="net461" />

diff --git a/DPackRx/DPackRx.csproj b/DPackRx/DPackRx.csproj
@@ -242,10 +242,10 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="JsParser.Core">
-      <HintPath>Libraries\JsParser.Core.dll</HintPath>
+      <HintPath>ThirdParties\JsParser.Core.dll</HintPath>
     </Reference>
-    <Reference Include="LightInject, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LightInject.6.2.0\lib\net46\LightInject.dll</HintPath>
+    <Reference Include="LightInject, Version=6.3.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LightInject.6.3.2\lib\net46\LightInject.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll</HintPath>
@@ -364,10 +364,12 @@
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Validation.15.5.31\lib\netstandard2.0\Microsoft.VisualStudio.Validation.dll</HintPath>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\VSSDK_VCProjectEngine.14.0.0\lib\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+    <Reference Include="Microsoft.VisualStudio.VCProjectEngine">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>ThirdParties\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>

diff --git a/DPackRx/Features/SupportOptions/SupportOptionsFirstTimeUse.cs b/DPackRx/Features/SupportOptions/SupportOptionsFirstTimeUse.cs
@@ -21,8 +21,7 @@ public class SupportOptionsFirstTimeUse : ISolutionEvents
 		private const string WELCOME = "Welcome";
 		private const string WELCOME_TEXT =
 			"Thank you for choosing {0}!  " +
-			"{0} features are accessible from Tools and editor context menu, and can be customized via Options dialog.  " +
-			"Don't hesitate to contact support if you have any questions or run into any issues.";
+			"{0} features are accessible from Tools and editor context menu, and can be customized via Options dialog.";
 
 		#endregion
 

diff --git a/DPackRx/Package/Beta.cs b/DPackRx/Package/Beta.cs
@@ -8,7 +8,7 @@ namespace DPackRx.Package
 	/// </summary>
 	internal static class Beta
 	{
-		public static readonly DateTime ExpirationDate = new DateTime(2020, 5, 25).AddHours(12);
+		public static readonly DateTime ExpirationDate = new DateTime(2020, 6, 1).AddHours(12);
 	}
 #endif
 }
diff --git a/DPackRx/Libraries/JsParser.Core.dll → DPackRx/ThirdParties/JsParser.Core.dll b/DPackRx/Libraries/JsParser.Core.dll → DPackRx/ThirdParties/JsParser.Core.dll
diff --git a/.../Libraries/Microsoft.JScript.Compiler.dll → ...irdParties/Microsoft.JScript.Compiler.dll b/.../Libraries/Microsoft.JScript.Compiler.dll → ...irdParties/Microsoft.JScript.Compiler.dll
diff --git a/DPackRx/ThirdParties/Microsoft.VisualStudio.VCProjectEngine.dll b/DPackRx/ThirdParties/Microsoft.VisualStudio.VCProjectEngine.dll
diff --git a/DPackRx/packages.config b/DPackRx/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LightInject" version="6.2.0" targetFramework="net461" />
+  <package id="LightInject" version="6.3.2" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.ComponentModelHost" version="15.8.525" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.8.525" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.ImageCatalog" version="15.9.28307" targetFramework="net461" />
@@ -49,5 +49,4 @@
   <package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net461" />
   <package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net461" />
   <package id="VSSDK.VSLangProj" version="7.0.4" targetFramework="net461" />
-  <package id="VSSDK_VCProjectEngine" version="14.0.0" targetFramework="net461" />
 </packages>
diff --git a/DPackRx/source.extension.vsixmanifest b/DPackRx/source.extension.vsixmanifest
@@ -23,7 +23,7 @@
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6.1,)" />
     </Dependencies>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.9.28307.53,17.0)" DisplayName="Visual Studio core editor" />
-        <Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[15.9.28307.53,17.0)" DisplayName=".NET desktop development tools" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,17.0)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites" Version="[15.0,17.0)" DisplayName=".NET desktop development tools" />
     </Prerequisites>
 </PackageManifest>