Update packages, enable sally area filter

Yuubari · Nov 19, 2015 · b34ef1d · b34ef1d
1 parent baeffef
commit b34ef1d
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogFilter.cs b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogFilter.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Grabacr07.KanColleViewer.Models;
+using Grabacr07.KanColleViewer.Properties;
 using Grabacr07.KanColleWrapper;
 using Grabacr07.KanColleWrapper.Models;
 using Livet;
@@ -594,7 +595,7 @@ public SallyAreaFilterChild(SallyArea area, ShipSallyAreaFilter owner)
 			{
 				this.model = area ?? SallyArea.Default;
 				this.owner = owner;
-				this.Name = area?.Name ?? "出撃海域なし";
+				this.Name = area?.Name ?? Resources.ShipCatalog_Operation_Neither;
 			}
 
 			public bool Predicate(Ship ship)

diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
@@ -407,7 +407,6 @@
 						</WrapPanel>
 					</Border>
 
-					<!--
 					<Border BorderThickness="1"
 							BorderBrush="{DynamicResource BorderBrushKey}"
 							Margin="0,8,0,0"
@@ -434,7 +433,6 @@
 							</ItemsControl>
 						</DockPanel>
 					</Border>
-					-->
 
 				</StackPanel>
 			</Expander>

diff --git a/source/Plugins/Counter/Counter.csproj b/source/Plugins/Counter/Counter.csproj
@@ -55,8 +55,8 @@
       <HintPath>..\..\packages\LivetCask.1.3.1.0\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Nekoxy, Version=1.3.1.16, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Nekoxy.1.3.1.16\lib\net45\Nekoxy.dll</HintPath>
+    <Reference Include="Nekoxy, Version=1.5.1.19, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Nekoxy.1.5.1.19\lib\net45\Nekoxy.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -95,7 +95,7 @@
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="TrotiNet, Version=0.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Nekoxy.1.3.1.16\lib\net45\TrotiNet.dll</HintPath>
+      <HintPath>..\..\packages\Nekoxy.1.5.1.19\lib\net45\TrotiNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="WindowsBase" />

diff --git a/source/Plugins/Counter/packages.config b/source/Plugins/Counter/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="LivetCask" version="1.3.1.0" targetFramework="net45" />
   <package id="log4net" version="2.0.3" targetFramework="net45" />
-  <package id="Nekoxy" version="1.3.1.16" targetFramework="net45" />
+  <package id="Nekoxy" version="1.5.1.19" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />

diff --git a/source/Plugins/Logger/Logger.csproj b/source/Plugins/Logger/Logger.csproj
@@ -42,8 +42,8 @@
       <HintPath>..\..\packages\LivetExtensions.1.1.0.0\lib\net45\Livet.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.4\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

diff --git a/source/Plugins/Logger/app.config b/source/Plugins/Logger/app.config
@@ -18,6 +18,10 @@
         <assemblyIdentity name="Livet" publicKeyToken="b0b1d3f711ef38cb" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.14.0" newVersion="1.2.14.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/source/Plugins/Logger/packages.config b/source/Plugins/Logger/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="LivetCask" version="1.3.1.0" targetFramework="net45" />
   <package id="LivetExtensions" version="1.1.0.0" targetFramework="net45" />
-  <package id="log4net" version="2.0.3" targetFramework="net45" />
+  <package id="log4net" version="2.0.4" targetFramework="net45" />
   <package id="Nekoxy" version="1.5.1.19" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />