ライブラリ更新

Grabacr07 · Dec 14, 2015 · ee9b4c6 · ee9b4c6
1 parent af87e7f
commit ee9b4c6
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 60 deletions.
diff --git a/source/Grabacr07.KanColleViewer.Controls/Controls.Globalization/Resources.Designer.cs b/source/Grabacr07.KanColleViewer.Controls/Controls.Globalization/Resources.Designer.cs
diff --git a/source/Grabacr07.KanColleViewer.Controls/KanColleViewer.Controls.csproj b/source/Grabacr07.KanColleViewer.Controls/KanColleViewer.Controls.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Grabacr07.KanColleViewer</RootNamespace>
     <AssemblyName>KanColleViewer.Controls</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/source/Grabacr07.KanColleViewer/Application.xaml.cs b/source/Grabacr07.KanColleViewer/Application.xaml.cs
@@ -14,7 +14,7 @@
 using Grabacr07.KanColleViewer.Views;
 using Grabacr07.KanColleWrapper;
 using Livet;
-using MetroRadiance;
+using MetroRadiance.UI;
 using MetroTrilithon.Lifetime;
 
 namespace Grabacr07.KanColleViewer

diff --git a/source/Grabacr07.KanColleViewer/ViewModels/TabItemViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/TabItemViewModel.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Livet;
-using MetroRadiance.Controls;
 using Grabacr07.KanColleViewer.Models;
+using Livet;
 using Livet.EventListeners;
+using MetroRadiance.UI.Controls;
 
 namespace Grabacr07.KanColleViewer.ViewModels
 {

diff --git a/source/Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs b/source/Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs
@@ -9,8 +9,8 @@
 using System.Windows.Navigation;
 using Grabacr07.KanColleViewer.Models;
 using Grabacr07.KanColleViewer.ViewModels;
-using MetroRadiance.Core;
 using mshtml;
+using MetroRadiance.Interop;
 using MetroTrilithon.Controls;
 using SHDocVw;
 using IServiceProvider = Grabacr07.KanColleViewer.Win32.IServiceProvider;

diff --git a/source/Grabacr07.KanColleViewer/Views/Controls/ZoomFactorSelector.xaml.cs b/source/Grabacr07.KanColleViewer/Views/Controls/ZoomFactorSelector.xaml.cs
@@ -3,22 +3,15 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Grabacr07.KanColleViewer.Models;
 using Livet;
 using Livet.EventListeners;
-using MetroRadiance.Core;
+using MetroRadiance.Interop;
 
 namespace Grabacr07.KanColleViewer.Views.Controls
 {
@@ -78,10 +71,7 @@ private static void ZoomFactorPropertyChangedCallback(DependencyObject d, Depend
 			var source = (ZoomFactorSelector)d;
 			var newValue = (IZoomFactor)e.NewValue;
 
-			if (source.zoomFactorNotifyListener != null)
-			{
-				source.zoomFactorNotifyListener.Dispose();
-			}
+			source.zoomFactorNotifyListener?.Dispose();
 
 			if (newValue != null)
 			{
@@ -120,7 +110,7 @@ private static void ZoomFactorPropertyChangedCallback(DependencyObject d, Depend
 
 		public ZoomFactorSelector()
 		{
-			InitializeComponent();
+			this.InitializeComponent();
 
 			this.Popup.CustomPopupPlacementCallback = this.PopupPlacementCallback;
 			this.Popup.Opened += (sender, args) => this.ChangeBackground();

diff --git a/source/Grabacr07.KanColleViewer/WindowService.cs b/source/Grabacr07.KanColleViewer/WindowService.cs
@@ -12,7 +12,7 @@
 using Grabacr07.KanColleWrapper;
 using Livet;
 using Livet.Messaging;
-using MetroRadiance;
+using MetroRadiance.UI;
 using MetroTrilithon.Lifetime;
 using MetroTrilithon.Mvvm;
 

diff --git a/source/MetroRadiance b/source/MetroRadiance
diff --git a/source/MetroTrilithon b/source/MetroTrilithon
diff --git a/source/Plugins/Counter/Counter.csproj b/source/Plugins/Counter/Counter.csproj
@@ -9,12 +9,13 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Counter</RootNamespace>
     <AssemblyName>Counter</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/source/Plugins/Counter/Properties/Resources.Designer.cs b/source/Plugins/Counter/Properties/Resources.Designer.cs
diff --git a/source/Plugins/Counter/Properties/Settings.Designer.cs b/source/Plugins/Counter/Properties/Settings.Designer.cs
diff --git a/source/Plugins/Counter/app.config b/source/Plugins/Counter/app.config
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.4.0" newVersion="2.2.4.0" />
+        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.2.4.0" newVersion="2.2.4.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.4.0" newVersion="2.2.4.0" />
+        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.2.4.0" newVersion="2.2.4.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Linq" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.4.0" newVersion="2.2.4.0" />
+        <assemblyIdentity name="System.Reactive.Linq" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.2.4.0" newVersion="2.2.4.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/source/Plugins/MasterDataViewer/MasterDataViewer.csproj b/source/Plugins/MasterDataViewer/MasterDataViewer.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Grabacr07.KanColleViewer.Plugins</RootNamespace>
     <AssemblyName>ExPlugin.MasterDataViewer</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>

diff --git a/source/Plugins/MasterDataViewer/Properties/Resources.Designer.cs b/source/Plugins/MasterDataViewer/Properties/Resources.Designer.cs
diff --git a/source/Plugins/MasterDataViewer/Properties/Settings.Designer.cs b/source/Plugins/MasterDataViewer/Properties/Settings.Designer.cs
diff --git a/source/Plugins/MasterDataViewer/app.config b/source/Plugins/MasterDataViewer/app.config
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.4.0" newVersion="2.2.4.0" />
+        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.2.4.0" newVersion="2.2.4.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.4.0" newVersion="2.2.4.0" />
+        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.2.4.0" newVersion="2.2.4.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>