Skip to content

Commit 5ff02dc

Browse files
authored
Adaptions for JetBrains Rider (#1738)
* Ignore .idea from JetBrains Rider * Added missing spacing for FieldsViewModel and IsDesignTimeCreatable * Removed obsolete namespace reference
1 parent a3ff17a commit 5ff02dc

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ bld/
2222
# Visual Studio 2015/2017 cache/options directory
2323
.vs/
2424

25+
# JetBrains Rider
26+
.idea
27+
2528
# Roslyn cache directories
2629
*.ide/
2730

MainDemo.Wpf/Fields.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
1010
mc:Ignorable="d"
1111
d:DesignHeight="300" d:DesignWidth="600"
12-
d:DataContext="{d:DesignInstance domain:FieldsViewModelIsDesignTimeCreatable=False}">
12+
d:DataContext="{d:DesignInstance domain:FieldsViewModel, IsDesignTimeCreatable=False}">
1313
<UserControl.Resources>
1414
<ResourceDictionary>
1515
<ResourceDictionary.MergedDictionaries>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Chip.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:local="clr-namespace:MaterialDesignThemes.Wpf.Themes"
43
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
54
xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters">
65

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RichTextBox.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:local="clr-namespace:MaterialDesignThemes.Wpf.Themes"
43
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
54
<ResourceDictionary.MergedDictionaries>
65
<ResourceDictionary Source="MaterialDesignTheme.TextBox.xaml" />

0 commit comments

Comments
 (0)