Skip to content

Commit

Permalink
update packi icon to remove possible startup binding errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ButchersBoy committed Oct 12, 2016
1 parent 4143684 commit 77d0bc8
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 11 deletions.
1 change: 0 additions & 1 deletion MainDemo.Wpf/MaterialDesignDemo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@
<ItemGroup>
<Resource Include="favicon.ico" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
13 changes: 5 additions & 8 deletions paket-files/ControlzEx/ControlzEx/src/ControlzEx/PackIconBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ protected PackIconBase(Func<IDictionary<TKind, string>> dataIndexFactory)
_dataIndex = new Lazy<IDictionary<TKind, string>>(dataIndexFactory);
}

public static readonly DependencyProperty KindProperty = DependencyProperty.Register(
"Kind", typeof(TKind), typeof(PackIconBase<TKind>), new PropertyMetadata(default(TKind), KindPropertyChangedCallback));
public static readonly DependencyProperty KindProperty
= DependencyProperty.Register(nameof(Kind), typeof(TKind), typeof(PackIconBase<TKind>), new PropertyMetadata(default(TKind), KindPropertyChangedCallback));

private static void KindPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
{
Expand All @@ -49,14 +49,11 @@ public TKind Kind
set { SetValue(KindProperty, value); }
}

private static readonly DependencyPropertyKey DataPropertyKey =
DependencyProperty.RegisterReadOnly(
"Data", typeof(string), typeof(PackIconBase<TKind>),
new PropertyMetadata(default(string)));
private static readonly DependencyPropertyKey DataPropertyKey
= DependencyProperty.RegisterReadOnly(nameof(Data), typeof(string), typeof(PackIconBase<TKind>), new PropertyMetadata(""));

// ReSharper disable once StaticMemberInGenericType
public static readonly DependencyProperty DataProperty =
DataPropertyKey.DependencyProperty;
public static readonly DependencyProperty DataProperty = DataPropertyKey.DependencyProperty;

/// <summary>
/// Gets the icon path data for the current <see cref="Kind"/>.
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
72aa238cd565ef63e8d52c29982a587e039d04ec
10d0bab474eb73a846e3993175c8357a7fa95c07
2 changes: 1 addition & 1 deletion paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ nuget xunit.extensibility.core 2.1.0 framework: = net452
nuget xunit.extensibility.execution 2.1.0 framework: = net452

github ControlzEx/ControlzEx:72aa238cd565ef63e8d52c29982a587e039d04ec src/ControlzEx/PopupEx.cs
github ControlzEx/ControlzEx:72aa238cd565ef63e8d52c29982a587e039d04ec src/ControlzEx/PackIconBase.cs
github ControlzEx/ControlzEx:10d0bab474eb73a846e3993175c8357a7fa95c07 src/ControlzEx/PackIconBase.cs
github samueldjack/VirtualCollection:e63d891c252c2ac1a3ebb26dddb9a3d89effe3f2 VirtualCollection/VirtualCollection/VirtualizingWrapPanel.cs
2 changes: 1 addition & 1 deletion paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ NUGET
xunit.extensibility.core (2.1)
GITHUB
remote: ControlzEx/ControlzEx
src/ControlzEx/PackIconBase.cs (72aa238cd565ef63e8d52c29982a587e039d04ec)
src/ControlzEx/PackIconBase.cs (10d0bab474eb73a846e3993175c8357a7fa95c07)
src/ControlzEx/PopupEx.cs (72aa238cd565ef63e8d52c29982a587e039d04ec)
remote: samueldjack/VirtualCollection
VirtualCollection/VirtualCollection/VirtualizingWrapPanel.cs (e63d891c252c2ac1a3ebb26dddb9a3d89effe3f2)

0 comments on commit 77d0bc8

Please sign in to comment.