Merge pull request #7 from Enache-Ionut/master

fixed the deploy and added multiple errors support

Author: burcadoruciprian

src/RcStrings.VSIX/RcStrings.VSIX.csproj

@@ -30,6 +30,7 @@
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+	<VsSDKVersion>14.0</VsSDKVersion>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -38,6 +39,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DeployExtension>True</DeployExtension>
+    <CreateVsixContainer>True</CreateVsixContainer>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

src/RcStrings.VsPackage/EditStringResourceDialog.xaml.cs

@@ -103,7 +103,7 @@ public int ResourceId
       set => mResourceId = value;
     }
 
-    private Dictionary<string, string> Errors { get; } = new Dictionary<string, string>();
+    private Dictionary<string, List<string>> Errors { get; } = new Dictionary<string, List<string>>();
 
     private bool HasError => Errors.Any();
 
@@ -114,8 +114,6 @@ public int ResourceId
     public EditStringResourceDialog(IServiceProvider aServiceProvider, List<RcFile> aRcFiles, RcFile aSelectedRcFile,
       string aSelectedText, bool aReplaceCode, string aReplaceWithCodeFormated, StringLine aStringResource = null)
     {
-      if (aRcFiles.Count == 0)
-        throw new Exception("No RC files detected");
       InitializeComponent();
       DataContext = this;
       mRcFilesContexts = new Dictionary<RcFile, StringResourceContext>();
@@ -165,7 +163,7 @@ private void btnAdd_Click(object sender, RoutedEventArgs e)
       }
       if (HasError)
       {
-        VsShellUtilities.ShowMessageBox(mServiceProvider, Errors.First().Value, "Invalid input",
+        VsShellUtilities.ShowMessageBox(mServiceProvider, Errors.First().Value.First(), "Invalid input",
           OLEMSGICON.OLEMSGICON_CRITICAL, OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);
         return;
       }
@@ -215,7 +213,8 @@ public string this[string PropertyName]
       get
       {
         CollectErrors();
-        return Errors.ContainsKey(PropertyName) ? Errors[PropertyName] : string.Empty;
+        return Errors.ContainsKey(PropertyName) ? 
+          String.Join("\n", Errors[PropertyName]) : string.Empty;
       }
     }
 
@@ -224,33 +223,43 @@ private void CollectErrors()
       Errors.Clear();
 
       if (string.IsNullOrEmpty(ResourceName) ||
-            ResourceName.Length > ParseConstants.kMaximumResourceNameLength ||
-            !ResourceName.StartsWith(TagConstants.kStringPreffix))
+        ResourceName.Length > ParseConstants.kMaximumResourceNameLength ||
+        !ResourceName.StartsWith(TagConstants.kStringPreffix))
       {
-        Errors.Add(nameof(ResourceName), 
-          string.Format("Name with the IDS_ prefix and maximum length of {0} is required!",
-          ParseConstants.kMaximumResourceNameLength));
+        if (!Errors.ContainsKey(nameof(ResourceName)))
+          Errors[nameof(ResourceName)] = new List<string>();
+
+        Errors[nameof(ResourceName)].Add(string.Format(
+          $"Name with the IDS_ prefix and maximum length of {ParseConstants.kMaximumResourceNameLength} is required!"));
       }
 
       if(AddMode && (string.IsNullOrEmpty(ResourceName) ||
         ResourceContext.ResourceNameExists(ResourceName)))
       {
-        Errors.Add(nameof(ResourceName), string.Format("Name \"{0}\" already exists!", ResourceName));
+        if (!Errors.ContainsKey(nameof(ResourceName)))
+          Errors[nameof(ResourceName)] = new List<string>();
+
+        Errors[nameof(ResourceName)].Add(string.Format($"Name \"{ResourceName}\" already exists!"));
       }
 
       if (string.IsNullOrEmpty(ResourceIdTemp) ||
-            !ParseUtility.TransformToDecimal(ResourceIdTemp, out mResourceId) ||
-            mResourceId < 0 || mResourceId > IdGenerator.kMaximumId)
+        !ParseUtility.TransformToDecimal(ResourceIdTemp, out mResourceId) ||
+        mResourceId < 0 || mResourceId > IdGenerator.kMaximumId)
       {
-        Errors.Add(nameof(ResourceIdTemp),
-          string.Format("Positive id less then {0} is required!", IdGenerator.kMaximumId));
+        if (!Errors.ContainsKey(nameof(ResourceIdTemp)))
+          Errors[nameof(ResourceIdTemp)] = new List<string>();
+
+        Errors[nameof(ResourceIdTemp)].Add(string.Format($"Positive id less then {IdGenerator.kMaximumId} is required!"));
       }
+
       if (string.IsNullOrEmpty(ResourceValue) || 
         ResourceValue.Length > ParseConstants.kMaximumResourceValueLength)
       {
-        Errors.Add(nameof(ResourceValue), 
-          string.Format("Value with maximum length of {0} characters is required!", 
-          ParseConstants.kMaximumResourceValueLength));
+        if (!Errors.ContainsKey(nameof(ResourceValue)))
+          Errors[nameof(ResourceValue)] = new List<string>();
+
+        Errors[nameof(ResourceValue)].Add(
+          string.Format($"Value with maximum length of {ParseConstants.kMaximumResourceValueLength} characters is required!"));
       }
     }
     #endregion

src/RcStrings.VsPackage/Properties/Settings.Designer.cs

@@ -11,7 +11,6 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>14.0</OldToolsVersion>
-    <VsSDKVersion>14.0</VsSDKVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -54,6 +53,7 @@
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <VsSDKVersion>14.0</VsSDKVersion>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -125,6 +125,7 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>C:\Program Files (x86)\Common Files\Microsoft Shared\MSEnv\PublicAssemblies\envdte90.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Build, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -186,15 +187,13 @@
     <Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="System" />
     <Reference Include="System.Design" />
     <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>

src/RcStrings.VsPackage/RcStrings.VsPackage.csproj

@@ -9,7 +9,6 @@
 using EnvDTE;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.VCProjectEngine;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Design;
@@ -18,6 +17,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Interop;
+using Microsoft.Build.Evaluation;
 
 namespace Caphyon.RcStrings.VsPackage
 {
@@ -224,6 +224,9 @@ private void SetResourceCommandClick(object sender, EventArgs e)
         }
       }
 
+      if (rcFiles.Count == 0)
+        throw new Exception("No RC files detected");
+
       EditStringResourceDialog dialog = new EditStringResourceDialog((IServiceProvider)this, rcFiles, 
         mSelectedRcFile, mSelectedWord, mReplaceString, mReplaceWithCodeFormated)
       {
@@ -353,27 +356,30 @@ private List<RcFile> GetRCFilesFromSolution()
       return rcFiles;
     }
 
-    private List<RcFile> GetRcFilesFromProject(Project aProject)
+    private List<RcFile> GetRcFilesFromProject(EnvDTE.Project aProject)
     {
-      if (!(aProject.Object is VCProject))
+      if (aProject.Kind != kCppProjectKind)
         return new List<RcFile>();
 
       var rcFiles = GetRcFiles(aProject.ProjectItems, string.Empty);
-      // Set Aditional Include Directories collection
-      VCProject vcProject = aProject.Object as VCProject;
+      if (rcFiles.Count == 0)
+        return rcFiles;
 
-      List<string> aditionalDirectories = new List<string>();
-      foreach (var toolObject in vcProject.ActiveConfiguration.Tools)
+      ProjectCollection projectCollection = new ProjectCollection();
+      var project = projectCollection.LoadProject(aProject.FullName);
+      HashSet<string> aditionalDirectories = new HashSet<string>();
+
+      // Set Aditional Include Directories collection
+      foreach (var item in project.Items)
       {
-        string aditionalDirsValue;
-        if (toolObject is VCResourceCompilerTool)
-          aditionalDirsValue = (toolObject as VCResourceCompilerTool).AdditionalIncludeDirectories;
-        else if (toolObject is VCCLCompilerTool)
-          aditionalDirsValue = (toolObject as VCCLCompilerTool).AdditionalIncludeDirectories;
-        else
+        if (item.ItemType != "ResourceComplile" && item.ItemType != "ClCompile")
           continue;
 
-        string[] aditionalDirs = aditionalDirsValue.Split(';');
+        var aditionalDirsProp = item.GetMetadata("AdditionalIncludeDirectories");
+        if (aditionalDirsProp == null)
+          continue;
+
+        string[] aditionalDirs = aditionalDirsProp.EvaluatedValue.Split(';');
         foreach (string dirRelativePath in aditionalDirs)
         {
           try
@@ -384,13 +390,13 @@ private List<RcFile> GetRcFilesFromProject(Project aProject)
             if (Directory.Exists(dirAbsolutePath))
               aditionalDirectories.Add(dirAbsolutePath);
           }
-          catch{ }
+          catch { }
         }
-
-        VCppProject project = new VCppProject(aProject);
-        project.AditionalIncludeDirectories.AddRange(aditionalDirectories);
-        rcFiles.ForEach(rcf => rcf.Project = project);
       }
+      VCppProject cppProject = new VCppProject(aProject);
+      cppProject.AditionalIncludeDirectories.AddRange(aditionalDirectories);
+      rcFiles.ForEach(rcf => rcf.Project = cppProject);
+
       return rcFiles;
     }
 

src/RcStrings.VsPackage/RcStringsPackage.cs

@@ -6,7 +6,9 @@
     <Description>Empty VSIX Project.</Description>
   </Metadata>
   <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0]" />
+    <InstallationTarget Version="[14.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[14.0,16.0)" Id="Microsoft.VisualStudio.Community" />
+    <InstallationTarget Version="[14.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
@@ -16,6 +18,6 @@
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
   </Assets>
   <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.26208.0,16.0)" DisplayName="Visual Studio core editor" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
   </Prerequisites>
 </PackageManifest>