Make it simpler to enable IntelliSense for XAML resources

Kinnara · Apr 8, 2020 · 0438fd8 · 0438fd8
1 parent d86b8df
commit 0438fd8
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 55 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>0.8.2-preview.1</Version>
+    <Version>0.8.2-dev.200408007</Version>
     <Authors>Yimeng Wu</Authors>
     <Product>ModernWPF UI Library</Product>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/ModernWpf.SampleApp/DesignTime/IntellisenseResources.cs b/ModernWpf.SampleApp/DesignTime/IntellisenseResources.cs
diff --git a/ModernWpf.SampleApp/ModernWpf.SampleApp.csproj b/ModernWpf.SampleApp/ModernWpf.SampleApp.csproj
@@ -15,14 +15,6 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Page Update="Properties\DesignTimeResources.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <ContainsDesignTimeResources>True</ContainsDesignTimeResources>
-    </Page>
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -61,6 +53,10 @@
     <Resource Include="Assets\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Remove="Properties\DesignTimeResources.xaml" />
+  </ItemGroup>
+
   <ItemGroup>
     <Resource Remove="Assets\SampleMedia\cliff.jpg" />
     <Resource Remove="Assets\SampleMedia\rainier.jpg" />
@@ -75,4 +71,12 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="Properties\DesignTimeResources.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <ContainsDesignTimeResources>True</ContainsDesignTimeResources>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/ModernWpf.SampleApp/Properties/DesignTimeResources.xaml b/ModernWpf.SampleApp/Properties/DesignTimeResources.xaml
@@ -1,10 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:designTime="clr-namespace:ModernWpf.SampleApp.DesignTime">
-
+    xmlns:ui="http://schemas.modernwpf.com/2019">
     <ResourceDictionary.MergedDictionaries>
-        <designTime:IntellisenseResources Source="/ModernWpf;component/DesignTime/DesignTimeResources.xaml" />
+        <ui:IntellisenseResources Source="/ModernWpf;component/DesignTime/DesignTimeResources.xaml" />
     </ResourceDictionary.MergedDictionaries>
-
 </ResourceDictionary>
diff --git a/ModernWpf/DesignTime/DesignTimeResources.xaml b/ModernWpf/DesignTime/DesignTimeResources.xaml
@@ -2,8 +2,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/ModernWpf;component/DesignTime/SystemColors.xaml" />
-        <ResourceDictionary Source="/ModernWpf;component/ThemeResources/Light.xaml" />
-        <ResourceDictionary Source="/ModernWpf;component/ControlsResources.xaml" />
+        <ResourceDictionary Source="SystemColors.xaml" />
+        <ResourceDictionary Source="/ThemeResources/Light.xaml" />
+        <ResourceDictionary Source="/ControlsResources.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/ModernWpf/DesignTime/IntellisenseResources.cs b/ModernWpf/DesignTime/IntellisenseResources.cs
@@ -0,0 +1,9 @@
+namespace ModernWpf.DesignTime
+{
+    public class IntellisenseResources : IntellisenseResourcesBase
+    {
+        public IntellisenseResources()
+        {
+        }
+    }
+}
diff --git a/samples/FluentWPFSample/DesignTime/IntellisenseResources.cs b/samples/FluentWPFSample/DesignTime/IntellisenseResources.cs
diff --git a/samples/FluentWPFSample/FluentWPFSample.csproj b/samples/FluentWPFSample/FluentWPFSample.csproj
@@ -7,6 +7,17 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Page Remove="Properties\DesignTimeResources.xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Properties\DesignTimeResources.xaml">
+      <ContainsDesignTimeResources>True</ContainsDesignTimeResources>
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="FluentWPF" Version="0.8.0" />
     <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0748" />
@@ -19,11 +30,4 @@
     <ProjectReference Include="..\SamplesCommon\SamplesCommon.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Page Update="Properties\DesignTimeResources.xaml">
-      <ContainsDesignTimeResources>True</ContainsDesignTimeResources>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-
 </Project>
diff --git a/samples/FluentWPFSample/Properties/DesignTimeResources.xaml b/samples/FluentWPFSample/Properties/DesignTimeResources.xaml
@@ -1,10 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:designTime="clr-namespace:FluentWPFSample.DesignTime">
-
+    xmlns:ui="http://schemas.modernwpf.com/2019">
     <ResourceDictionary.MergedDictionaries>
-        <designTime:IntellisenseResources Source="/ModernWpf;component/DesignTime/DesignTimeResources.xaml" />
+        <ui:IntellisenseResources Source="/ModernWpf;component/DesignTime/DesignTimeResources.xaml" />
     </ResourceDictionary.MergedDictionaries>
-
 </ResourceDictionary>
diff --git a/samples/MahAppsSample/MahAppsSample.csproj b/samples/MahAppsSample/MahAppsSample.csproj
@@ -15,6 +15,12 @@
   <ItemGroup>
     <Resource Remove="Assets\SampleMedia\**" />
     <Content Include="Assets\SampleMedia\**" />
+    <Page Remove="Properties\DesignTimeResources.xaml" />
+    <None Include="Properties\DesignTimeResources.xaml">
+      <ContainsDesignTimeResources>True</ContainsDesignTimeResources>
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </None>
     <Content Update="Assets\SampleMedia\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/samples/MahAppsSample/Properties/DesignTimeResources.xaml b/samples/MahAppsSample/Properties/DesignTimeResources.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ui="http://schemas.modernwpf.com/2019">
+    <ResourceDictionary.MergedDictionaries>
+        <ui:IntellisenseResources Source="/ModernWpf;component/DesignTime/DesignTimeResources.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/samples/SamplesCommon/Properties/DesignTimeResources.xaml b/samples/SamplesCommon/Properties/DesignTimeResources.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ui="http://schemas.modernwpf.com/2019">
+    <ResourceDictionary.MergedDictionaries>
+        <ui:IntellisenseResources Source="/ModernWpf;component/DesignTime/DesignTimeResources.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/samples/SamplesCommon/SamplesCommon.csproj b/samples/SamplesCommon/SamplesCommon.csproj
@@ -5,6 +5,10 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Page Remove="Properties\DesignTimeResources.xaml" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
   </ItemGroup>
@@ -32,4 +36,12 @@
     </Reference>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="Properties\DesignTimeResources.xaml">
+      <ContainsDesignTimeResources>True</ContainsDesignTimeResources>
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/test/ModernWpfTestApp/IntellisenseResources.cs b/test/ModernWpfTestApp/IntellisenseResources.cs
diff --git a/test/ModernWpfTestApp/Properties/DesignTimeResources.xaml b/test/ModernWpfTestApp/Properties/DesignTimeResources.xaml
@@ -1,10 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:MUXControlsTestApp">
-
+    xmlns:ui="http://schemas.modernwpf.com/2019">
     <ResourceDictionary.MergedDictionaries>
-        <local:IntellisenseResources Source="/ModernWpf;component/DesignTime/DesignTimeResources.xaml" />
+        <ui:IntellisenseResources Source="/ModernWpf;component/DesignTime/DesignTimeResources.xaml" />
     </ResourceDictionary.MergedDictionaries>
-
 </ResourceDictionary>