From 08264cc9db4439115cf6a3e441d89ac0a797548a Mon Sep 17 00:00:00 2001
From: unknown <lajones@LAJ715VS2016.redmond.corp.microsoft.com>
Date: Wed, 16 Sep 2015 16:21:21 -0700
Subject: [PATCH] Changes to support Dev15.

(cherry picked from commit df9821836b83aae4ce10282dee5c4f631596c104)
---
 src/EFTools/EntityDesign/EntityDesign.csproj  |   5 +-
 .../Resources/ExplorerContent_15.0.xaml       | 902 ++++++++++++++++++
 .../UI/Views/Dialogs/EnumTypeDialog_15.0.xaml | 233 +++++
 .../Views/Dialogs/EnumTypeDialog_15.0.xaml.cs | 170 ++++
 .../Dialogs/RefactorRenameDialog_15.0.xaml    |  46 +
 .../Dialogs/RefactorRenameDialog_15.0.xaml.cs | 116 +++
 .../Explorer/EntityDesignExplorerFrame.cs     |   5 +-
 .../VisualStudio/Package/ConnectionManager.cs |   2 +-
 src/EFTools/SharedAssemblyInfo.cs             |   3 +
 src/EFTools/setup/EFToolsMsi/Defines.wxi      |   5 +
 .../setup/EFToolsMsi/EFToolsMsi.wixproj       |   4 +-
 .../Resources/EFToolsStrings.wxl.tokenized    |   2 +
 test/EFTools/E2ETests/DBInitialize.cs         |   2 +-
 test/EFTools/E2ETests/WhiteE2ETests.cs        |   4 +-
 .../TestInfrastructure/ResourcesHelper.cs     |   7 +-
 .../ModelWizard/Gui/WizardPageStartTests.cs   |   4 +-
 .../Package/ConnectionManagerTests.cs         |   2 +-
 .../RuntimeMetadataValidatorTests.cs          |   4 +-
 tools/EntityFramework.settings.targets        |   2 +
 tools/EntityFramework.targets                 |  15 +-
 tools/VsIdeHostAdapter/Installer/Defines.wxi  |   6 +
 21 files changed, 1521 insertions(+), 18 deletions(-)
 create mode 100644 src/EFTools/EntityDesign/Resources/ExplorerContent_15.0.xaml
 create mode 100644 src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml
 create mode 100644 src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml.cs
 create mode 100644 src/EFTools/EntityDesign/UI/Views/Dialogs/RefactorRenameDialog_15.0.xaml
 create mode 100644 src/EFTools/EntityDesign/UI/Views/Dialogs/RefactorRenameDialog_15.0.xaml.cs

diff --git a/src/EFTools/EntityDesign/EntityDesign.csproj b/src/EFTools/EntityDesign/EntityDesign.csproj
index 1a65a8db41..b0d3cdcf3a 100644
--- a/src/EFTools/EntityDesign/EntityDesign.csproj
+++ b/src/EFTools/EntityDesign/EntityDesign.csproj
@@ -49,9 +49,10 @@
     <DelaySign>true</DelaySign>
   </PropertyGroup>
   <PropertyGroup>
-    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='14.0'">VS140COMNTOOLS</VsCommonToolsEnvVarName>
-    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='12.0'">VS120COMNTOOLS</VsCommonToolsEnvVarName>
     <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='11.0'">VS110COMNTOOLS</VsCommonToolsEnvVarName>
+    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='12.0'">VS120COMNTOOLS</VsCommonToolsEnvVarName>
+    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='14.0'">VS140COMNTOOLS</VsCommonToolsEnvVarName>
+    <VsCommonToolsEnvVarName Condition="$(VisualStudioVersion)=='15.0'">VS150COMNTOOLS</VsCommonToolsEnvVarName>
   </PropertyGroup>
   <Import Project="$(RepositoryRoot)tools\EFToolsVsReferences.settings.targets" />
   <ItemGroup>
diff --git a/src/EFTools/EntityDesign/Resources/ExplorerContent_15.0.xaml b/src/EFTools/EntityDesign/Resources/ExplorerContent_15.0.xaml
new file mode 100644
index 0000000000..09c0039e88
--- /dev/null
+++ b/src/EFTools/EntityDesign/Resources/ExplorerContent_15.0.xaml
@@ -0,0 +1,902 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xdb:ExplorerContent
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:model="clr-namespace:Microsoft.Data.Entity.Design.UI.ViewModels.Explorer"
+  xmlns:conv="clr-namespace:Microsoft.Data.Entity.Design.UI.Converters;assembly=Microsoft.Data.Tools.Design.XmlCore"
+  xmlns:s="clr-namespace:System;assembly=mscorlib"
+  xmlns:xdb="clr-namespace:Microsoft.Data.Entity.Design.UI.Views.Explorer;assembly=Microsoft.Data.Tools.Design.XmlCore"
+  xmlns:coreCtrls="clr-namespace:Microsoft.Data.Entity.Design.Core.Controls;assembly=Microsoft.Data.Tools.Design.XmlCore"
+  xmlns:vsShell11="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
+  xmlns:Design="clr-namespace:Microsoft.Data.Entity.Design"
+  SnapsToDevicePixels="True"
+  UseLayoutRounding="True"
+  TextOptions.TextFormattingMode="Display"
+  Background="{DynamicResource VsBrush.ToolWindowBackground}"
+  x:Class="Microsoft.Data.Entity.Design.UI.Views.Explorer.EntityDesignExplorerContent"
+  KeyboardNavigation.TabNavigation="Cycle"
+  KeyboardNavigation.ControlTabNavigation="None"
+  >
+
+  <Grid.Resources>
+    <ResourceDictionary>
+
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/Microsoft.Data.Entity.Design;Component/Resources/EscherIcons.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+
+      <s:Boolean x:Key="BooleanFalseValue">False</s:Boolean>
+      <s:Boolean x:Key="BooleanTrueValue">True</s:Boolean>
+
+      <!-- Converters ********************************************** -->
+      <conv:IndentToMarginConverter x:Key="IndentToMarginConverter"/>
+
+      <conv:SwitchConverter x:Key="NegateConverter" DefaultValue="{StaticResource BooleanFalseValue}">
+        <conv:SwitchCase In="{StaticResource BooleanFalseValue}" Out="{StaticResource BooleanTrueValue}"/>
+        <conv:SwitchCase In="{StaticResource BooleanTrueValue}" Out="{StaticResource BooleanFalseValue}"/>
+      </conv:SwitchConverter>
+
+      <conv:SwitchConverter x:Key="BoolToHiddenConverter" DefaultValue="{x:Static Visibility.Hidden}">
+        <conv:SwitchCase In="{StaticResource BooleanFalseValue}" Out="{x:Static Visibility.Visible}"/>
+        <conv:SwitchCase In="{StaticResource BooleanTrueValue}" Out="{x:Static Visibility.Hidden}"/>
+      </conv:SwitchConverter>
+
+      <!-- Selector for Hierarchical Data Templates -->
+      <xdb:ExplorerTemplateSelector x:Key="ExplorerSelector" />
+
+      <vsShell11:ThemedImageSourceConverter x:Key="ThemedImageSourceConverter" />
+      <vsShell11:BrushToColorConverter x:Key="BrushToColorConverter" />
+
+      <!--**********************************************************-->
+      <!--Styles ***************************************************-->
+
+      <!-- Search Previous Nav Path Style **************************-->
+      <Style        x:Key=      "ExplorerSearchPrevNavPathStyle"
+                    TargetType= "{x:Type Path}" >
+        <Style.Triggers>
+          <DataTrigger  Binding="{Binding CanGotoPreviousResult}"
+                        Value="False">
+            <Setter     Property="Opacity"
+                        Value="0.3" />
+          </DataTrigger>
+        </Style.Triggers>
+      </Style>
+
+      <!-- Search Next Nav Path Style ******************************-->
+      <Style        x:Key=      "ExplorerSearchNextNavPathStyle"
+                    TargetType= "{x:Type Path}" >
+        <Style.Triggers>
+          <DataTrigger  Binding="{Binding CanGotoNextResult}"
+                        Value="False">
+            <Setter     Property="Opacity"
+                        Value="0.3" />
+          </DataTrigger>
+        </Style.Triggers>
+      </Style>
+
+      <!-- ToolBarButton Style  ************************************-->
+      <Style      x:Key=      "ToolBarButtonStyle"
+                  BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                  TargetType="{x:Type Button}">
+        <Setter   Property="FocusVisualStyle"
+                  Value="{x:Null}" />
+      </Style>
+
+      <!-- IsAncestorOfSearchResultItemStyle TextBlock Style ************************ -->
+      <Style x:Key="IsAncestorOfSearchResultItemStyle"
+          TargetType="{x:Type ContentControl}">
+        <Setter Property="Visibility" Value="Collapsed" />
+        <EventSetter Event="MouseDown" Handler="OnMouseDownAncestorOfSearchResultItemStyle"/>
+        <Style.Triggers>
+          <MultiDataTrigger>
+            <MultiDataTrigger.Conditions>
+              <Condition Binding="{Binding Path=IsAncestorOfSearchResultItem }" Value="True" />
+              <Condition Binding="{Binding Path=IsExpanded }" Value="False" />
+            </MultiDataTrigger.Conditions>
+            <MultiDataTrigger.Setters>
+              <Setter Property="Template">
+                <Setter.Value>
+                  <ControlTemplate TargetType="{x:Type ContentControl}">
+                    <StackPanel Orientation="Horizontal"
+                                Background="{DynamicResource {x:Static vsShell11:TreeViewColors.HighlightedSpanBrushKey}}">
+                      <Image Source="{StaticResource SearchIcon}" Width="16" Height="16" />
+                      <TextBlock Text="..."
+                                 Margin="-2,0,2,0"
+                                 VerticalAlignment="Center"
+                                 Foreground="{DynamicResource {x:Static vsShell11:TreeViewColors.HighlightedSpanTextBrushKey}}"/>
+                    </StackPanel>
+                  </ControlTemplate>
+                </Setter.Value>
+              </Setter>
+              <Setter Property="ToolTip" Value="{x:Static Design:Resources.ExplorerContent_CollapseSearchResults}"/>
+              <Setter Property="Focusable"  Value="False" />
+              <Setter Property="Visibility" Value="Visible" />
+            </MultiDataTrigger.Setters>
+          </MultiDataTrigger>
+        </Style.Triggers>
+      </Style>
+
+      <!-- SearchBar Style *****************************************-->
+      <Style x:Key="SearchBarStyle" TargetType="{x:Type Border}">
+        <Style.Triggers>
+          <Trigger Property="Visibility" Value="Visible">
+            <Trigger.EnterActions>
+              <BeginStoryboard>
+                <Storyboard>
+                  <DoubleAnimation Storyboard.TargetProperty="Opacity"
+                                   From="0"
+                                   To="1"
+                                   Duration="0:0:1" />
+                </Storyboard>
+              </BeginStoryboard>
+            </Trigger.EnterActions>
+          </Trigger>
+        </Style.Triggers>
+      </Style>
+
+      <!--Image Style **********************************************-->
+      <Style        x:Key=      "DrImage"
+                    TargetType= "{x:Type Image}" >
+        <Setter     Property=   "Margin"
+                    Value=      "2,0,2,0" />
+        <Setter     Property=   "Width"
+                    Value=      "16" />
+        <Setter     Property=   "Height"
+                    Value=      "16" />
+      </Style>
+
+      <!-- OverlayRefStyle Style ***********************************-->
+      <Style        x:Key=      "OverlayRefStyle"
+                    TargetType= "{x:Type ContentControl}" >
+        <Setter     Property=   "Width"
+                    Value=      "16" />
+        <Setter     Property=   "Height"
+                    Value=      "16" />
+        <Setter     Property="Focusable"
+                    Value=      "False"/>
+        <Setter     Property=   "Template">
+          <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ContentControl}">
+              <ContentPresenter Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+            </ControlTemplate>
+          </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+          <DataTrigger Binding="{Binding Path=IsReference}" Value="True">
+            <Setter    Property="Template">
+              <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ContentControl}">
+                  <Grid>
+                    <ContentPresenter Margin="{TemplateBinding Padding}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    <Image Source="{StaticResource RefIcon}" Style="{StaticResource DrImage}"/>
+                  </Grid>
+                </ControlTemplate>
+              </Setter.Value>
+            </Setter>
+          </DataTrigger>
+        </Style.Triggers>
+      </Style>
+
+      <!-- TreeView Item Style ************************************* -->
+      <Style TargetType="{x:Type xdb:ExplorerTreeViewItem}">
+        <Setter     Property=   "IsExpanded"
+                    Value=      "{Binding Path=IsExpanded, Mode=TwoWay}" />
+        <Setter     Property=   "IsSelected"
+                    Value=      "{Binding Path=IsSelected, Mode=TwoWay}" />
+        <Setter     Property=   "coreCtrls:EditableContentControl.IsInEditMode"
+                    Value=      "{Binding Path=IsInEditMode, Mode=TwoWay}" />
+        <Setter     Property=   "coreCtrls:EditableContentControl.IsEditModeAllowed"
+                    Value=      "{Binding Path=IsEditableInline, Mode=OneWay}" />
+        <Setter     Property=   "Template">
+          <Setter.Value>
+            <ControlTemplate TargetType="{x:Type xdb:ExplorerTreeViewItem}">
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto"/>
+                  <RowDefinition/>
+                </Grid.RowDefinitions>
+                <!-- When a TreeViewItem is selected, the ScrollViewer scrolls
+                to reveal the top,left of PART_Header.  Keeping PART_Header
+                spanning the entire TreeView width keeps the ScrollViewer from
+                scrolling. -->
+                <!-- TODO: is it ok to remove the PART_Header name entirely?  -->
+                <Border x:Name="PART_Header"
+                  Background="Transparent"
+                  Padding="{Binding Indent, Converter={StaticResource IndentToMarginConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xdb:ExplorerTreeViewItem}}, Mode=OneTime}"
+                  SnapsToDevicePixels="true">
+                  <StackPanel Orientation="Horizontal">
+                    <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}">
+                      <ToggleButton.Style>
+                        <Style TargetType="{x:Type ToggleButton}">
+                          <Setter Property="Focusable" Value="False"/>
+                          <Setter Property="Width" Value="16"/>
+                          <Setter Property="Height" Value="16"/>
+                          <Setter Property="Template">
+                            <Setter.Value>
+                              <ControlTemplate TargetType="{x:Type ToggleButton}">
+                                <Border Background="Transparent" Height="16" Padding="0" Width="16" SnapsToDevicePixels="True" >
+                                  <Path x:Name="ExpandPath" Data="M 0 0 L 4 4 L 0 8 Z"
+                                        Stroke="{DynamicResource {x:Static vsShell11:TreeViewColors.GlyphBrushKey}}"
+                                        SnapsToDevicePixels="False" >
+                                    <!-- Expander triangles needs half-pixel possitioning to render correctly -->
+                                    <Path.RenderTransform>
+                                      <TranslateTransform  X="6.5" Y="4.5"/>
+                                    </Path.RenderTransform>
+                                  </Path>
+                                </Border>
+                                <ControlTemplate.Triggers>
+                                  <!-- Rotate and fill triangle when checked (i.e. item is expanded) -->
+                                  <Trigger Property="IsChecked" Value="True">
+                                    <Setter Property="Data" TargetName="ExpandPath" Value="M 5 2 L 0 7 L 5 7 Z" />
+                                    <Setter Property="Fill" TargetName="ExpandPath" Value="{DynamicResource {x:Static vsShell11:TreeViewColors.GlyphBrushKey}}"/>
+                                  </Trigger>
+                                  <!-- Update stroke and fill color as necessary on mouse over -->
+                                  <Trigger Property ="IsMouseOver" Value="True">
+                                    <Setter Property="Stroke" TargetName="ExpandPath" Value="{DynamicResource {x:Static vsShell11:TreeViewColors.GlyphMouseOverBrushKey}}"/>
+                                  </Trigger>
+                                  <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                      <Condition Property="IsChecked" Value="True"/>
+                                      <Condition Property="IsMouseOver" Value="True"/>
+                                    </MultiTrigger.Conditions>
+                                    <Setter Property="Fill" TargetName="ExpandPath" Value="{DynamicResource {x:Static vsShell11:TreeViewColors.GlyphMouseOverBrushKey}}"/>
+                                  </MultiTrigger>
+                                </ControlTemplate.Triggers>
+                              </ControlTemplate>
+                            </Setter.Value>
+                          </Setter>
+                        </Style>
+                      </ToggleButton.Style>
+                    </ToggleButton>
+                    <!-- Add space between expander and item icon -->
+                    <Border Background="Transparent" Width="7" Height="16" />
+                    <Image x:Name ="ExplorerTreeViewItemIcon" Style="{StaticResource DrImage}">
+                      <Image.Source>
+                        <MultiBinding Converter="{StaticResource ThemedImageSourceConverter}">
+                          <Binding Path="Icon" Mode="OneWay" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type xdb:ExplorerTreeViewItem}}" />
+                          <Binding Path="(vsShell11:ImageThemingUtilities.ImageBackgroundColor)" RelativeSource="{RelativeSource Self}" />
+                          <Binding Source="{x:Static vsShell11:Boxes.BooleanTrue}"/>
+                        </MultiBinding>
+                      </Image.Source>
+                    </Image>
+                    <Border x:Name="Bd"
+                      Background="{TemplateBinding Background}"
+                      BorderBrush="{TemplateBinding BorderBrush}"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      Padding="2,2,3,1"
+                      SnapsToDevicePixels="true">
+                      <ContentPresenter
+                        ContentSource="Header"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    </Border>
+                  </StackPanel>
+                </Border>
+                <ItemsPresenter x:Name="ItemsHost" Grid.Row="1" />
+              </Grid>
+              <ControlTemplate.Triggers>
+                <Trigger Property="IsExpanded" Value="false">
+                  <Setter TargetName="ItemsHost" Property="Visibility" Value="Collapsed"/>
+                </Trigger>
+                <Trigger Property="HasItems" Value="false">
+                  <Setter TargetName="Expander" Property="Visibility" Value="Hidden"/>
+                </Trigger>
+                <!-- Ensure foreground for non-search results has foreground brush which reacts to theme changes -->
+                <DataTrigger  Binding= "{Binding Path=IsInSearchResults}" Value="False">
+                  <Setter Property="Foreground" Value="{DynamicResource {x:Static vsShell11:TreeViewColors.BackgroundTextBrushKey}}" />
+                </DataTrigger>
+                <MultiTrigger>
+                  <MultiTrigger.Conditions>
+                    <Condition Property="IsSelected" Value="true" />
+                    <Condition Property="coreCtrls:EditableContentControl.IsInEditMode" Value="false"/>
+                    <Condition Property="IsSelectionActive" Value="true"/>
+                  </MultiTrigger.Conditions>
+                  <Setter TargetName="Bd" Property="Background"
+                    Value="{DynamicResource {x:Static vsShell11:TreeViewColors.SelectedItemActiveBrushKey}}"/>
+                  <Setter Property="Foreground"
+                    Value="{DynamicResource {x:Static vsShell11:TreeViewColors.SelectedItemActiveTextBrushKey}}"/>
+                </MultiTrigger>
+                <MultiTrigger>
+                  <MultiTrigger.Conditions>
+                    <Condition Property="IsSelected" Value="true"/>
+                    <Condition Property="coreCtrls:EditableContentControl.IsInEditMode" Value="false"/>
+                    <Condition Property="IsSelectionActive" Value="false"/>
+                  </MultiTrigger.Conditions>
+                  <Setter TargetName="Bd" Property="Background"
+                    Value="{DynamicResource {x:Static vsShell11:TreeViewColors.SelectedItemInactiveBrushKey}}"/>
+                  <Setter Property="Foreground"
+                    Value="{DynamicResource {x:Static vsShell11:TreeViewColors.SelectedItemInactiveTextBrushKey}}"/>
+                </MultiTrigger>
+                <Trigger Property="IsEnabled" Value="false">
+                  <Setter Property="Foreground"
+                    Value="{DynamicResource VsBrush.GrayText}"/>
+                </Trigger>
+                <MultiDataTrigger>
+                  <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=IsAncestorOfSearchResultItem }" Value="True" />
+                    <Condition Binding="{Binding Path=IsExpanded }" Value="False" />
+                  </MultiDataTrigger.Conditions>
+                  <!-- Note: colors for both background and foreground which show up well in both light and dark themes -->
+                  <Setter Property="Background" Value="{DynamicResource {x:Static vsShell11:TreeViewColors.HighlightedSpanBrushKey}}" />
+                  <Setter Property="Foreground" Value="{DynamicResource {x:Static vsShell11:TreeViewColors.HighlightedSpanTextBrushKey}}" />
+                </MultiDataTrigger>
+
+                <MultiDataTrigger>
+                  <MultiDataTrigger.Conditions>
+                    <Condition Binding= "{Binding Path=IsInSearchResults}" Value="True" />
+                    <Condition Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource Self}}" Value="False" />
+                  </MultiDataTrigger.Conditions>
+                  <!-- Note: colors for both background and foreground which show up well in both light and dark themes -->
+                  <Setter Property="Background" Value="{DynamicResource {x:Static vsShell11:TreeViewColors.HighlightedSpanBrushKey}}" />
+                  <Setter Property="Foreground" Value="{DynamicResource {x:Static vsShell11:TreeViewColors.HighlightedSpanTextBrushKey}}" />
+                  <Setter Property="Selector.IsSelected" TargetName="Bd" Value="{DynamicResource {x:Static SystemParameters.HighContrastKey}}" />
+                </MultiDataTrigger>
+
+                <!-- Also ensure that non-expanded, selected ancestors of a search result have the normal foreground brush which reacts to theme changes -->
+                <MultiDataTrigger>
+                  <MultiDataTrigger.Conditions>
+                    <Condition Binding= "{Binding Path=IsInSearchResults}" Value="False" />
+                    <Condition Binding="{Binding Path=IsAncestorOfSearchResultItem }" Value="True" />
+                    <Condition Binding="{Binding Path=IsExpanded }" Value="False" />
+                    <Condition Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource Self}}" Value="True" />
+                  </MultiDataTrigger.Conditions>
+                  <Setter Property="Foreground" Value="{DynamicResource {x:Static vsShell11:TreeViewColors.BackgroundTextBrushKey}}" />
+                </MultiDataTrigger>
+                <!-- But for non-expanded, non-selected ancestors of a search result we need the foreground brush which shows up against the HighlightedSpanBrushKey background -->
+                <MultiDataTrigger>
+                  <MultiDataTrigger.Conditions>
+                    <Condition Binding= "{Binding Path=IsInSearchResults}" Value="False" />
+                    <Condition Binding="{Binding Path=IsAncestorOfSearchResultItem }" Value="True" />
+                    <Condition Binding="{Binding Path=IsExpanded }" Value="False" />
+                    <Condition Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource Self}}" Value="False" />
+                  </MultiDataTrigger.Conditions>
+                  <Setter Property="Foreground" Value="{DynamicResource {x:Static vsShell11:TreeViewColors.HighlightedSpanTextBrushKey}}" />
+                </MultiDataTrigger>
+
+                <Trigger SourceName="Bd" Property="Selector.IsSelected" Value="True">
+                  <Setter  Property="Background" Value="{DynamicResource VsBrush.ToolWindowBackground}" />
+                  <Setter  TargetName="Bd" Property="BorderThickness" Value="2" />
+                  <Setter  TargetName="Bd" Property="BorderBrush" Value="{DynamicResource {ComponentResourceKey {x:Type xdb:ExplorerContent}, SearchResultBrush}}" />
+                </Trigger>
+              </ControlTemplate.Triggers>
+            </ControlTemplate>
+          </Setter.Value>
+        </Setter>
+      </Style>
+
+      <!--Tree View Item Stack Panel Style ************************-->
+      <Style x:Key="TreeItemStackPanelStyle" TargetType="{x:Type StackPanel}">
+        <Setter Property="Orientation" Value="Horizontal" />
+      </Style>
+
+      <!-- EditableContentControl Style *****************************************-->
+      <Style        x:Key="EditableContentControlStyle"
+                    TargetType="{x:Type coreCtrls:EditableContentControl}">
+        <Setter Property="Text" Value="{Binding EditableName, Mode=TwoWay}" />
+        <Setter Property="IsInEditMode" Value="{Binding IsInEditMode, Mode=TwoWay}" />
+        <Setter Property="IsEditModeAllowed" Value="{Binding IsEditableInline, Mode=OneWay}" />
+        <Setter Property="AutomationProperties.AutomationId" Value="EditableContentControl" />
+      </Style>
+
+      <!-- TreeItemText Style *************************************-->
+      <Style        x:Key="TreeItemTextStyle"
+                    TargetType= "{x:Type TextBlock}" >
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Text" Value="{Binding Path=Name}" />
+        <Setter Property="ToolTip" Value="{Binding Path=ToolTipText}" />
+        <Setter Property="ToolTipService.ShowDuration" Value="3600000" />
+      </Style>
+
+      <!--**********************************************************-->
+      <!--Hierarchical Data Templates ******************************-->
+      <!--**********************************************************-->
+      <!-- Note: it is very important that the x:Key value for each 
+           HierarchicalDataTemplate match exactly the class name of 
+           the underlying ExplorerEFElement class. This is depended
+           upon by the ExplorerSelector ItemTemplateSelector 
+           functionality for ExplorerTreeViewItem.                  -->
+
+      <!-- Root Item -->
+      <HierarchicalDataTemplate x:Key=              "ExplorerRootNode"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <!-- Entity Model Items -->
+      <HierarchicalDataTemplate x:Key=              "ExplorerDiagrams"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel            Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock          x:Name=             "Name"
+                              Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl     x:Name="IsAncestorOfSearchResultItem"
+                              Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerConceptualEntityModel"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerStorageEntityModel"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerConceptualEntityContainer"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerEntityContainerEntitySets"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerEntityContainerAssociationSets"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerAssociationSet"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerFunctionImports"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerFunctionImport"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerEntitySet"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerConceptualEntityType"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <coreCtrls:EditableContentControl Style="{StaticResource EditableContentControlStyle}">
+            <TextBlock          x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          </coreCtrls:EditableContentControl>
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerComplexType"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <coreCtrls:EditableContentControl Style="{StaticResource EditableContentControlStyle}">
+            <TextBlock          x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          </coreCtrls:EditableContentControl>
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate  x:Key=              "ExplorerDiagram"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <coreCtrls:EditableContentControl Style="{StaticResource EditableContentControlStyle}">
+            <TextBlock          x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          </coreCtrls:EditableContentControl>
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerStorageEntityType"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerAssociations"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerConceptualAssociation"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerStorageAssociation"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerFunctions"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerFunction"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerParameter"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerConceptualProperty"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <coreCtrls:EditableContentControl Style="{StaticResource EditableContentControlStyle}">
+            <TextBlock          x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          </coreCtrls:EditableContentControl>
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerStorageProperty"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerNavigationProperty"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerTypes"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=               "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerComplexTypes"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=               "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerEntityTypeShape"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <coreCtrls:EditableContentControl Style="{StaticResource EditableContentControlStyle}">
+            <TextBlock          x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          </coreCtrls:EditableContentControl>
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerEnumTypes"
+                         ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=               "{StaticResource TreeItemStackPanelStyle}">
+          <TextBlock            x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+      <HierarchicalDataTemplate x:Key=              "ExplorerEnumType"
+                                ItemsSource=        "{Binding Path=Children}">
+        <StackPanel             Style=              "{StaticResource TreeItemStackPanelStyle}">
+          <coreCtrls:EditableContentControl Style="{StaticResource EditableContentControlStyle}">
+            <TextBlock          x:Name=             "Name"
+                                Style=              "{StaticResource TreeItemTextStyle}" />
+          </coreCtrls:EditableContentControl>
+          <ContentControl       x:Name="IsAncestorOfSearchResultItem"
+                                Style="{StaticResource IsAncestorOfSearchResultItemStyle}"/>
+        </StackPanel>
+      </HierarchicalDataTemplate>
+
+    </ResourceDictionary>
+  </Grid.Resources>
+
+  <Grid.RowDefinitions>
+    <RowDefinition Height="Auto"/>
+    <RowDefinition Height="Auto"/>
+    <RowDefinition Height="*"/>
+  </Grid.RowDefinitions>
+
+  <Border x:Name="toolbarBorder" Grid.Row="0" Padding="4,3,4,2"
+          Background="{DynamicResource VsBrush.CommandBarGradientBegin}"
+          vsShell11:ImageThemingUtilities.ImageBackgroundColor="{Binding Path=Background, RelativeSource={RelativeSource Self}, Converter={StaticResource BrushToColorConverter}}">
+    <DockPanel x:Name="toolbarPanel">
+      <!-- toolbar buttons must be 23x22 pixels (including the border) -->
+      <Button x:Name="goSearchButton" DockPanel.Dock="Right"
+              x:Uid="goSearchButton"
+              Width="22" MinHeight="21"
+              VerticalAlignment="Center"
+              HorizontalAlignment="Center"
+              VerticalContentAlignment="Center"
+              HorizontalContentAlignment="Center"
+              Margin="2,0,0,0"
+              Command="{Binding SearchCommand}"
+              ToolTip="{x:Static Design:Resources.ExplorerContent_Search}"
+              AutomationProperties.Name="{Binding RelativeSource={RelativeSource Self}, Path=ToolTip}"
+              KeyboardNavigation.TabIndex="2">
+        <Image Width="16" Height="16">
+          <Image.Source>
+            <MultiBinding Converter="{StaticResource ThemedImageSourceConverter}">
+              <Binding Source="{StaticResource SearchIcon}" />
+              <Binding Path="(vsShell11:ImageThemingUtilities.ImageBackgroundColor)" RelativeSource="{RelativeSource Self}" />
+              <Binding Source="{x:Static vsShell11:Boxes.BooleanTrue}"/>
+            </MultiBinding>
+          </Image.Source>
+        </Image>
+        <Button.Style>
+          <Style BasedOn="{StaticResource ToolBarButtonStyle}" TargetType="{x:Type Button}">
+            <Style.Triggers>
+              <DataTrigger Binding="{Binding ElementName=searchBox, Path=Text }" Value="">
+                <Setter Property="Button.IsEnabled" Value="false" />
+                <Setter Property="Button.Opacity" Value="0.5" />
+              </DataTrigger>
+            </Style.Triggers>
+          </Style>
+        </Button.Style>
+      </Button>
+      <Border x:Name="comboPanel">
+        <Grid>
+          <xdb:SearchComboBox x:Name="searchBox"
+                    BorderThickness="0.0"
+                    Background="{DynamicResource VsBrush.ComboBoxBackground}"
+                    Foreground="{DynamicResource VsBrush.ComboBoxGlyph}"
+                    KeyboardNavigation.TabIndex="1"
+                    Margin="0,1,0,2"
+                    Style="{DynamicResource {x:Static ToolBar.ComboBoxStyleKey}}"
+                    Width="{Binding ElementName=comboPanel, Path=ActualWidth}"
+                    VerticalAlignment=  "Center"
+                    Loaded=             "OnDropDownLoaded"
+                    DropDownOpened=     "OnDropDownOpened"
+                    KeyDown=            "OnKeyDownHandler"
+                    IsEditable=         "True"
+                    IsEnabled=          "{Binding HasLoadException, Converter={StaticResource NegateConverter}}"
+                    IsTextSearchEnabled="False"
+                    StaysOpenOnEdit=    "True" />
+          <!-- Note: searchPrompt will only be visible if searchBox.IsHitTestVisible is set to false -->
+          <TextBlock x:Name="searchPrompt" x:Uid="searchPrompt" Padding="5,5,20,0" IsHitTestVisible="False"
+                     MaxWidth="{Binding ElementName=comboPanel, Path=ActualWidth}"
+                     TextTrimming="CharacterEllipsis"
+                     Background="{DynamicResource VsBrush.ComboBoxBackground}"
+                     Foreground="{DynamicResource VsBrush.GrayText}"
+                     Text="{x:Static Design:Resources.ExplorerContent_PromptSearch}" >
+            <TextBlock.Style>
+              <Style TargetType="{x:Type TextBlock}">
+                <Setter Property="TextBlock.Visibility" Value="Collapsed" />
+                <Style.Triggers>
+                  <MultiDataTrigger>
+                    <MultiDataTrigger.Conditions>
+                      <Condition Binding="{Binding ElementName=searchBox, Path=Text }" Value="" />
+                      <Condition Binding="{Binding ElementName=searchBox, Path=IsKeyboardFocusWithin }" Value="False" />
+                    </MultiDataTrigger.Conditions>
+                    <MultiDataTrigger.Setters>
+                      <Setter Property="Visibility" Value="Visible" />
+                    </MultiDataTrigger.Setters>
+                  </MultiDataTrigger>
+                </Style.Triggers>
+              </Style>
+            </TextBlock.Style>
+          </TextBlock>
+        </Grid>
+      </Border>
+    </DockPanel>
+  </Border>
+
+  <Border x:Name="searchBar" Grid.Row ="1"
+          Visibility="Collapsed"
+          Style="{StaticResource SearchBarStyle}"
+          Background="{DynamicResource VsBrush.CommandBarGradientBegin}">
+    <DockPanel>
+      <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
+        <Separator  Style="{DynamicResource {x:Static ToolBar.SeparatorStyleKey}}"/>
+        <Button x:Name="searchNavPrevious"
+                x:Uid="searchNavPrevious"
+                Style="{StaticResource ToolBarButtonStyle}"
+                MinWidth="16" MinHeight="16"
+                ToolTip="{x:Static Design:Resources.ExplorerContent_SearchNavPrev}"
+                AutomationProperties.Name="{Binding RelativeSource={RelativeSource Self}, Path=ToolTip}"
+                IsEnabled="{Binding CanGotoPreviousResult}"
+                Command="{Binding SelectPreviousSearchResult}"
+                KeyboardNavigation.TabIndex="3">
+          <Path Fill="{DynamicResource VsBrush.CommandBarTextActive}"
+                Style="{StaticResource ExplorerSearchPrevNavPathStyle}"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="M 3 0 L 0 3 L 6 3 Z"/>
+        </Button>
+        <Button x:Name="searchNavNext"
+                x:Uid="searchNavNext"
+                Style="{StaticResource ToolBarButtonStyle}"
+                MinWidth="16" MinHeight="16"
+                ToolTip="{x:Static Design:Resources.ExplorerContent_SearchNavNext}"
+                AutomationProperties.Name="{Binding RelativeSource={RelativeSource Self}, Path=ToolTip}"
+                IsEnabled="{Binding CanGotoNextResult}"
+                Command="{Binding SelectNextSearchResult}"
+                KeyboardNavigation.TabIndex="4">
+          <Path Fill="{DynamicResource VsBrush.CommandBarTextActive}"
+                Style="{StaticResource ExplorerSearchNextNavPathStyle}"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="M 0 0 L 3 3 L 6 0 Z"/>
+        </Button>
+        <Separator  Style="{DynamicResource {x:Static ToolBar.SeparatorStyleKey}}"/>
+        <Button x:Name="resetSearchButton"
+                x:Uid="resetSearchButton"
+                        MinWidth="16" MinHeight="16"
+                        ToolTip="{x:Static Design:Resources.ExplorerContent_ClearSearch}"
+                        AutomationProperties.Name="{Binding RelativeSource={RelativeSource Self}, Path=ToolTip}"
+                        Margin="0,0,4,0"
+                        Style="{StaticResource ToolBarButtonStyle}"
+                        Command="{Binding ResetSearchCommand}"
+                        VerticalAlignment="Center"
+                        KeyboardNavigation.TabIndex="5">
+          <Path Stroke="{DynamicResource VsBrush.CommandBarTextActive}"
+                StrokeThickness="1.5"
+                StrokeStartLineCap="Round"
+                StrokeEndLineCap="Round"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="M 1 1 L 7 7 M 1 7 L 7 1"/>
+        </Button>
+      </StackPanel>
+      <TextBlock Padding="9,4,2,4" x:Name="searchBarText" VerticalAlignment="Center"
+          TextTrimming="CharacterEllipsis" Foreground="{DynamicResource VsBrush.GrayText}">
+      </TextBlock>
+    </DockPanel>
+  </Border>
+
+  <xdb:SearchAdornerDecorator Grid.Row= "2"
+                             x:Name="searchAdornerDecorator"
+                             Visibility="{Binding Path=HasLoadException, Converter={StaticResource BoolToHiddenConverter}}">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="*"/>
+        <ColumnDefinition Width="Auto"/>
+      </Grid.ColumnDefinitions>
+      <TreeView x:Name="explorerTreeView"
+                Background="{DynamicResource VsBrush.ToolWindowTabSelectedTab}"
+                Foreground="{DynamicResource VsBrush.ToolWindowTabSelectedText}"
+                Grid.Column="0"
+                x:Uid="ExplorerTreeView"
+                VirtualizingStackPanel.IsVirtualizing="False"
+                KeyboardNavigation.TabIndex="6"
+                BorderThickness="0"
+                Padding="0,2,0,0"
+                vsShell11:ImageThemingUtilities.ImageBackgroundColor="{Binding Path=Background, RelativeSource={RelativeSource Self}, Converter={StaticResource BrushToColorConverter}}">
+
+        <xdb:ExplorerTreeViewItem    x:Name="explorerTreeRoot"
+                            ItemsSource= "{Binding Path=Children}"
+                            ItemTemplateSelector="{StaticResource ExplorerSelector}"
+                            Header=      "{Binding Path=Name}"
+                            IsSelected=  "True"
+                            IsExpanded=  "True"
+                            Collapsed=   "OnTreeViewItemCollapsed"
+                            Expanded=    "OnTreeViewItemExpanded">
+        </xdb:ExplorerTreeViewItem>
+      </TreeView>
+      <ContentControl x:Name="searchTicksTrack"
+                      Grid.Column="0"
+                      Focusable="false"
+                      HorizontalAlignment="Right"
+                      MinWidth="{DynamicResource {x:Static SystemParameters.ScrollWidthKey}}"
+                      MaxWidth="{DynamicResource {x:Static SystemParameters.ScrollWidthKey}}"
+                      Visibility="Collapsed"/>
+    </Grid>
+  </xdb:SearchAdornerDecorator>
+
+</xdb:ExplorerContent>
diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml
new file mode 100644
index 0000000000..052e669f41
--- /dev/null
+++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml
@@ -0,0 +1,233 @@
+<vs:DialogWindow x:Class="Microsoft.Data.Entity.Design.UI.Views.Dialogs.EnumTypeDialog"
+                 x:ClassModifier="internal"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
+                 xmlns:ded="clr-namespace:Microsoft.Data.Entity.Design"
+                 xmlns:vm="clr-namespace:Microsoft.Data.Entity.Design.UI.ViewModels"
+                 xmlns:core-controls="clr-namespace:Microsoft.Data.Entity.Design.Core.Controls;assembly=Microsoft.Data.Tools.Design.XmlCore"
+                 mc:Ignorable="d"
+                 d:DesignWidth="450" 
+                 d:DesignHeight="575"
+                 MinWidth="450" 
+                 MinHeight="575"
+                 SizeToContent="WidthAndHeight"
+                 ShowInTaskbar="False"
+                 WindowStartupLocation="CenterOwner"
+                 ResizeMode="CanResizeWithGrip"
+                 FontFamily="{DynamicResource VsFont.EnvironmentFontFamily}"
+                 FontSize="{DynamicResource VsFont.EnvironmentFontSize}"
+                 BorderBrush="{DynamicResource VsBrush.ActiveBorder}" BorderThickness="0,0,1,0"
+                 Background="{DynamicResource {x:Static SystemColors.ControlBrushKey }}"
+                 FocusManager.FocusedElement="{Binding ElementName=txtEnumTypeName}">
+
+    <vs:DialogWindow.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/Microsoft.Data.Entity.Design;Component/Resources/EscherIcons.xaml"/>
+      </ResourceDictionary.MergedDictionaries>
+
+        <!-- Draw hint on top of external type textbox -->
+      <VisualBrush x:Key="ExternalTypeHint" TileMode="None" Stretch="None" AlignmentX="Left">
+        <VisualBrush.Transform>
+          <TranslateTransform X="5" Y="0" />
+        </VisualBrush.Transform>
+        <VisualBrush.Visual>
+          <Grid>
+            <TextBlock FontStyle="Italic" Opacity="0.8" Text="{x:Static ded:Resources.EnumDialog_ExternalTypeHint}" />
+          </Grid>
+        </VisualBrush.Visual>
+      </VisualBrush>
+
+      <!-- Base style for all text-boxes -->
+      <Style x:Key="BaseTextBoxStyle" TargetType="TextBox">
+          <Setter Property="Validation.ErrorTemplate">
+              <Setter.Value>
+                  <ControlTemplate>
+                    <DockPanel LastChildFill="True">
+                      <AdornedElementPlaceholder Name="customAdorner"/>
+                      <Image Source="{StaticResource WarningPngIcon}" Margin="3,0,3,0" VerticalAlignment="Center"
+                             AutomationProperties.Name="WarningError" Stretch="None" ToolTip="{Binding ElementName=customAdorner, 
+                                       Path=AdornedElement.(Validation.Errors)[0].ErrorContent}" />
+                    </DockPanel>
+                  </ControlTemplate>
+              </Setter.Value>
+          </Setter>
+          <Style.Triggers>
+              <Trigger Property="Validation.HasError" Value="true">
+                  <Setter Property="Background" Value="{DynamicResource VsBrush.ControlEditRequiredBackground}" />
+                  <Setter Property="Foreground" Value="{DynamicResource VsBrush.ControlEditRequiredHintText}" />
+                  <Setter Property="ToolTip" Value="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}"/>
+               </Trigger>
+          </Style.Triggers>
+      </Style>
+
+      <!-- Style for external type name text-box -->
+      <Style x:Key="ExternalTypeNameStyle" TargetType="TextBox" BasedOn="{StaticResource BaseTextBoxStyle}">
+        <Style.Triggers>
+          <MultiTrigger>
+            <MultiTrigger.Conditions>
+              <Condition Property="Text" Value="" />
+              <!-- <Condition Property="IsKeyboardFocusWithin" Value="False"/> -->
+            </MultiTrigger.Conditions>
+            <Setter Property="Background" Value="{StaticResource ExternalTypeHint}"/>
+          </MultiTrigger>
+          <Trigger Property="Validation.HasError" Value="true">
+            <Setter Property="Background" Value="{DynamicResource VsBrush.ControlEditRequiredBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource VsBrush.ControlEditRequiredHintText}" />
+            <Setter Property="ToolTip" Value="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}"/>
+          </Trigger>
+          <Trigger Property="Visibility" Value="Visible">
+            <Trigger.EnterActions>
+              <BeginStoryboard>
+                <Storyboard>
+                  <DoubleAnimation Storyboard.TargetProperty="Opacity"
+                                   From="0"
+                                   To="1"
+                                   Duration="0:0:1" />
+                </Storyboard>
+              </BeginStoryboard>
+            </Trigger.EnterActions>
+          </Trigger>
+        </Style.Triggers>        
+      </Style>
+
+      <Style TargetType="{x:Type DataGridRow}">
+        <Setter Property="ValidationErrorTemplate">
+          <Setter.Value>
+            <ControlTemplate>
+              <DockPanel LastChildFill="True">
+                <AdornedElementPlaceholder Name="customAdorner"/>
+                <Image Source="{StaticResource WarningPngIcon}" Margin="0,0,0,0" VerticalAlignment="Center"
+                       AutomationProperties.Name="WarningError" Stretch="None" ToolTip="{Binding ElementName=customAdorner, 
+                                       Path=AdornedElement.(Validation.Errors)[0].ErrorContent}" />
+              </DockPanel>
+            </ControlTemplate>
+          </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+              <Trigger Property="Validation.HasError" Value="true">
+                  <Setter Property="Background" Value="{DynamicResource VsBrush.ControlEditRequiredBackground}" />
+                  <Setter Property="Foreground" Value="{DynamicResource VsBrush.ControlEditRequiredHintText}" />
+                  <Setter Property="ToolTip" Value="{Binding RelativeSource={RelativeSource Self}, Path=(Validation.Errors)[0].ErrorContent}"/>
+              </Trigger>
+          </Style.Triggers>
+      </Style>
+
+      <core-controls:InverseBooleanConverter x:Key="InverseBooleanConverter" />
+    </ResourceDictionary>
+ </vs:DialogWindow.Resources>
+    
+    <Grid Margin="10,10,10,10" AutomationProperties.Name="{x:Static ded:Resources.EnumDialog_AutomationName}">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="*" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="*" />
+      </Grid.ColumnDefinitions>
+
+      <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static ded:Resources.EnumDialog_NameLabel}" 
+                 VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5,5,5,2"/>
+
+      <TextBox Grid.Column="0" Grid.Row="1" 
+               Name="txtEnumTypeName" HorizontalAlignment="Left" 
+               Margin="5,0,5,5" AutomationProperties.Name="{x:Static ded:Resources.EnumDialog_NameLabel}" 
+               Width="250px" TextChanged="OnTextBoxTextChanged" LostFocus="OnTextBoxLostFocus" Style="{StaticResource BaseTextBoxStyle}">
+        <TextBox.Text>
+          <Binding Path="Name">
+            <Binding.ValidationRules>
+              <vm:CellDataInfoValidationRule ValidationStep="UpdatedValue"/>
+            </Binding.ValidationRules>
+          </Binding>
+        </TextBox.Text>
+      </TextBox>
+
+      <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static ded:Resources.EnumDialog_UnderlyingTypeLabel}" Margin="5,2,5,2" />
+
+      <ComboBox Grid.Column="0" Grid.Row="3"  HorizontalAlignment="Left" Name="cmbUnderlyingType"
+              Margin="5,0,5,5" Width="250px"
+              ItemsSource="{Binding Path=UnderlyingTypes}"
+              SelectedItem="{Binding Path=SelectedUnderlyingType,Mode=TwoWay}"
+              AutomationProperties.Name="{x:Static ded:Resources.EnumDialog_UnderlyingTypeLabel}" 
+              ToolTip="{x:Static ded:Resources.PropertyWindow_Description_EnumUnderlyingType}"/>
+
+      <DataGrid Grid.Column="0" Grid.Row="4" HorizontalAlignment="Stretch"
+                Name="dgEnumTypeMembers" VerticalAlignment="Stretch" ItemsSource="{Binding Path=Members}"
+                CanUserAddRows="True" CanUserDeleteRows="True" AutoGenerateColumns="False"
+                HorizontalGridLinesBrush="{DynamicResource VsBrush.ThreeDFace}" VerticalGridLinesBrush="{DynamicResource VsBrush.ThreeDFace}"
+                AutomationProperties.Name="{x:Static ded:Resources.EnumDialog_AccEnumTypeMembers}"
+                Margin="5,10,5,5">
+        <DataGrid.RowValidationRules>
+          <vm:RowDataInfoValidationRule ValidationStep="UpdatedValue" />
+        </DataGrid.RowValidationRules>
+        <DataGrid.Columns>
+        
+          <DataGridTextColumn Header="{x:Static ded:Resources.EnumDialog_EnumTypeMemberNameLabel}" CanUserSort="False" MinWidth="225" MaxWidth="325" Width="Auto">
+            <DataGridTextColumn.Binding>
+              <Binding Path="Name">
+                <Binding.ValidationRules>
+                  <vm:CellDataInfoValidationRule ValidationStep="UpdatedValue"/>
+                </Binding.ValidationRules>
+              </Binding>
+            </DataGridTextColumn.Binding>
+          </DataGridTextColumn>
+
+          <DataGridTextColumn Header="{x:Static ded:Resources.EnumDialog_EnumTypeMemberValueLabel}" CanUserSort="False" MinWidth="200" MaxWidth="300" Width="Auto">
+            <DataGridTextColumn.Binding>
+              <Binding Path="Value">
+                <Binding.ValidationRules>
+                  <vm:CellDataInfoValidationRule ValidationStep="UpdatedValue"/>
+                </Binding.ValidationRules>
+              </Binding>
+            </DataGridTextColumn.Binding>
+          </DataGridTextColumn>
+        </DataGrid.Columns>
+      </DataGrid>
+
+      <CheckBox Content="{x:Static ded:Resources.EnumDialog_IsFlagLabel}" Grid.Column="0" Grid.Row="5"  
+                  Name="chkIsFlag" VerticalAlignment="Center" Margin="8,10,5,5" Padding="8,0,5,0" 
+                  IsChecked="{Binding Path=IsFlag}" ToolTip="{x:Static ded:Resources.EnumDialog_IsFlagLabelDescription}" />
+
+      <CheckBox Content="{x:Static ded:Resources.EnumDialog_ExternalTypeLabel}" Grid.Column="0" Grid.Row="6"
+                Name="chkReferenceExternalType" VerticalAlignment="Center" Margin="8,5,5,2" Padding="8,0,5,0" IsChecked="{Binding Path=IsReferenceExternalType}"
+                ToolTip="{x:Static ded:Resources.PropertyWindow_Description_EnumExternalTypeAttribute}" Click="OnRefrenceExternalTypeClick"/>
+        
+      <Border MaxWidth="{Binding ElementName=chkIsFlag,Path=ActualWidth}" Grid.Column="0" Grid.Row="7" Margin="0,0,0,0" BorderThickness="0,0,0,0">
+        <TextBox Margin="23,5,5,5" Name="txtExternalType" HorizontalAlignment="Left" AutomationProperties.Name="{x:Static ded:Resources.EnumDialog_ExternalTypeLabel}"
+                 Width="230px" ToolTip="{x:Static ded:Resources.PropertyWindow_Description_EnumExternalTypeAttribute}"
+                 Style="{StaticResource ExternalTypeNameStyle}" IsReadOnly="{Binding Path=IsChecked, ElementName=chkReferenceExternalType, Converter={StaticResource InverseBooleanConverter}}"
+                 TextChanged="OnTextBoxTextChanged" LostFocus="OnTextBoxLostFocus">
+            <TextBox.Text>
+              <Binding Path="ExternalTypeName">
+                <Binding.ValidationRules>
+                  <vm:CellDataInfoValidationRule ValidationStep="UpdatedValue"/>
+                </Binding.ValidationRules>
+              </Binding>
+            </TextBox.Text>
+        </TextBox>
+      </Border>
+    
+      <StackPanel Grid.Column="0" Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Right">
+         <Button Name="btnOk"
+                 Margin="5,15,5,5" MinWidth="70" IsDefault="True" 
+                 Click="btnOk_Click" Content="{x:Static ded:Resources.EnumDialog_OkButtonLabel}"
+                 IsEnabled="{Binding Path=IsValid}" AutomationProperties.Name="{Binding Name}"/>
+        
+        <Button Name="btnCancel" 
+                Margin="5,15,5,5" MinWidth="70" IsCancel="True" 
+                Click="btnCancel_Click" Content="{x:Static ded:Resources.EnumDialog_CancelButtonLabel}"
+                AutomationProperties.Name="{Binding Name}"/>
+      </StackPanel>
+  </Grid>
+</vs:DialogWindow>
\ No newline at end of file
diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml.cs
new file mode 100644
index 0000000000..96e5ae6357
--- /dev/null
+++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/EnumTypeDialog_15.0.xaml.cs
@@ -0,0 +1,170 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Controls;
+using Microsoft.Data.Entity.Design.UI.ViewModels;
+using Microsoft.VisualStudio.PlatformUI;
+using EntityDesignerResources = Microsoft.Data.Entity.Design.Resources;
+
+namespace Microsoft.Data.Entity.Design.UI.Views.Dialogs
+{
+    // <summary>
+    // Interaction logic for EnumTypeDialog.xaml
+    // </summary>
+    internal partial class EnumTypeDialog : DialogWindow
+    {
+        private bool _isManualEditCommit = false;
+        private bool _isOkButtonClicked = false;
+        private EnumTypeViewModel _enumTypeViewModel = null;
+
+        public EnumTypeDialog(EnumTypeViewModel vm)
+        {
+            _enumTypeViewModel = vm;
+            this.DataContext = _enumTypeViewModel;
+            InitializeComponent();
+            if (vm.IsNew)
+            {
+                this.Title = EntityDesignerResources.EnumDialog_NewEnumWindowTitle;
+            }
+            else
+            {
+                this.Title = EntityDesignerResources.EnumDialog_EditEnumWindowTitle;
+            }
+            this.dgEnumTypeMembers.CellEditEnding += dgEnumTypeMembers_CellEditEnding;
+            this.HasHelpButton = false;
+        }
+
+        public EnumTypeViewModel EnumTypeViewModel
+        {
+            get
+            {
+                return _enumTypeViewModel;
+            }
+        }
+
+        #region Event Handler
+
+        protected override void OnClosing(CancelEventArgs e)
+        {
+            // When ok button is clicked:
+            // - First we need to ensure all the changes in data-grid are committed.
+            // - If the view model is not in valid state,  block the dialog from closing.
+            if (_isOkButtonClicked)
+            {
+                CommitDialogControlsManually();
+
+                EnumTypeViewModel vm = this.DataContext as EnumTypeViewModel;
+                Debug.Assert(vm != null, "Dialog DataContext is not type of EnumTypeViewModel");
+                if (vm != null && vm.IsValid == false)
+                {
+                    e.Cancel = true;
+                    _isOkButtonClicked = false;
+                    return;
+                }
+            }
+            base.OnClosing(e);
+        }
+
+        private void dgEnumTypeMembers_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
+        {
+            // This is to ensure that we commit every time the cell is edited.
+            CommitDialogControlsManually();
+        }
+
+        private void btnOk_Click(object sender, RoutedEventArgs e)
+        {
+            _isOkButtonClicked = true;
+            this.DialogResult = true;
+        }
+
+        private void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            _isOkButtonClicked = false;
+            this.DialogResult = false;
+        }
+
+        private void OnTextBoxTextChanged(Object sender, TextChangedEventArgs e)
+        {
+            // Force binding between source and target element; this is so that validation can take place immediately.
+            ForceTextBoxUpdateSource(sender);
+        }
+
+        private void OnTextBoxLostFocus(object sender, RoutedEventArgs e)
+        {
+            // Force binding between source and target element; this is so that validation can take place immediately.
+            ForceTextBoxUpdateSource(sender);
+        }
+
+        private void OnRefrenceExternalTypeClick(Object sender, RoutedEventArgs e)
+        {
+            if (chkReferenceExternalType.IsChecked == true)
+            {
+                Keyboard.Focus(txtExternalType);
+            }
+            ForceTextBoxUpdateSource(txtExternalType);
+        }
+
+        #endregion
+
+        private static void ForceTextBoxUpdateSource(object control)
+        {
+            TextBox textBox = control as TextBox;
+            Debug.Assert(textBox != null, "parameter control is not a TextBox type");
+            if (textBox != null)
+            {
+                textBox.GetBindingExpression(TextBox.TextProperty).UpdateSource();
+            }
+        }
+
+        private void CommitDialogControlsManually()
+        {
+            if (!_isManualEditCommit)
+            {
+                try
+                {
+                    _isManualEditCommit = true;
+                    txtEnumTypeName.GetBindingExpression(TextBox.TextProperty).UpdateSource();
+                    txtExternalType.GetBindingExpression(TextBox.TextProperty).UpdateSource();
+                    dgEnumTypeMembers.CommitEdit(DataGridEditingUnit.Row, true);
+                }
+                finally
+                {
+                    _isManualEditCommit = false;
+                }
+            }
+        }
+
+        #region Test support
+
+        private static event EventHandler DialogActivatedTestEventStorage;
+
+        // This should be set only in the test code!!!
+        internal static event EventHandler DialogActivatedTestEvent
+        {
+            add
+            {
+                DialogActivatedTestEventStorage += value;
+            }
+            remove
+            {
+                DialogActivatedTestEventStorage -= value;
+            }
+        }
+
+        // For test purposes only!!!
+        protected override void OnActivated(EventArgs e)
+        {
+            base.OnActivated(e);
+
+            if (DialogActivatedTestEventStorage != null)
+            {
+                DialogActivatedTestEventStorage(this, EventArgs.Empty);
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/RefactorRenameDialog_15.0.xaml b/src/EFTools/EntityDesign/UI/Views/Dialogs/RefactorRenameDialog_15.0.xaml
new file mode 100644
index 0000000000..5ce2ee8fec
--- /dev/null
+++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/RefactorRenameDialog_15.0.xaml
@@ -0,0 +1,46 @@
+<vs:DialogWindow 
+        x:Class="Microsoft.Data.Entity.Design.UI.Views.Dialogs.RefactorRenameDialog"
+        x:ClassModifier="internal"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+        xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
+        xmlns:Design="clr-namespace:Microsoft.Data.Entity.Design"
+        mc:Ignorable="d" 
+        ShowInTaskbar="False"
+        WindowStartupLocation="CenterScreen"
+        ResizeMode="CanResizeWithGrip"
+        FontFamily="{DynamicResource VsFont.EnvironmentFontFamily}"
+        FontSize="{DynamicResource VsFont.EnvironmentFontSize}"
+        BorderBrush="{DynamicResource VsBrush.ActiveBorder}" BorderThickness="0,0,1,0"
+        Background="{DynamicResource {x:Static SystemColors.ControlBrushKey }}"
+        d:DesignHeight="230"
+        d:DesignWidth="430"
+        HasHelpButton="False"
+        MinHeight="230"
+        MinWidth="430"
+        SizeToContent="WidthAndHeight"
+        Title="{x:Static Design:Resources.RefactorRenameDialog_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=newNameTextBox}">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <Label Grid.Row="0" Content="{x:Static Design:Resources.RefactorRenameDialog_NewNameLabel}" Height="25" HorizontalAlignment="Left" Margin="8,12,0,0"/>
+        <TextBox x:Name="newNameTextBox" Grid.Row="1" HorizontalAlignment="Stretch" Margin="12,0,12,2" TextChanged="OnNewNameTextBoxTextChanged"/>
+        <Label Grid.Row="2" Content="{x:Static Design:Resources.RefactorRenameDialog_LocationLabel}" Height="25" HorizontalAlignment="Left" Margin="8,2,0,0"/>
+        <TextBox x:Name="locationTextBox" Grid.Row="3" HorizontalAlignment="Stretch" Margin="12,0,12,12" IsEnabled="False"/>
+        <CheckBox x:Name="previewCheckBox" Grid.Row="4" Content="{x:Static Design:Resources.RefactorRenameDialog_PreviewReferenceChangesLabel}" HorizontalAlignment="Left" IsChecked="True" Margin="12,2,0,0"/>
+        <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button x:Name="okButton" Content="{x:Static Design:Resources.RefactorRenameDialog_OK}" Height="25" HorizontalAlignment="Left" Margin="12,12,0,12" VerticalAlignment="Bottom" MinWidth="75" Click="OnOkButtonClick" IsDefault="True"/>
+            <Button Content="{x:Static Design:Resources.RefactorRenameDialog_Cancel}" Height="25" HorizontalAlignment="Left" Margin="12,12,12,12" VerticalAlignment="Bottom" MinWidth="75" IsCancel="True"/>
+        </StackPanel>
+    </Grid>
+</vs:DialogWindow>
diff --git a/src/EFTools/EntityDesign/UI/Views/Dialogs/RefactorRenameDialog_15.0.xaml.cs b/src/EFTools/EntityDesign/UI/Views/Dialogs/RefactorRenameDialog_15.0.xaml.cs
new file mode 100644
index 0000000000..80a56c15ce
--- /dev/null
+++ b/src/EFTools/EntityDesign/UI/Views/Dialogs/RefactorRenameDialog_15.0.xaml.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Windows;
+using Microsoft.Data.Entity.Design.Common;
+using Microsoft.Data.Entity.Design.Model;
+using Microsoft.Data.Entity.Design.Model.Entity;
+using Microsoft.Data.Entity.Design.Model.Validation;
+using Microsoft.Data.Entity.Design.VisualStudio;
+using Microsoft.Data.Entity.Design.VisualStudio.Package;
+using Microsoft.VisualStudio.PlatformUI;
+
+namespace Microsoft.Data.Entity.Design.UI.Views.Dialogs
+{
+    internal partial class RefactorRenameDialog : DialogWindow
+    {
+        EFNormalizableItem _objectToRename = null;
+
+        internal RefactorRenameDialog(EFNormalizableItem objectToRename)
+        {
+            ArgumentValidation.CheckForNullReference(objectToRename, "objectToRename");
+
+            InitializeComponent();
+            _objectToRename = objectToRename;
+            this.newNameTextBox.Text = objectToRename.Name.Value;
+            this.Loaded += OnLoaded;
+        }
+
+        internal string NewName { get { return this.newNameTextBox.Text; } }
+        internal bool? ShowPreview { get { return this.previewCheckBox.IsChecked; } }
+
+        protected override void InvokeDialogHelp()
+        {
+            // do nothing
+        }
+
+        void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            this.Loaded -= OnLoaded;
+            this.locationTextBox.Text = Path.GetFileName(_objectToRename.Artifact.Uri.LocalPath);
+            this.newNameTextBox.SelectAll();
+        }
+
+        private void OnOkButtonClick(object sender, RoutedEventArgs e)
+        {
+            string errorMessage;
+
+            if (ValidateName(out errorMessage))
+            {
+                this.DialogResult = true;
+            }
+            else
+            {
+                VsUtils.ShowError(PackageManager.Package, errorMessage);
+            }
+        }
+
+        private void OnNewNameTextBoxTextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+            // Note: we're doing ordinal and not ignore case because the user might want to rename to change the casing only.
+            if (_objectToRename.Name.Value.Equals(this.NewName, StringComparison.Ordinal))
+            {
+                this.okButton.IsEnabled = false;
+            }
+            else
+            {
+                this.okButton.IsEnabled = true;
+            }
+        }
+
+        private bool ValidateName(out string errorMessage)
+        {
+            // Unlike C# and TSql refactoring, we won't allow the user to proceed with a rename that causes a name conflict (C# and TSql
+            // give a warning and allow you to proceed). This is because our rename command will fail in the case of name conflicts, so
+            // we need return a hard error in the rename dialog.
+            EFAttribute attr = _objectToRename.GetNameAttribute();
+            errorMessage = null;
+
+            AttributeContentValidator contentValidator = _objectToRename.Artifact.ModelManager.GetAttributeContentValidator(_objectToRename.Artifact);
+            if (!contentValidator.IsValidAttributeValue(this.NewName, attr))
+            {
+                // not valid content
+                errorMessage = Microsoft.Data.Entity.Design.Resources.RefactorRename_InvalidName;
+                return false;
+            }
+
+            Property property = _objectToRename as Property;
+            if (_objectToRename is EntityType)
+            {
+                if (!ModelHelper.IsUniqueNameForExistingItem(_objectToRename, this.NewName, true, out errorMessage))
+                {
+                    return false;
+                }
+            }
+            else if (property != null)
+            {
+                if (!ModelHelper.IsUniqueNameForExistingItem(property, this.NewName, true, out errorMessage))
+                {
+                    errorMessage = string.Format(CultureInfo.CurrentCulture, Microsoft.Data.Entity.Design.Model.Resources.NAME_NOT_UNIQUE, this.NewName);
+                    return false;
+                }
+            }
+            else if (_objectToRename is Association)
+            {
+                if (!ModelHelper.IsUniqueNameForExistingItem(_objectToRename, this.NewName, true, out errorMessage))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/EFTools/EntityDesign/UI/Views/Explorer/EntityDesignExplorerFrame.cs b/src/EFTools/EntityDesign/UI/Views/Explorer/EntityDesignExplorerFrame.cs
index 124980d980..ae3b86da8b 100644
--- a/src/EFTools/EntityDesign/UI/Views/Explorer/EntityDesignExplorerFrame.cs
+++ b/src/EFTools/EntityDesign/UI/Views/Explorer/EntityDesignExplorerFrame.cs
@@ -284,12 +284,13 @@ protected override ExplorerViewModelHelper GetNewExplorerViewModelHelper()
 
         protected override ExplorerContent InitializeExplorerContent()
         {
-#if VS14
+#if VS15
+            var content = FileResourceManager.GetElement("Resources/ExplorerContent_15.0.xaml") as ExplorerContent;
+#elif VS14
             var content = FileResourceManager.GetElement("Resources/ExplorerContent_14.0.xaml") as ExplorerContent;
 #elif VS12
             var content = FileResourceManager.GetElement("Resources/ExplorerContent_12.0.xaml") as ExplorerContent;
 #else
-
             var content = FileResourceManager.GetElement("Resources/ExplorerContent_11.0.xaml") as ExplorerContent;
 #endif
 
diff --git a/src/EFTools/EntityDesign/VisualStudio/Package/ConnectionManager.cs b/src/EFTools/EntityDesign/VisualStudio/Package/ConnectionManager.cs
index 164f8549a6..43213caa5f 100644
--- a/src/EFTools/EntityDesign/VisualStudio/Package/ConnectionManager.cs
+++ b/src/EFTools/EntityDesign/VisualStudio/Package/ConnectionManager.cs
@@ -989,7 +989,7 @@ public static string CreateDefaultLocalDbConnectionString(string initialCatalog)
             return
                 string.Format(
                     CultureInfo.InvariantCulture,
-#if VS14
+#if (VS14 || VS15)
                     @"Data Source=(LocalDb)\MSSQLLocalDB;Initial Catalog={0};Integrated Security=True",
 #else
                     @"Data Source=(LocalDb)\v11.0;Initial Catalog={0};Integrated Security=True",
diff --git a/src/EFTools/SharedAssemblyInfo.cs b/src/EFTools/SharedAssemblyInfo.cs
index 1440db6f3f..c796cf2dfe 100644
--- a/src/EFTools/SharedAssemblyInfo.cs
+++ b/src/EFTools/SharedAssemblyInfo.cs
@@ -21,5 +21,8 @@
 #elif VS14
 [assembly: AssemblyVersion("14.0.0.0")]
 [assembly: AssemblyFileVersion("14.0.0.0")]
+#elif VS15
+[assembly: AssemblyVersion("15.0.0.0")]
+[assembly: AssemblyFileVersion("15.0.0.0")]
 #endif
 #endif
diff --git a/src/EFTools/setup/EFToolsMsi/Defines.wxi b/src/EFTools/setup/EFToolsMsi/Defines.wxi
index 6f213e41a2..894d8449ad 100644
--- a/src/EFTools/setup/EFToolsMsi/Defines.wxi
+++ b/src/EFTools/setup/EFToolsMsi/Defines.wxi
@@ -18,5 +18,10 @@
     <?define FullProductName = !(loc.FullProductName_Dev14)?>
     <?define ProductDescription = !(loc.ProductDescription_Dev14)?>
     <?define ProductVersion = $(var.AssemblyFileVersion)?>
+  <?elseif $(var.VisualStudioVersion) = 15.0?>
+    <?define UpgradeCode = {28672A77-D90A-4FCA-A00A-E181FA82AAB3}?>
+    <?define FullProductName = !(loc.FullProductName_Dev15)?>
+    <?define ProductDescription = !(loc.ProductDescription_Dev15)?>
+    <?define ProductVersion = $(var.AssemblyFileVersion)?>
   <?endif?>
 </Include>
diff --git a/src/EFTools/setup/EFToolsMsi/EFToolsMsi.wixproj b/src/EFTools/setup/EFToolsMsi/EFToolsMsi.wixproj
index f7302bfe5f..74ec53d129 100644
--- a/src/EFTools/setup/EFToolsMsi/EFToolsMsi.wixproj
+++ b/src/EFTools/setup/EFToolsMsi/EFToolsMsi.wixproj
@@ -107,8 +107,8 @@
   <Target Name="ReplaceEFToolsStrings">
     <RegexReplaceInFile InputFileName="Resources\EFToolsStrings.wxl.tokenized"
                         OutputFileName="Resources\EFToolsStrings.wxl"
-                        Patterns="WIX_FULL_PRODUCT_NAME_DEV11;WIX_FULL_PRODUCT_NAME_DEV12;WIX_FULL_PRODUCT_NAME_DEV14;WIX_PRODUCT_DESCRIPTION_DEV11;WIX_PRODUCT_DESCRIPTION_DEV12;WIX_PRODUCT_DESCRIPTION_DEV14"
-                        Replacements="$(WixFullProductName_Dev11);$(WixFullProductName_Dev12);$(WixFullProductName_Dev14);$(WixProductDescription_Dev11);$(WixProductDescription_Dev12);$(WixProductDescription_Dev14)" />
+                        Patterns="WIX_FULL_PRODUCT_NAME_DEV11;WIX_FULL_PRODUCT_NAME_DEV12;WIX_FULL_PRODUCT_NAME_DEV14;WIX_FULL_PRODUCT_NAME_DEV15;WIX_PRODUCT_DESCRIPTION_DEV11;WIX_PRODUCT_DESCRIPTION_DEV12;WIX_PRODUCT_DESCRIPTION_DEV14;WIX_PRODUCT_DESCRIPTION_DEV15"
+                        Replacements="$(WixFullProductName_Dev11);$(WixFullProductName_Dev12);$(WixFullProductName_Dev14);$(WixFullProductName_Dev15);$(WixProductDescription_Dev11);$(WixProductDescription_Dev12);$(WixProductDescription_Dev14);$(WixProductDescription_Dev15)" />
   </Target>
   
   <!--
diff --git a/src/EFTools/setup/EFToolsMsi/Resources/EFToolsStrings.wxl.tokenized b/src/EFTools/setup/EFToolsMsi/Resources/EFToolsStrings.wxl.tokenized
index 7724412d02..80d4a6ace9 100644
--- a/src/EFTools/setup/EFToolsMsi/Resources/EFToolsStrings.wxl.tokenized
+++ b/src/EFTools/setup/EFToolsMsi/Resources/EFToolsStrings.wxl.tokenized
@@ -5,9 +5,11 @@
   <String Id="FullProductName_Dev11">WIX_FULL_PRODUCT_NAME_DEV11</String>
   <String Id="FullProductName_Dev12">WIX_FULL_PRODUCT_NAME_DEV12</String>
   <String Id="FullProductName_Dev14">WIX_FULL_PRODUCT_NAME_DEV14</String>
+  <String Id="FullProductName_Dev15">WIX_FULL_PRODUCT_NAME_DEV15</String>
   <String Id="ProductDescription_Dev11">WIX_PRODUCT_DESCRIPTION_DEV11</String>
   <String Id="ProductDescription_Dev12">WIX_PRODUCT_DESCRIPTION_DEV12</String>
   <String Id="ProductDescription_Dev14">WIX_PRODUCT_DESCRIPTION_DEV14</String>
+  <String Id="ProductDescription_Dev15">WIX_PRODUCT_DESCRIPTION_DEV15</String>
   <String Id="ElevatedPrivilegeRequired">You need to be an administrator to install this product.</String>
   <String Id="NewerAlreadyInstalled">A newer version of this product already installed. Installation of this version cannot continue. To configure or remove the existing version of this product, use Add/Remove Programs on the Control Panel.</String>
   <String Id="VisualStudioProductDirNotFound">Visual Studio product directory is not found.</String>
diff --git a/test/EFTools/E2ETests/DBInitialize.cs b/test/EFTools/E2ETests/DBInitialize.cs
index a6ba34342c..bd762fee5c 100644
--- a/test/EFTools/E2ETests/DBInitialize.cs
+++ b/test/EFTools/E2ETests/DBInitialize.cs
@@ -16,7 +16,7 @@ public class MyConf : DbConfiguration
     {
         public MyConf()
         {
-#if VS14
+#if (VS14 || VS15)
             SetDefaultConnectionFactory(new LocalDbConnectionFactory("mssqllocaldb"));
 #else
             SetDefaultConnectionFactory(new LocalDbConnectionFactory("v11.0"));
diff --git a/test/EFTools/E2ETests/WhiteE2ETests.cs b/test/EFTools/E2ETests/WhiteE2ETests.cs
index 47f780e762..a8040e499f 100644
--- a/test/EFTools/E2ETests/WhiteE2ETests.cs
+++ b/test/EFTools/E2ETests/WhiteE2ETests.cs
@@ -409,7 +409,7 @@ public void AddModelFromDBUpdateModel()
                                        "Title CHAR(50) NOT NULL, Author CHAR(50), " +
                                        "PageCount INTEGER, Topic CHAR(30), Code CHAR(15))";
 
-#if VS14
+#if (VS14 || VS15)
             const string connectionString = @"Data Source=(localdb)\mssqllocaldb;initial catalog=School;integrated security=True;Pooling=false";
 #else
             const string connectionString = @"Data Source=(localdb)\v11.0;initial catalog=School;integrated security=True;Pooling=false";
@@ -916,7 +916,7 @@ private void HandleConnectionDialog(string dbName)
             var serverNameText = _wizard.Get<TextBox>(
                 SearchCriteria.ByText(
                     _resourceHelper.GetConnectionUIDialogResourceString("serverLabel.Text")));
-#if VS14
+#if (VS14 || VS15)
             serverNameText.Enter(@"(localdb)\mssqllocaldb");
 #else
             serverNameText.Enter(@"(localdb)\v11.0");
diff --git a/test/EFTools/TestInfrastructure/ResourcesHelper.cs b/test/EFTools/TestInfrastructure/ResourcesHelper.cs
index 3832b200c3..84739e7af7 100644
--- a/test/EFTools/TestInfrastructure/ResourcesHelper.cs
+++ b/test/EFTools/TestInfrastructure/ResourcesHelper.cs
@@ -10,7 +10,12 @@ namespace EFDesignerTestInfrastructure
 
     public class ResourcesHelper
     {
-#if VS14
+#if VS15
+        private static readonly string _vsInstallDir = (string)Registry.GetValue(
+            Registry.LocalMachine + "\\SOFTWARE\\Microsoft\\VisualStudio\\15.0",
+            "InstallDir",
+            null);
+#elif VS14
         private static readonly string _vsInstallDir = (string)Registry.GetValue(
             Registry.LocalMachine + "\\SOFTWARE\\Microsoft\\VisualStudio\\14.0",
             "InstallDir",
diff --git a/test/EFTools/UnitTests/EntityDesign/VisualStudio/ModelWizard/Gui/WizardPageStartTests.cs b/test/EFTools/UnitTests/EntityDesign/VisualStudio/ModelWizard/Gui/WizardPageStartTests.cs
index ac312bbca5..0b6fbb5f5f 100644
--- a/test/EFTools/UnitTests/EntityDesign/VisualStudio/ModelWizard/Gui/WizardPageStartTests.cs
+++ b/test/EFTools/UnitTests/EntityDesign/VisualStudio/ModelWizard/Gui/WizardPageStartTests.cs
@@ -184,7 +184,7 @@ public void OnDeactivate_updates_model_settings_if_model_file_does_not_exist_for
     <add name=""myModel"" connectionString=""Data Source=(localdb)\{0};"" providerName=""System.Data.SqlClient"" />
   </connectionStrings>
 </configuration>",
-#if VS14
+#if (VS14 || VS15)
     "MSSQLLocalDB"
 #else
     "v11.0"
@@ -209,7 +209,7 @@ public void OnDeactivate_updates_model_settings_if_model_file_does_not_exist_for
             Assert.Equal(@"myModel1", modelBuilderSettings.AppConfigConnectionPropertyName);
             Assert.True(modelBuilderSettings.SaveConnectionStringInAppConfig);
             Assert.Equal(
-#if VS14
+#if (VS14 || VS15)
                 @"Data Source=(LocalDb)\MSSQLLocalDB;Initial Catalog=modelNamespace.myModel;Integrated Security=True",
 #else
                 @"Data Source=(LocalDb)\v11.0;Initial Catalog=modelNamespace.myModel;Integrated Security=True",
diff --git a/test/EFTools/UnitTests/EntityDesign/VisualStudio/Package/ConnectionManagerTests.cs b/test/EFTools/UnitTests/EntityDesign/VisualStudio/Package/ConnectionManagerTests.cs
index e81f7b3c87..1b1395bc6d 100644
--- a/test/EFTools/UnitTests/EntityDesign/VisualStudio/Package/ConnectionManagerTests.cs
+++ b/test/EFTools/UnitTests/EntityDesign/VisualStudio/Package/ConnectionManagerTests.cs
@@ -316,7 +316,7 @@ public void GetUniqueConnectionStringName_uniquifies_proposed_connection_string_
         public void CreateDefaultLocalDbConnectionString_returns_correct_default_connection_string()
         {
             Assert.Equal(
-#if VS14
+#if (VS14 || VS15)
                 @"Data Source=(LocalDb)\MSSQLLocalDB;Initial Catalog=App.MyContext;Integrated Security=True",
 #else
                 @"Data Source=(LocalDb)\v11.0;Initial Catalog=App.MyContext;Integrated Security=True",
diff --git a/test/EFTools/UnitTests/EntityDesignModel/Validation/RuntimeMetadataValidatorTests.cs b/test/EFTools/UnitTests/EntityDesignModel/Validation/RuntimeMetadataValidatorTests.cs
index ecdb3d9e97..876fd51c26 100644
--- a/test/EFTools/UnitTests/EntityDesignModel/Validation/RuntimeMetadataValidatorTests.cs
+++ b/test/EFTools/UnitTests/EntityDesignModel/Validation/RuntimeMetadataValidatorTests.cs
@@ -602,7 +602,7 @@ public void IsOpenInEditorError_returns_false_for_non_runtime_errors()
                     });
         }
 
-#if !VS14
+#if (VS11 || VS12)
         [Fact]
         public void IsOpenInEditorError_returns_false_for_recoverable_runtime_errors()
         {
@@ -637,7 +637,7 @@ public void IsOpenInEditorError_returns_true_for_unrecoverable_errors_if_additio
                     });
         }
 
-#if !VS14
+#if (VS11 || VS12)
         [Fact]
         public void IsOpenInEditorError_returns_false_for_SchemaValidationError_for_ModificationFunctionMapping()
         {
diff --git a/tools/EntityFramework.settings.targets b/tools/EntityFramework.settings.targets
index 02d437ac2b..9e74140571 100644
--- a/tools/EntityFramework.settings.targets
+++ b/tools/EntityFramework.settings.targets
@@ -14,9 +14,11 @@ Project global pre-settings.
     <ToolingVersionMajor Condition="'$(VisualStudioVersion)' == '11.0'">11</ToolingVersionMajor>
     <ToolingVersionMajor Condition="'$(VisualStudioVersion)' == '12.0'">12</ToolingVersionMajor>
     <ToolingVersionMajor Condition="'$(VisualStudioVersion)' == '14.0'">14</ToolingVersionMajor>
+    <ToolingVersionMajor Condition="'$(VisualStudioVersion)' == '15.0'">15</ToolingVersionMajor>
     <ToolingVersionMinor Condition="'$(VisualStudioVersion)' == '11.0'">2</ToolingVersionMinor>
     <ToolingVersionMinor Condition="'$(VisualStudioVersion)' == '12.0'">0</ToolingVersionMinor>
     <ToolingVersionMinor Condition="'$(VisualStudioVersion)' == '14.0'">0</ToolingVersionMinor>
+    <ToolingVersionMinor Condition="'$(VisualStudioVersion)' == '15.0'">0</ToolingVersionMinor>
     <VersionBuild>0</VersionBuild>
     <VersionRevision>0</VersionRevision>
     <VersionReleasePrefix>3</VersionReleasePrefix>
diff --git a/tools/EntityFramework.targets b/tools/EntityFramework.targets
index 2db6eeec2d..eec54a85a2 100644
--- a/tools/EntityFramework.targets
+++ b/tools/EntityFramework.targets
@@ -14,10 +14,15 @@ Project global post-settings and targets.
     <DefineConstants Condition="'$(VisualStudioVersion)' == '11.0'">$(DefineConstants);VS11</DefineConstants>
     <DefineConstants Condition="'$(VisualStudioVersion)' == '12.0'">$(DefineConstants);VS12</DefineConstants>
     <DefineConstants Condition="'$(VisualStudioVersion)' == '14.0'">$(DefineConstants);VS14</DefineConstants>
-    <DefineConstants Condition="'$(VisualStudioVersion)' == '12.0' OR '$(VisualStudioVersion)' == '14.0'">$(DefineConstants);VS12ORNEWER</DefineConstants>
+    <DefineConstants Condition="'$(VisualStudioVersion)' == '15.0'">$(DefineConstants);VS15</DefineConstants>
+    <DefineConstants
+     Condition="'$(VisualStudioVersion)' == '12.0'
+             OR '$(VisualStudioVersion)' == '14.0'
+             OR '$(VisualStudioVersion)' == '15.0'">$(DefineConstants);VS12ORNEWER</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(BuildingToolingProject)' == 'true'" >
+    <VsSDKDir Condition="'$(VisualStudioVersion)' == '15.0'">$(VSSDK150Install)</VsSDKDir>
     <VsSDKDir Condition="'$(VisualStudioVersion)' == '14.0'">$(VSSDK140Install)</VsSDKDir>
     <VsSDKDir Condition="'$(VisualStudioVersion)' == '12.0'">$(VSSDK120Install)</VsSDKDir>
     <VsSDKDir Condition="'$(VisualStudioVersion)' == '11.0'">$(VSSDK110Install)</VsSDKDir>
@@ -59,16 +64,22 @@ Project global post-settings and targets.
     <WixFullProductName_Dev11>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 2012</WixFullProductName_Dev11>
     <WixFullProductName_Dev12>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 2013</WixFullProductName_Dev12>
     <WixFullProductName_Dev14>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 2015</WixFullProductName_Dev14>
+    <WixFullProductName_Dev15>Entity Framework $(RuntimeVersionMajor).$(RuntimeVersionMinor).$(VersionReleasePrefix) Tools $(VersionReleaseName) for Visual Studio 15</WixFullProductName_Dev15>
     <WixProductDescription_Dev11>$(WixFullProductName_Dev11)</WixProductDescription_Dev11>
     <WixProductDescription_Dev12>$(WixFullProductName_Dev12)</WixProductDescription_Dev12>
     <WixProductDescription_Dev14>$(WixFullProductName_Dev14)</WixProductDescription_Dev14>
+    <WixProductDescription_Dev15>$(WixFullProductName_Dev15)</WixProductDescription_Dev15>
   </PropertyGroup>
 
   <!-- Target definitions -->
 
   <Target Name="ValidateVisualStudioVersion">
     <PropertyGroup>
-      <VisualStudioVersionError Condition="'$(VisualStudioVersion)' == '' OR ('$(VisualStudioVersion)' != '11.0' AND '$(VisualStudioVersion)' != '12.0' AND '$(VisualStudioVersion)' != '14.0')">true</VisualStudioVersionError>
+      <VisualStudioVersionError Condition="'$(VisualStudioVersion)' == '' OR
+          ('$(VisualStudioVersion)' != '11.0'
+           AND '$(VisualStudioVersion)' != '12.0'
+           AND '$(VisualStudioVersion)' != '14.0'
+           AND '$(VisualStudioVersion)' != '15.0')">true</VisualStudioVersionError>
     </PropertyGroup>
     <Error Condition="'$(VisualStudioVersionError)' == 'true'" Text="VisualStudioVersion property value is invalid or not supported: '$(VisualStudioVersion)'" />
   </Target>
diff --git a/tools/VsIdeHostAdapter/Installer/Defines.wxi b/tools/VsIdeHostAdapter/Installer/Defines.wxi
index 4a7f98d428..64ac42ed4c 100644
--- a/tools/VsIdeHostAdapter/Installer/Defines.wxi
+++ b/tools/VsIdeHostAdapter/Installer/Defines.wxi
@@ -20,5 +20,11 @@
     <?define FullProductName = VS IDE Test Host for Visual Studio 2015?>
     <?define ProductDescription = Allows to run tests inside VS IDE?>
     <?define ProductVersion = $(var.WixVsIDETestHostAdapterProductVersion)?>
+  <?elseif $(var.VisualStudioVersion) = 15.0?>
+    <?define ProductId = {7E937BF4-8A36-4A19-889D-90C475D71CC6}?>
+    <?define UpgradeCode = {D0AEE2DB-379A-40FC-A710-C48727611A86}?>
+    <?define FullProductName = VS IDE Test Host for Visual Studio 15?>
+    <?define ProductDescription = Allows to run tests inside VS IDE?>
+    <?define ProductVersion = $(var.WixVsIDETestHostAdapterProductVersion)?>
   <?endif?>
 </Include>