Merge branch 'develop' into release

opentween · Jan 10, 2023 · f8805de · f8805de
2 parents a3f8aac + 132d8eb
commit f8805de
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 48 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -85,9 +85,9 @@ jobs:
         run: |
           $altCoverVersion = '8.2.837'
           $xunitVersion = '2.4.1'
-          $targetFramework = 'net472'
-          $altCoverPath = "$($env:NUGET_PACKAGES)\altcover\$($altCoverVersion)\tools\$($targetFramework)\AltCover.exe"
-          $xunitPath = "$($env:NUGET_PACKAGES)\xunit.runner.console\$($xunitVersion)\tools\$($targetFramework)\xunit.console.exe"
+          $targetFramework = 'net48'
+          $altCoverPath = "$($env:NUGET_PACKAGES)\altcover\$($altCoverVersion)\tools\net472\AltCover.exe"
+          $xunitPath = "$($env:NUGET_PACKAGES)\xunit.runner.console\$($xunitVersion)\tools\net472\xunit.console.exe"
 
           $p = Start-Process `
             -FilePath $altCoverPath `
@@ -167,7 +167,7 @@ jobs:
         shell: powershell # runtime-versionを取得するため従来のPowershellを使用する
         run: |
           $env:PATH = $env:PATH + ';C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Msbuild\Current\Bin\Roslyn\'
-          $binDir = '.\OpenTween\bin\' + $env:CONFIGURATION + '\net472\'
+          $binDir = '.\OpenTween\bin\' + $env:CONFIGURATION + '\net48\'
           $destPath = 'OpenTween.zip'
           $headCommit = '${{ github.event.pull_request.head.sha }}'
           .\tools\build-zip-archive.ps1 -BinDir $binDir -DestPath $destPath -HeadCommit $headCommit

diff --git a/OpenTween.Tests/OpenTween.Tests.csproj b/OpenTween.Tests/OpenTween.Tests.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>OpenTween</RootNamespace>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>

diff --git a/OpenTween/ApplicationPreconditions.cs b/OpenTween/ApplicationPreconditions.cs
@@ -35,8 +35,8 @@ public sealed class ApplicationPreconditions
     {
         // .NET Framework ランタイムの最小要件
         // 参照: https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/how-to-determine-which-versions-are-installed
-        private const string RuntimeMinimumVersionName = ".NET Framework 4.7.2";
-        private const int RuntimeMinimumVersion = 461808;
+        private const string RuntimeMinimumVersionName = ".NET Framework 4.8";
+        private const int RuntimeMinimumVersion = 528040;
 
         /// <summary>
         /// 全ての起動要件を満たしているか確認する

diff --git a/OpenTween/Connection/Networking.cs b/OpenTween/Connection/Networking.cs
@@ -73,15 +73,6 @@ public static bool ForceIPv4
             }
         }
 
-        private static bool IsWindows7
-        {
-            get
-            {
-                var os = Environment.OSVersion;
-                return os.Platform == PlatformID.Win32NT && os.Version.Major == 6 && os.Version.Minor == 1;
-            }
-        }
-
         /// <summary>
         /// Webプロキシの設定が変更された場合に発生します
         /// </summary>
@@ -108,10 +99,6 @@ public static void Initialize()
 
             ServicePointManager.Expect100Continue = false;
             ServicePointManager.CheckCertificateRevocationList = true;
-
-            // Win7 では SystemDefault が SSL3.0 または TLS1.0 のため、明示的にバージョンを引き上げる必要がある
-            if (IsWindows7)
-                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;
         }
 
         public static void SetWebProxy(

diff --git a/OpenTween/OpenTween.csproj b/OpenTween/OpenTween.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <UseWindowsForms>true</UseWindowsForms>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <LangVersion>10.0</LangVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>

diff --git a/OpenTween/Properties/AssemblyInfo.cs b/OpenTween/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 // 次の GUID は、このプロジェクトが COM に公開される場合の、typelib の ID です
 [assembly: Guid("2d0ae0ba-adac-49a2-9b10-26fd69e695bf")]
 
-[assembly: AssemblyVersion("2.8.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
 
 [assembly: InternalsVisibleTo("OpenTween.Tests")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] // for Moq
diff --git a/OpenTween/Properties/Resources.Designer.cs b/OpenTween/Properties/Resources.Designer.cs
diff --git a/OpenTween/Resources/ChangeLog.txt b/OpenTween/Resources/ChangeLog.txt
@@ -1,5 +1,13 @@
 更新履歴
 
+==== Ver 3.0.0(2023/01/11)
+ * OpenTween v3.0.0 からは .NET Framework 4.8 以上が必須になります
+  - .NET Framework 4.8 ランタイムは https://dotnet.microsoft.com/ja-jp/download/dotnet-framework/net48 から入手できます
+  - Windows 10 21H1 以降には標準で .NET Framework 4.8 が含まれているため追加のインストールは不要です
+ * このバージョン以降の OpenTween では Windows 8.1 以下向けの対応は行いません
+
+ * CHG: ターゲットフレームワークを .NET Framework 4.8 に変更
+
 ==== Ver 2.8.0(2023/01/11)
  * NEW: サムネイル画像のコンテキストメニューに「画像をコピー」を追加 (thx @kzlogos!)
  * NEW: Segoe UI Emoji によるカラー絵文字の描画に対応（発言詳細欄のみ）

diff --git a/OpenTween/app.config b/OpenTween/app.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <appSettings>
     <add key="EnableWindowsFormsHighDpiAutoResizing" value="true"/>

diff --git a/OpenTween/app.manifest b/OpenTween/app.manifest
@@ -26,16 +26,7 @@
            一覧。適切な要素をコメント解除すると、最も互換性のある環境を Windows が
            自動的に選択します。-->
 
-      <!-- Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-
-      <!-- Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-
-      <!-- Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-
-      <!-- Windows 10 -->
+      <!-- Windows 10, Windows 11 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
     </application>
   </compatibility>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.7.1.{build}
+version: 2.8.0.{build}
 
 os: Visual Studio 2022
 
@@ -66,20 +66,20 @@ test_script:
   - cmd: |
       set altCoverVersion=8.2.837
       set xunitVersion=2.4.1
-      set targetFramework=net472
+      set targetFramework=net48
       set nugetPackages=%UserProfile%\.nuget\packages
 
-      %nugetPackages%\altcover\%altCoverVersion%\tools\%targetFramework%\AltCover.exe --inputDirectory .\OpenTween.Tests\bin\%CONFIGURATION%\%targetFramework%\ --outputDirectory .\__Instrumented\ --assemblyFilter "?^OpenTween(?!\.Tests)" --typeFilter "?^OpenTween\." --fileFilter "\.Designer\.cs" --visibleBranches
+      %nugetPackages%\altcover\%altCoverVersion%\tools\net472\AltCover.exe --inputDirectory .\OpenTween.Tests\bin\%CONFIGURATION%\%targetFramework%\ --outputDirectory .\__Instrumented\ --assemblyFilter "?^OpenTween(?!\.Tests)" --typeFilter "?^OpenTween\." --fileFilter "\.Designer\.cs" --visibleBranches
 
-      %nugetPackages%\altcover\%altCoverVersion%\tools\%targetFramework%\AltCover.exe runner --recorderDirectory .\__Instrumented\ --executable %nugetPackages%\xunit.runner.console\%xunitVersion%\tools\%targetFramework%\xunit.console.exe -- .\__Instrumented\OpenTween.Tests.dll
+      %nugetPackages%\altcover\%altCoverVersion%\tools\net472\AltCover.exe runner --recorderDirectory .\__Instrumented\ --executable %nugetPackages%\xunit.runner.console\%xunitVersion%\tools\net472\xunit.console.exe -- .\__Instrumented\OpenTween.Tests.dll
 
 after_test:
   - ps: |
       Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile codecov.exe
       .\codecov.exe -f coverage.xml
   - ps: |
       $env:PATH = $env:PATH + ';C:\Program Files\Microsoft Visual Studio\2022\Community\Msbuild\Current\Bin\Roslyn\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\'
-      $binDir = '.\OpenTween\bin\' + $env:CONFIGURATION + '\net472\'
+      $binDir = '.\OpenTween\bin\' + $env:CONFIGURATION + '\net48\'
       if ($env:RELEASE_TAG -eq 'true') {
         $destPath = $env:APPVEYOR_REPO_TAG_NAME + '.zip'
       } else {