diff --git a/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj b/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj
index af05a65c..f772624f 100644
--- a/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj
+++ b/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj
@@ -86,15 +86,15 @@
..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll
True
-
- ..\packages\MahApps.Metro.1.2.4.0\lib\net45\MahApps.Metro.dll
+
+ ..\packages\MahApps.Metro.1.3.0-ALPHA179\lib\net45\MahApps.Metro.dll
True
- ..\packages\MahApps.Metro.1.2.4.0\lib\net45\System.Windows.Interactivity.dll
+ ..\packages\MahApps.Metro.1.3.0-ALPHA179\lib\net45\System.Windows.Interactivity.dll
True
diff --git a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/ConfigMenuItem.cs b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/ConfigMenuItem.cs
index 43f784b9..cf5c309c 100644
--- a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/ConfigMenuItem.cs
+++ b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/ConfigMenuItem.cs
@@ -61,11 +61,10 @@ public void OnImportsSatisfied()
{
UiContext.RunOn(() =>
{
- // TODO: Enable with 1.3
- //Icon = new PackIconModern
- //{
- // Kind = PackIconModernKind.Settings
- //};
+ Icon = new PackIconModern
+ {
+ Kind = PackIconModernKind.Settings
+ };
// automatically update the DisplayName
this.BindDisplayName(ContextMenuTranslations, nameof(IContextMenuTranslations.Configure));
});
diff --git a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/ExitMenuItem.cs b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/ExitMenuItem.cs
index 2713efa8..e5d690ca 100644
--- a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/ExitMenuItem.cs
+++ b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/ExitMenuItem.cs
@@ -53,11 +53,10 @@ public void OnImportsSatisfied()
{
// automatically update the DisplayName
this.BindDisplayName(ContextMenuTranslations, nameof(IContextMenuTranslations.Exit));
- // TODO: Enable with 1.3
- //Icon = new PackIconMaterial
- //{
- // Kind = PackIconMaterialKind.ExitToApp
- //};
+ Icon = new PackIconMaterial
+ {
+ Kind = PackIconMaterialKind.ExitToApp
+ };
});
}
diff --git a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/SomeWindowMenuItem.cs b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/SomeWindowMenuItem.cs
index eeb42590..8590bc57 100644
--- a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/SomeWindowMenuItem.cs
+++ b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/SomeWindowMenuItem.cs
@@ -60,11 +60,10 @@ public void OnImportsSatisfied()
{
UiContext.RunOn(() =>
{
- // TODO: Enable with 1.3
- //Icon = new PackIconModern
- //{
- // Kind = PackIconModernKind.List
- //};
+ Icon = new PackIconModern
+ {
+ Kind = PackIconModernKind.List
+ };
// automatically update the DisplayName
this.BindDisplayName(ContextMenuTranslations, nameof(IContextMenuTranslations.SomeWindow));
});
diff --git a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/WithChildrenMenuItem.cs b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/WithChildrenMenuItem.cs
index d16a703c..cfd7febe 100644
--- a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/WithChildrenMenuItem.cs
+++ b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/WithChildrenMenuItem.cs
@@ -61,11 +61,10 @@ public void OnImportsSatisfied()
{
UiContext.RunOn(() =>
{
- // TODO: Enable with 1.3
- //Icon = new PackIconMaterial
- //{
- // Kind = PackIconMaterialKind.HumanChild
- //};
+ Icon = new PackIconMaterial
+ {
+ Kind = PackIconMaterialKind.HumanChild
+ };
// automatically update the DisplayName
this.BindDisplayName(ContextMenuTranslations, nameof(IContextMenuTranslations.WithChildren));
});
diff --git a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/WizardMenuItem.cs b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/WizardMenuItem.cs
index 6d0f8fa5..a66a303c 100644
--- a/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/WizardMenuItem.cs
+++ b/Dapplo.CaliburnMicro.Demo/UseCases/ContextMenu/WizardMenuItem.cs
@@ -60,11 +60,10 @@ public void OnImportsSatisfied()
{
// automatically update the DisplayName
this.BindDisplayName(ContextMenuTranslations, nameof(IContextMenuTranslations.Wizard));
- // TODO: Enable with 1.3
- //Icon = new PackIconFontAwesome
- //{
- // Kind = PackIconFontAwesomeKind.Magic
- //};
+ Icon = new PackIconFontAwesome
+ {
+ Kind = PackIconFontAwesomeKind.Magic
+ };
});
}
diff --git a/Dapplo.CaliburnMicro.Demo/UseCases/Menu/SaveAsMenuItem.cs b/Dapplo.CaliburnMicro.Demo/UseCases/Menu/SaveAsMenuItem.cs
index 1e770368..fedefda9 100644
--- a/Dapplo.CaliburnMicro.Demo/UseCases/Menu/SaveAsMenuItem.cs
+++ b/Dapplo.CaliburnMicro.Demo/UseCases/Menu/SaveAsMenuItem.cs
@@ -54,11 +54,10 @@ public void OnImportsSatisfied()
{
// automatically update the DisplayName
this.BindDisplayName(MenuTranslations, nameof(IMenuTranslations.SaveAs));
- // TODO: Enable with 1.3
- //Icon = new PackIconEntypo
- //{
- // Kind = PackIconEntypoKind.Save
- //};
+ Icon = new PackIconEntypo
+ {
+ Kind = PackIconEntypoKind.Save
+ };
});
}
diff --git a/Dapplo.CaliburnMicro.Demo/UseCases/Wizard/Views/WizardExampleView.xaml b/Dapplo.CaliburnMicro.Demo/UseCases/Wizard/Views/WizardExampleView.xaml
index 27fff2c6..0105cad0 100644
--- a/Dapplo.CaliburnMicro.Demo/UseCases/Wizard/Views/WizardExampleView.xaml
+++ b/Dapplo.CaliburnMicro.Demo/UseCases/Wizard/Views/WizardExampleView.xaml
@@ -24,17 +24,17 @@
-
diff --git a/Dapplo.CaliburnMicro.Demo/packages.config b/Dapplo.CaliburnMicro.Demo/packages.config
index 78894e07..30577ca7 100644
--- a/Dapplo.CaliburnMicro.Demo/packages.config
+++ b/Dapplo.CaliburnMicro.Demo/packages.config
@@ -10,5 +10,5 @@
-
+
\ No newline at end of file
diff --git a/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.csproj b/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.csproj
index 521febbb..8a7bf776 100644
--- a/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.csproj
+++ b/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.csproj
@@ -51,9 +51,8 @@
..\packages\Dapplo.Addons.0.3.53\lib\net45\Dapplo.Addons.dll
True
-
- ..\packages\MahApps.Metro.1.2.4.0\lib\net45\MahApps.Metro.dll
- False
+
+ ..\packages\MahApps.Metro.1.3.0-ALPHA179\lib\net45\MahApps.Metro.dll
True
@@ -62,7 +61,7 @@
- ..\packages\MahApps.Metro.1.2.4.0\lib\net45\System.Windows.Interactivity.dll
+ ..\packages\MahApps.Metro.1.3.0-ALPHA179\lib\net45\System.Windows.Interactivity.dll
True
diff --git a/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.nuspec b/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.nuspec
index 03525aee..e12e7f94 100644
--- a/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.nuspec
+++ b/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.nuspec
@@ -2,7 +2,7 @@
$id$
- $version$
+ $version$-alpha
$author$
http://www.gnu.org/licenses/lgpl-3.0.html
http://www.dapplo.net/blocks/Dapplo.CaliburnMicro
diff --git a/Dapplo.CaliburnMicro.Metro/packages.config b/Dapplo.CaliburnMicro.Metro/packages.config
index 2e6568a8..0725f96a 100644
--- a/Dapplo.CaliburnMicro.Metro/packages.config
+++ b/Dapplo.CaliburnMicro.Metro/packages.config
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 7a39af5d..5d422e37 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.1.{build}
+version: 0.2.{build}
skip_tags: true
configuration: Release
platform: Any CPU