依存パッケージ更新

suconbu · Feb 6, 2024 · f3144df · f3144df
1 parent e982584
commit f3144df
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 116 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "toolbox"]
-	path = toolbox
-	url = [email protected]:suconbu/toolbox.git
 [submodule "Memezo"]
 	path = Memezo
 	url = [email protected]:suconbu/memezo.git
+[submodule "toolbox"]
+	path = toolbox
+	url = [email protected]:suconbu/toolbox.git
diff --git a/App.config b/App.config
@@ -1,105 +1,113 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="Suconbu.Sumacon.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-    <userSettings>
-        <Suconbu.Sumacon.Properties.Settings>
-            <setting name="MainSize" serializeAs="String">
-                <value>960, 540</value>
-            </setting>
-            <setting name="CaptureSaveDirectoryPath" serializeAs="String">
-                <value>.\screencapture</value>
-            </setting>
-            <setting name="CaptureFileNamePattern" serializeAs="String">
-                <value>{device-model}_{date}_{time}_{no}.png</value>
-            </setting>
-            <setting name="CaptureContinuousEnabled" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="CaptureIntervalSeconds" serializeAs="String">
-                <value>1</value>
-            </setting>
-            <setting name="CaptureCount" serializeAs="String">
-                <value>10</value>
-            </setting>
-            <setting name="CaptureSkipDuplicateEnabled" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="RecordSaveDirectoryPath" serializeAs="String">
-                <value>.\screenrecord</value>
-            </setting>
-            <setting name="RecordFileNamePattern" serializeAs="String">
-                <value>{device-model}_{date}_{time}_{width}x{height}_{duration}_{no}.mp4</value>
-            </setting>
-            <setting name="RecordViewSize" serializeAs="String">
-                <value>1/1</value>
-            </setting>
-            <setting name="RecordQuality" serializeAs="String">
-                <value>Normal</value>
-            </setting>
-            <setting name="RecordTimestampEnabled" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="RecordLimitTime" serializeAs="String">
-                <value>180</value>
-            </setting>
-            <setting name="CaptureCountEnabled" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="CaptureSplitterDistance" serializeAs="String">
-                <value>420</value>
-            </setting>
-            <setting name="RecordSplitterDistance" serializeAs="String">
-                <value>450</value>
-            </setting>
-            <setting name="RecordLimitTimeMax" serializeAs="String">
-                <value>180</value>
-            </setting>
-            <setting name="DeviceTemporaryDirectoryPath" serializeAs="String">
-                <value>/sdcard</value>
-            </setting>
-            <setting name="LogFilterPriorityF" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="LogFilterPriorityE" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="LogFilterPriorityW" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="LogFilterPriorityI" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="LogFilterPriorityD" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="LogFilterPriorityV" serializeAs="String">
-                <value>True</value>
-            </setting>
-            <setting name="ControlBeep" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="DeviceManagerTouchProtocolType" serializeAs="String">
-                <value>A</value>
-            </setting>
-            <setting name="MainMaximized" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="RecordPullDelayMillisecondsAtManualStop" serializeAs="String">
-                <value>1500</value>
-            </setting>
-            <setting name="ScriptText" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="ScriptStepTimeoutMilliseconds" serializeAs="String">
-                <value>10000</value>
-            </setting>
-        </Suconbu.Sumacon.Properties.Settings>
-    </userSettings>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="Suconbu.Sumacon.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+    <userSettings>
+        <Suconbu.Sumacon.Properties.Settings>
+            <setting name="MainSize" serializeAs="String">
+                <value>960, 540</value>
+            </setting>
+            <setting name="CaptureSaveDirectoryPath" serializeAs="String">
+                <value>.\screencapture</value>
+            </setting>
+            <setting name="CaptureFileNamePattern" serializeAs="String">
+                <value>{device-model}_{date}_{time}_{no}.png</value>
+            </setting>
+            <setting name="CaptureContinuousEnabled" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="CaptureIntervalSeconds" serializeAs="String">
+                <value>1</value>
+            </setting>
+            <setting name="CaptureCount" serializeAs="String">
+                <value>10</value>
+            </setting>
+            <setting name="CaptureSkipDuplicateEnabled" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="RecordSaveDirectoryPath" serializeAs="String">
+                <value>.\screenrecord</value>
+            </setting>
+            <setting name="RecordFileNamePattern" serializeAs="String">
+                <value>{device-model}_{date}_{time}_{width}x{height}_{duration}_{no}.mp4</value>
+            </setting>
+            <setting name="RecordViewSize" serializeAs="String">
+                <value>1/1</value>
+            </setting>
+            <setting name="RecordQuality" serializeAs="String">
+                <value>Normal</value>
+            </setting>
+            <setting name="RecordTimestampEnabled" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="RecordLimitTime" serializeAs="String">
+                <value>180</value>
+            </setting>
+            <setting name="CaptureCountEnabled" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="CaptureSplitterDistance" serializeAs="String">
+                <value>420</value>
+            </setting>
+            <setting name="RecordSplitterDistance" serializeAs="String">
+                <value>450</value>
+            </setting>
+            <setting name="RecordLimitTimeMax" serializeAs="String">
+                <value>180</value>
+            </setting>
+            <setting name="DeviceTemporaryDirectoryPath" serializeAs="String">
+                <value>/sdcard</value>
+            </setting>
+            <setting name="LogFilterPriorityF" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="LogFilterPriorityE" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="LogFilterPriorityW" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="LogFilterPriorityI" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="LogFilterPriorityD" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="LogFilterPriorityV" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="ControlBeep" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="DeviceManagerTouchProtocolType" serializeAs="String">
+                <value>A</value>
+            </setting>
+            <setting name="MainMaximized" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="RecordPullDelayMillisecondsAtManualStop" serializeAs="String">
+                <value>1500</value>
+            </setting>
+            <setting name="ScriptText" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="ScriptStepTimeoutMilliseconds" serializeAs="String">
+                <value>10000</value>
+            </setting>
+        </Suconbu.Sumacon.Properties.Settings>
+    </userSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.32.0" newVersion="3.1.32.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/packages.config b/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DockPanelSuite" version="3.0.6" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.32" targetFramework="net461" />
   <package id="SharpAdbClient" version="2.3.23" targetFramework="net461" />
-  <package id="System.Buffers" version="4.5.0" targetFramework="net461" />
-  <package id="System.Drawing.Common" version="4.5.0" targetFramework="net461" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
+  <package id="System.Drawing.Common" version="4.7.3" targetFramework="net461" />
 </packages>
diff --git a/sumacon.csproj b/sumacon.csproj
@@ -39,20 +39,20 @@
     <Reference Include="Azuki">
       <HintPath>Azuki\Azuki.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.3.1.32\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="SharpAdbClient, Version=2.3.0.0, Culture=neutral, PublicKeyToken=d728076f5d82a2e8, processorArchitecture=MSIL">
       <HintPath>packages\SharpAdbClient.2.3.23\lib\net461\SharpAdbClient.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+      <HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
-    <Reference Include="System.Drawing.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Drawing.Common.4.5.0\lib\net461\System.Drawing.Common.dll</HintPath>
+    <Reference Include="System.Drawing.Common, Version=4.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/toolbox b/toolbox