Fix for EFTools in Visual Studio 14 CTP3: DpiHelperClass was moved to…

… Microsoft.VisualStudio.Utilities for Dev14 so adding this reference conditionally. Also temporarily removing rule CA1809 from Code Analysis to be able to compile VirtualTreeControl with Dev14. (cherry picked from commit 5ba6362)
ErikEJ · Aug 18, 2014 · 5f5d6df · 5f5d6df
1 parent c197e20
commit 5f5d6df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/EFTools/EntityDesign/EntityDesign.csproj b/src/EFTools/EntityDesign/EntityDesign.csproj
@@ -66,6 +66,7 @@
     <Reference Include="Microsoft.VisualStudio.Modeling.Sdk.Shell.$(VisualStudioVersion)" />
     <Reference Include="Microsoft.VisualStudio.Modeling.Sdk.Diagrams.GraphObject.$(VisualStudioVersion)" />
     <Reference Include="Microsoft.VisualStudio.TextTemplating.VSHost.$(VisualStudioVersion)" />
+    <Reference Include="Microsoft.VisualStudio.Utilities" Condition="$(VisualStudioVersion)!='11.0' AND $(VisualStudioVersion)!='12.0'" />
     <Reference Include="Microsoft.VisualStudio.DataTools.Interop" />
     <Reference Include="Microsoft.WizardFramework" />
     <Reference Include="System" />

diff --git a/src/Strict.ruleset b/src/Strict.ruleset
@@ -4,5 +4,6 @@
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
     <Rule Id="CA1062" Action="None" />
     <Rule Id="CA2243" Action="None" />
+    <Rule Id="CA1809" Action="None" />
   </Rules>
 </RuleSet>