Releasing with alpha packages for a 0.2

[release]
dapplo · Jul 25, 2016 · 47e7fb3 · 47e7fb3
1 parent f08cf17
commit 47e7fb3
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 49 deletions.
diff --git a/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj b/Dapplo.CaliburnMicro.Demo/Dapplo.CaliburnMicro.Demo.csproj
@@ -86,15 +86,15 @@
       <HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MahApps.Metro, Version=1.2.4.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.2.4.0\lib\net45\MahApps.Metro.dll</HintPath>
+    <Reference Include="MahApps.Metro, Version=1.3.0.179, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.3.0-ALPHA179\lib\net45\MahApps.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.2.4.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\packages\MahApps.Metro.1.3.0-ALPHA179\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,17 +24,17 @@
 			</TabControl.ItemContainerStyle>
 		</TabControl>
 		<StackPanel Grid.Row="1" Orientation="Horizontal">
-			<Button x:Name="Previous" ToolTip="{Binding WizardTranslations.Previous}" Content="{Binding WizardTranslations.Previous}">
-				<!--<mah:PackIconModern Kind="NavigatePrevious" Height="24" Width="24" />-->
+			<Button x:Name="Previous" ToolTip="{Binding WizardTranslations.Previous}">
+				<mah:PackIconModern Kind="NavigatePrevious" Height="24" Width="24" />
 			</Button>
-			<Button x:Name="Next" ToolTip="{Binding WizardTranslations.Next}" Content="{Binding WizardTranslations.Next}">
-				<!--<mah:PackIconModern Kind="NavigateNext" Height="24" Width="24" />-->
+			<Button x:Name="Next" ToolTip="{Binding WizardTranslations.Next}">
+				<mah:PackIconModern Kind="NavigateNext" Height="24" Width="24" />
 			</Button>
-			<Button x:Name="Cancel" ToolTip="{Binding WizardTranslations.Cancel}" Content="{Binding WizardTranslations.Cancel}">
-				<!--<mah:PackIconModern Kind="Cancel" Height="24" Width="24" />-->
+			<Button x:Name="Cancel" ToolTip="{Binding WizardTranslations.Cancel}">
+				<mah:PackIconModern Kind="Cancel" Height="24" Width="24" />
 			</Button>
-			<Button x:Name="Finish" ToolTip="{Binding WizardTranslations.Finish}" Content="{Binding WizardTranslations.Finish}">
-				<!--<mah:PackIconModern Kind="CameraFlash" Height="24" Width="24" />-->
+			<Button x:Name="Finish" ToolTip="{Binding WizardTranslations.Finish}">
+				<mah:PackIconModern Kind="CameraFlash" Height="24" Width="24" />
 			</Button>
 		</StackPanel>
 	</Grid>

diff --git a/Dapplo.CaliburnMicro.Demo/packages.config b/Dapplo.CaliburnMicro.Demo/packages.config
@@ -10,5 +10,5 @@
   <package id="Dapplo.Log.Loggers" version="0.5.4" targetFramework="net452" />
   <package id="Dapplo.Utils" version="0.1.73" targetFramework="net452" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net452" />
-  <package id="MahApps.Metro" version="1.2.4.0" targetFramework="net452" />
+  <package id="MahApps.Metro" version="1.3.0-ALPHA179" targetFramework="net452" />
 </packages>
diff --git a/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.csproj b/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.csproj
@@ -51,9 +51,8 @@
       <HintPath>..\packages\Dapplo.Addons.0.3.53\lib\net45\Dapplo.Addons.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MahApps.Metro, Version=1.2.4.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.2.4.0\lib\net45\MahApps.Metro.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="MahApps.Metro, Version=1.3.0.179, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.3.0-ALPHA179\lib\net45\MahApps.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -62,7 +61,7 @@
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.2.4.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\packages\MahApps.Metro.1.3.0-ALPHA179\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xaml" />

diff --git a/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.nuspec b/Dapplo.CaliburnMicro.Metro/Dapplo.CaliburnMicro.Metro.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>$id$</id>
-        <version>$version$</version>
+        <version>$version$-alpha</version>
         <authors>$author$</authors>
         <licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.html</licenseUrl>
         <projectUrl>http://www.dapplo.net/blocks/Dapplo.CaliburnMicro</projectUrl>

diff --git a/Dapplo.CaliburnMicro.Metro/packages.config b/Dapplo.CaliburnMicro.Metro/packages.config
@@ -3,5 +3,5 @@
   <package id="Caliburn.Micro" version="3.0.1" targetFramework="net452" />
   <package id="Caliburn.Micro.Core" version="3.0.1" targetFramework="net452" />
   <package id="Dapplo.Addons" version="0.3.53" targetFramework="net45" />
-  <package id="MahApps.Metro" version="1.2.4.0" targetFramework="net45" />
+  <package id="MahApps.Metro" version="1.3.0-ALPHA179" targetFramework="net45" />
 </packages>
diff --git 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