Add dependency on Microsoft Xaml Behaviors package

Caliburn-Micro · Nov 16, 2015 · a2ef5c3 · a2ef5c3
1 parent 5744025
commit a2ef5c3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/nuget/Caliburn.Micro.nuspec b/nuget/Caliburn.Micro.nuspec
@@ -22,6 +22,9 @@
       <group>
         <dependency id="Caliburn.Micro.Core" version="[3.0.0-beta1]" />
       </group>
+      <group targetFramework="uap10.0">
+        <dependency id="Microsoft.Xaml.Behaviors.Uwp.Managed" version="1.0.0" />
+      </group>
     </dependencies>
   </metadata>
 
@@ -50,7 +53,6 @@
     <file src="..\bin\iOS\Release\Caliburn.Micro.*.*" target="lib\MonoTouch10" />
 
     <file src="..\bin\uwp\Release\Caliburn.Micro.*.*" target="lib\uap10.0" />
-    <file src="..\bin\uwp\Release\Microsoft.Xaml.*.*" target="lib\uap10.0" />
     <file src="..\bin\uwp\Release\Caliburn.Micro.Platform.UWP\Properties\Caliburn.Micro.Platform.UWP.rd.xml" target="lib\uap10.0\Caliburn.Micro.Platform.UWP\Properties\Caliburn.Micro.Platform.UWP.rd.xml" />
 
     <file src="..\src\*.cs" target="src" />

diff --git a/samples/Caliburn.Micro.HelloUWP/Caliburn.Micro.HelloUWP/Caliburn.Micro.HelloUWP.csproj b/samples/Caliburn.Micro.HelloUWP/Caliburn.Micro.HelloUWP/Caliburn.Micro.HelloUWP.csproj
@@ -140,12 +140,6 @@
     <Reference Include="Caliburn.Micro.Platform.UWP">
       <HintPath>..\..\..\bin\uwp\Debug\Caliburn.Micro.Platform.UWP.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Xaml.Interactions">
-      <HintPath>..\..\..\bin\uwp\Debug\Microsoft.Xaml.Interactions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Xaml.Interactivity">
-      <HintPath>..\..\..\bin\uwp\Debug\Microsoft.Xaml.Interactivity.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Page Include="Views\DeviceView.DeviceFamily-Mobile.xaml">

diff --git a/samples/Caliburn.Micro.HelloUWP/Caliburn.Micro.HelloUWP/project.json b/samples/Caliburn.Micro.HelloUWP/Caliburn.Micro.HelloUWP/project.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
+    "Microsoft.Xaml.Behaviors.Uwp.Managed": "1.0.0"
   },
   "frameworks": {
     "uap10.0": {}

diff --git a/src/Caliburn.Micro.Platform.UWP/Caliburn.Micro.Platform.UWP.csproj b/src/Caliburn.Micro.Platform.UWP/Caliburn.Micro.Platform.UWP.csproj
@@ -244,11 +244,6 @@
       <Name>Caliburn.Micro</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <SDKReference Include="BehaviorsXamlSDKManaged, Version=12.0">
-      <Name>Behaviors SDK %28XAML%29</Name>
-    </SDKReference>
-  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

diff --git a/src/Caliburn.Micro.Platform.UWP/project.json b/src/Caliburn.Micro.Platform.UWP/project.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
+    "Microsoft.Xaml.Behaviors.Uwp.Managed": "1.0.0"
   },
   "frameworks": {
     "uap10.0": {}