paket update

MaterialDesignInXAML · Aug 24, 2018 · 19cfd5d · 19cfd5d
1 parent 0d36d20
commit 19cfd5d
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 30 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -71,7 +71,7 @@
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreRequired>
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
     </PropertyGroup>
-    
+
     <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
       <PaketRestoreRequired>true</PaketRestoreRequired>
     </PropertyGroup>
@@ -96,7 +96,7 @@
       <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath>
       <!-- paket.references -->
       <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath>
-      
+
       <DoAllResolvedFilesExist>false</DoAllResolvedFilesExist>
       <DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist>
       <PaketRestoreRequired>true</PaketRestoreRequired>

diff --git a/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj b/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj
@@ -14,6 +14,7 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/MainDemo.Wpf/MaterialDesignDemo.csproj b/MainDemo.Wpf/MaterialDesignDemo.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj b/MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
@@ -55,6 +55,14 @@
     <None Include="paket.references" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
+      <PropertyGroup>
+        <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio</__paket__xunit_runner_visualstudio_props>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <Import Project="..\packages\xunit.runner.visualstudio\build\$(__paket__xunit_runner_visualstudio_props).props" Condition="Exists('..\packages\xunit.runner.visualstudio\build\$(__paket__xunit_runner_visualstudio_props).props')" Label="Paket" />
   <!-- 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.
   <Target Name="BeforeBuild">
@@ -84,7 +92,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.2')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
       <ItemGroup>
         <Reference Include="System.Runtime.InteropServices.RuntimeInformation">
           <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>

diff --git a/paket-files/paket.restore.cached b/paket-files/paket.restore.cached
@@ -2,42 +2,50 @@ RESTRICTION: || (== net45) (== net452)
 NUGET
   remote: https://www.nuget.org/api/v2
     AvalonEdit (5.0.4)
-    Castle.Core (4.2.1)
-    Dragablz (0.0.3.197)
-    MahApps.Metro (1.5)
-    Microsoft.NETCore.Platforms (2.0.1) - restriction: == net45
-    Moq (4.7.145)
-      Castle.Core (>= 4.2.1)
-    NETStandard.Library (2.0.1) - restriction: == net45
+    Castle.Core (4.3.1)
+    ControlzEx (3.0.2.4)
+    Dragablz (0.0.3.203)
+    MahApps.Metro (1.6.5)
+      ControlzEx (>= 3.0.2.4 < 4.0)
+    Microsoft.NETCore.Platforms (2.1) - restriction: == net45
+    Moq (4.9)
+      Castle.Core (>= 4.3.1)
+      System.Threading.Tasks.Extensions (>= 4.3)
+      System.ValueTuple (>= 4.4)
+    NETStandard.Library (2.0.3) - restriction: == net45
       Microsoft.NETCore.Platforms (>= 1.1)
       System.Runtime.InteropServices.RuntimeInformation (>= 4.3)
     NSubstitute (2.0.3)
     RhinoMocks (3.6.1)
     Shouldly (2.8.3)
-    ShowMeTheXAML (1.0.8)
-    ShowMeTheXAML.AvalonEdit (1.0.8)
+    ShowMeTheXAML.AvalonEdit (1.0.10)
       AvalonEdit (>= 5.0.4 < 5.1)
-      ShowMeTheXAML (>= 1.0.8 < 1.2)
-    ShowMeTheXAML.MSBuild (1.0.8)
-      ShowMeTheXAML (>= 1.0.8 < 1.2)
+      ShowMeTheXAML (>= 1.0.10 < 1.1)
+    ShowMeTheXAML.MSBuild (1.0.10)
+      ShowMeTheXAML (>= 1.0.10 < 1.1)
+    System.Runtime.CompilerServices.Unsafe (4.5.1)
     System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: == net45
-    xunit (2.3.1)
-      xunit.analyzers (>= 0.7)
-      xunit.assert (2.3.1)
-      xunit.core (2.3.1)
-    xunit.abstractions (2.0.1)
-    xunit.analyzers (0.8)
-    xunit.assert (2.3.1)
+    System.Threading.Tasks.Extensions (4.5.1)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5)
+    System.ValueTuple (4.5)
+    xunit (2.4)
+      xunit.analyzers (>= 0.10)
+      xunit.assert (2.4)
+      xunit.core (2.4)
+    xunit.abstractions (2.0.2)
+    xunit.analyzers (0.10)
+    xunit.assert (2.4)
       NETStandard.Library (>= 1.6.1) - restriction: == net45
-    xunit.core (2.3.1)
-      xunit.extensibility.core (2.3.1)
-      xunit.extensibility.execution (2.3.1)
-    xunit.extensibility.core (2.3.1)
+    xunit.core (2.4)
+      xunit.extensibility.core (2.4)
+      xunit.extensibility.execution (2.4)
+    xunit.extensibility.core (2.4)
       NETStandard.Library (>= 1.6.1) - restriction: == net45
-      xunit.abstractions (>= 2.0.1)
-    xunit.extensibility.execution (2.3.1)
+      xunit.abstractions (>= 2.0.2)
+    xunit.extensibility.execution (2.4)
       NETStandard.Library (>= 1.6.1) - restriction: == net45
-      xunit.extensibility.core (2.3.1)
+      xunit.extensibility.core (2.4)
+    xunit.runner.visualstudio (2.4)
 GITHUB
   remote: ControlzEx/ControlzEx
     src/ControlzEx/BadgedEx.cs (e687c6ac4279c4e513b7ef9a75622411350db874)

diff --git a/paket.lock b/paket.lock
@@ -7,7 +7,7 @@ NUGET
     Dragablz (0.0.3.203)
     MahApps.Metro (1.6.5)
       ControlzEx (>= 3.0.2.4 < 4.0)
-    Microsoft.NETCore.Platforms (2.1) - restriction: == net45
+    Microsoft.NETCore.Platforms (2.1.1) - restriction: == net45
     Moq (4.9)
       Castle.Core (>= 4.3.1)
       System.Threading.Tasks.Extensions (>= 4.3)
@@ -18,6 +18,7 @@ NUGET
     NSubstitute (2.0.3)
     RhinoMocks (3.6.1)
     Shouldly (2.8.3)
+    ShowMeTheXAML (1.0.10)
     ShowMeTheXAML.AvalonEdit (1.0.10)
       AvalonEdit (>= 5.0.4 < 5.1)
       ShowMeTheXAML (>= 1.0.10 < 1.1)