Update to CM v1.4.1

kevicency · Feb 18, 2013 · 84919e4 · 84919e4
1 parent 5ff23b8
commit 84919e4
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 24 deletions.
diff --git a/demos/CMContrib.SL.Demo/CMContrib.SL.Demo.csproj b/demos/CMContrib.SL.Demo/CMContrib.SL.Demo.csproj
@@ -60,6 +60,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\sl4\Caliburn.Micro.dll</HintPath>
+    </Reference>
     <Reference Include="Caliburn.Micro, Version=1.4.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\sl4\Caliburn.Micro.dll</HintPath>
@@ -74,6 +77,7 @@
     <Reference Include="system" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Controls" />
     <Reference Include="System.Windows.Controls, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\sl4\System.Windows.Controls.dll</HintPath>
     </Reference>
@@ -92,6 +96,9 @@
     <Reference Include="System.Windows.Controls.Toolkit, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SilverlightToolkit-Core.4.2010.4\lib\sl4\System.Windows.Controls.Toolkit.dll</HintPath>
     </Reference>
+    <Reference Include="System.Windows.Interactivity">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\sl4\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\sl4\System.Windows.Interactivity.dll</HintPath>
     </Reference>

diff --git a/demos/CMContrib.SL.Demo/packages.config b/demos/CMContrib.SL.Demo/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caliburn.Micro" version="1.4" />
+  <package id="Caliburn.Micro" version="1.4.1" targetFramework="sl40" />
   <package id="SilverlightToolkit-Core" version="4.2010.4" />
   <package id="SilverlightToolkit-Input" version="4.2010.4" />
   <package id="SilverlightToolkit-Layout" version="4.2010.4" />

diff --git a/demos/CMContrib.WPF.Demo/CMContrib.WPF.Demo.csproj b/demos/CMContrib.WPF.Demo/CMContrib.WPF.Demo.csproj
@@ -38,6 +38,9 @@
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\net40\Caliburn.Micro.dll</HintPath>
+    </Reference>
     <Reference Include="Caliburn.Micro, Version=1.4.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\net40\Caliburn.Micro.dll</HintPath>
@@ -53,6 +56,9 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Interactivity">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\net40\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MahApps.Metro.0.6.0.1\lib\net40\System.Windows.Interactivity.dll</HintPath>
     </Reference>
@@ -69,8 +75,11 @@
     <Reference Include="WPF.Themes">
       <HintPath>..\..\packages\wpfthemes.0.0.1\lib\WPF.Themes.dll</HintPath>
     </Reference>
-    <Reference Include="WPFToolkit.Extended">
-      <HintPath>..\..\packages\Extended.Wpf.Toolkit.1.5.0\lib\net40\WPFToolkit.Extended.dll</HintPath>
+    <Reference Include="Xceed.Wpf.DataGrid">
+      <HintPath>..\..\packages\Extended.Wpf.Toolkit.1.9.0\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit">
+      <HintPath>..\..\packages\Extended.Wpf.Toolkit.1.9.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/demos/CMContrib.WPF.Demo/Resources/Styles.xaml b/demos/CMContrib.WPF.Demo/Resources/Styles.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Controls="clr-namespace:Microsoft.Windows.Controls;assembly=WPFToolkit.Extended">
+					xmlns:extToolkit="http://schemas.xceed.com/wpf/xaml/toolkit">
     <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
         <Setter Property="Margin" Value="3 5" />
         <Setter Property="MinWidth" Value="100" />
@@ -15,7 +15,7 @@
     <Style TargetType="DockPanel">
         <Setter Property="LastChildFill" Value="true" />
     </Style>
-    <Style BasedOn="{StaticResource {x:Type Controls:IntegerUpDown}}" TargetType="Controls:IntegerUpDown">
+    <Style BasedOn="{StaticResource {x:Type extToolkit:IntegerUpDown}}" TargetType="extToolkit:IntegerUpDown">
         <Setter Property="Margin" Value="3" />
     </Style>
     <Style BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="ComboBox">

diff --git a/demos/CMContrib.WPF.Demo/ShellView.xaml b/demos/CMContrib.WPF.Demo/ShellView.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:Behaviours="clr-namespace:MahApps.Metro.Behaviours;assembly=MahApps.Metro"
         xmlns:ComponentModel="clr-namespace:System.ComponentModel;assembly=PresentationFramework"
-        xmlns:Controls="clr-namespace:Microsoft.Windows.Controls;assembly=WPFToolkit.Extended"
+        xmlns:extToolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:Demo="clr-namespace:Caliburn.Micro.Contrib.Demo"
         xmlns:Design="clr-namespace:Caliburn.Micro.Contrib.Demo.ViewModels.Design"
@@ -46,7 +46,7 @@
             <GradientStop Offset="1" Color="White" />
         </LinearGradientBrush>
     </Window.Background>
-    <Controls:BusyIndicator x:Name="BusyIndicator">
+    <extToolkit:BusyIndicator x:Name="BusyIndicator">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto" />
@@ -157,6 +157,6 @@
                 </ScrollViewer>
             </Expander>
         </Grid>
-    </Controls:BusyIndicator>
+    </extToolkit:BusyIndicator>
 </Window>
 
diff --git a/demos/CMContrib.WPF.Demo/packages.config b/demos/CMContrib.WPF.Demo/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caliburn.Micro" version="1.4" />
+  <package id="Caliburn.Micro" version="1.4.1" targetFramework="net40" />
   <package id="ColorCode" version="1.0.1" />
-  <package id="Extended.Wpf.Toolkit" version="1.5.0" />
+  <package id="Extended.Wpf.Toolkit" version="1.9.0" targetFramework="net40" />
   <package id="MahApps.Metro" version="0.6.0.1" />
   <package id="wpfthemes" version="0.0.1" />
 </packages>
diff --git a/spec/CMContrib.Spec/CMContrib.Spec.csproj b/spec/CMContrib.Spec/CMContrib.Spec.csproj
@@ -38,6 +38,9 @@
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\net40\Caliburn.Micro.dll</HintPath>
+    </Reference>
     <Reference Include="Caliburn.Micro, Version=1.4.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\net40\Caliburn.Micro.dll</HintPath>
@@ -59,6 +62,9 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Interactivity">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\net40\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
     </Reference>

diff --git a/spec/CMContrib.Spec/packages.config b/spec/CMContrib.Spec/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caliburn.Micro" version="1.4" />
+  <package id="Caliburn.Micro" version="1.4.1" targetFramework="net40" />
   <package id="Machine.Fakes" version="0.3.3" />
   <package id="Machine.Fakes.Moq" version="0.3.3" />
   <package id="Machine.Specifications" version="0.5.2.0" />

diff --git a/src/CMContrib.SL/CMContrib.SL.csproj b/src/CMContrib.SL/CMContrib.SL.csproj
@@ -52,19 +52,22 @@
     <AssemblyOriginatorKeyFile>CMContrib.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Caliburn.Micro, Version=1.4.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\sl4\Caliburn.Micro.dll</HintPath>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\sl4\Caliburn.Micro.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.ComponentModel.Composition.Initialization, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Windows" />
     <Reference Include="system" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Controls" />
     <Reference Include="System.Windows.Controls, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\sl4\System.Windows.Controls.dll</HintPath>
     </Reference>
+    <Reference Include="System.Windows.Interactivity">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\sl4\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\sl4\System.Windows.Interactivity.dll</HintPath>
     </Reference>

diff --git a/src/CMContrib.SL/packages.config b/src/CMContrib.SL/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caliburn.Micro" version="1.4" />
+  <package id="Caliburn.Micro" version="1.4.1" targetFramework="sl40" />
 </packages>
diff --git a/src/CMContrib.SL5/CMContrib.SL5.csproj b/src/CMContrib.SL5/CMContrib.SL5.csproj
@@ -52,19 +52,22 @@
     <AssemblyOriginatorKeyFile>CMContrib.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Caliburn.Micro, Version=1.4.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\sl5\Caliburn.Micro.dll</HintPath>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\sl5\Caliburn.Micro.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="System.ComponentModel.Composition, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.ComponentModel.Composition.Initialization, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Windows" />
     <Reference Include="system" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Controls" />
     <Reference Include="System.Windows.Controls, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\sl5\System.Windows.Controls.dll</HintPath>
     </Reference>
+    <Reference Include="System.Windows.Interactivity">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\sl5\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Interactivity, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\sl5\System.Windows.Interactivity.dll</HintPath>
     </Reference>

diff --git a/src/CMContrib.SL5/packages.config b/src/CMContrib.SL5/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caliburn.Micro" version="1.4" />
+  <package id="Caliburn.Micro" version="1.4.1" targetFramework="sl50" />
 </packages>
diff --git a/src/CMContrib.WPF/CMContrib.WPF.csproj b/src/CMContrib.WPF/CMContrib.WPF.csproj
@@ -41,15 +41,17 @@
     <AssemblyOriginatorKeyFile>CMContrib.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Caliburn.Micro, Version=1.4.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\net40\Caliburn.Micro.dll</HintPath>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\net40\Caliburn.Micro.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Interactivity">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\net40\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
     </Reference>

diff --git a/src/CMContrib.WPF/packages.config b/src/CMContrib.WPF/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caliburn.Micro" version="1.4" />
+  <package id="Caliburn.Micro" version="1.4.1" targetFramework="net40" />
 </packages>
diff --git a/test/CMContrib.Test/CMContrib.Test.csproj b/test/CMContrib.Test/CMContrib.Test.csproj
@@ -42,6 +42,9 @@
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\net40\Caliburn.Micro.dll</HintPath>
+    </Reference>
     <Reference Include="Caliburn.Micro, Version=1.4.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\net40\Caliburn.Micro.dll</HintPath>
@@ -61,6 +64,9 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Interactivity">
+      <HintPath>..\..\packages\Caliburn.Micro.1.4.1\lib\net40\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Caliburn.Micro.1.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
     </Reference>

diff --git a/test/CMContrib.Test/packages.config b/test/CMContrib.Test/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caliburn.Micro" version="1.4" />
+  <package id="Caliburn.Micro" version="1.4.1" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="NUnit" version="2.5.10.11092" />
 </packages>