From 5f5d6dfd8e2dbdabbe571fa77a4bc72e29a7a9f4 Mon Sep 17 00:00:00 2001
From: lajones <lajones@microsoft.com>
Date: Mon, 18 Aug 2014 11:08:30 -0700
Subject: [PATCH] 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 5ba63621d1e65a48c3710a888e9f12a96cb0c133)
---
 src/EFTools/EntityDesign/EntityDesign.csproj | 1 +
 src/Strict.ruleset                           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/EFTools/EntityDesign/EntityDesign.csproj b/src/EFTools/EntityDesign/EntityDesign.csproj
index 69a22ed9c4..9c3150f689 100644
--- 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
index fa1ad8c72d..106af7f210 100644
--- 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>
\ No newline at end of file