Merge pull request #1351 from sillsdev/target-net462

+semver:major Changed to target .Net Framework 4.6.2 instead of 4.6.1
sillsdev · Oct 11, 2024 · ad4c21f · ad4c21f
2 parents 17401d1 + 3cbc821
commit ad4c21f
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 104 deletions.
diff --git a/AddSortKey/AddSortKey.csproj b/AddSortKey/AddSortKey.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <RootNamespace>AddSortKey</RootNamespace>
     <AssemblyName>AddSortKey</AssemblyName>
     <Configurations>Debug;Release</Configurations>

diff --git a/AddSortKey/app.config b/AddSortKey/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- BREAKING CHANGE: Changed to target .Net Framework 4.6.2 instead of 4.6.1
 - [SIL.Windows.Forms] Look for PNG data on clipboard before checking for plain image in WindowsClipboard.GetImageFromClipboard() in order to preserve transparency in copied images.
 - [SIL.Windows.Forms] Changed layout of SILAboutBox to accommodate wider SIL logo.
 - [SIL.Windows.Forms.Archiving] Split SIL.Archiving, moving Winforms portions (including dependency on L10nSharp) to SIL.Windows.Forms.Archiving.
@@ -80,6 +81,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Removed
 
+- Support for .Net Framework 4.6.1
 - [SIL.Windows.Forms] Removed SilLogo101x113 from Widgets.SilResources. Use SilLogoRandom or specify desired variant instead.
 - [SIL.Windows.Forms] Removed previously deprecated CreativeCommonsLicense.IntergovernmentalOriganizationQualifier
 - [SIL.Archiving] Removed abstract properties from ArchivingDlgViewModel: InformativeText and ArchiveInfoHyperlinkText.

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net461;net48</TargetFrameworks>
+    <TargetFrameworks>net462;net48</TargetFrameworks>
     <Configurations>Debug;Release</Configurations>
     <Company>SIL International</Company>
     <Authors>SIL International</Authors>

diff --git a/ExtractCopyright/App.config b/ExtractCopyright/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
     </startup>
 </configuration>
diff --git a/SIL.Core/IO/RobustFile.cs b/SIL.Core/IO/RobustFile.cs
@@ -338,7 +338,7 @@ public static void WriteAllLines(string path, IEnumerable<string> contents)
 			RetryUtility.Retry(() => File.WriteAllLines(path, contents), memo:$"WriteAllLines {path}");
 		}
 
-#if NET461
+#if NET462
 		public static System.Security.AccessControl.FileSecurity GetAccessControl(string filePath)
 		{
 			return RetryUtility.Retry(() => File.GetAccessControl(filePath), memo: $"GetAccessControl {filePath}");

diff --git a/SIL.Core/Migration/XslMigrationStrategy.cs b/SIL.Core/Migration/XslMigrationStrategy.cs
@@ -53,7 +53,7 @@ protected static void MigrateUsingXslt(TextReader xslStream, TextReader xmlStrea
 				var transform = new XslCompiledTransform();
 				transform.Load(xslReader);
 				transform.Transform(reader, writer);
-#if NET461
+#if NET462
 				transform.TemporaryFiles?.Delete();
 #endif
 			}

diff --git a/SIL.Core/PlatformUtilities/Platform.cs b/SIL.Core/PlatformUtilities/Platform.cs
@@ -46,7 +46,7 @@ public static bool IsMono
 
 		public static bool IsDotNetCore => RuntimeInformation.FrameworkDescription == ".NET Core";
 		public static bool IsDotNetFramework => IsDotNet && RuntimeInformation.FrameworkDescription == ".NET Framework";
-#elif NET461
+#elif NET462
 		private static readonly string UnixNameMac = "Darwin";
 		private static readonly string UnixNameLinux = "Linux";
 

diff --git a/SIL.Core/Progress/XslTransformWithProgress.cs b/SIL.Core/Progress/XslTransformWithProgress.cs
@@ -104,7 +104,7 @@ public void Transform(ProgressState progressState)
 					_progressState.WriteToLog(err.Message);
 					_progressState.State = ProgressState.StateValue.StoppedWithError;
 				}
-#if NET461
+#if NET462
 				finally
 				{
 					_progressState.StatusLabel = "Cleaning up...";

diff --git a/SIL.Lift/Utilities.cs b/SIL.Lift/Utilities.cs
@@ -63,7 +63,7 @@ static public string ProcessLiftForLaterMerging(string inputPath)
 			{
 				transform.Transform(outputOfPassOne, new XsltArgumentList(), output);
 			}
-			#if NET461
+			#if NET462
 			TempFileCollection tempfiles = transform.TemporaryFiles;
 			if (tempfiles != null) // tempfiles will be null when debugging is not enabled
 			{

diff --git a/SIL.Media.Tests/app.config b/SIL.Media.Tests/app.config
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <configuration>
-	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
+	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
 </configuration>
diff --git a/SIL.Media/app.config b/SIL.Media/app.config
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <configuration>
-	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
+	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
 </configuration>
diff --git a/SIL.Windows.Forms.Archiving/app.config b/SIL.Windows.Forms.Archiving/app.config
@@ -2,5 +2,5 @@
 <configuration>
 	<configSections>
  </configSections>
- <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
+ <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
 </configuration>
diff --git a/SIL.Windows.Forms.Keyboarding.Tests/App.config b/SIL.Windows.Forms.Keyboarding.Tests/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup>
   <system.windows.forms jitDebugging="true" />
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

diff --git a/SIL.Windows.Forms.Keyboarding/app.config b/SIL.Windows.Forms.Keyboarding/app.config
@@ -6,7 +6,7 @@
 	<dllmap dll="libgio-2.0.so" target="libgio-2.0.so.0" />
 	<dllmap dll="libglib-2.0.so" target="libglib-2.0.so.0" />
 	<dllmap dll="libgobject-2.0.so" target="libgobject-2.0.so.0" />
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>

diff --git a/SIL.Windows.Forms.Scripture.Tests/App.config b/SIL.Windows.Forms.Scripture.Tests/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup>
   <system.windows.forms jitDebugging="true" />
   <runtime>
     <dependentAssembly>

diff --git a/SIL.Windows.Forms.Tests/App.config b/SIL.Windows.Forms.Tests/App.config
@@ -25,7 +25,7 @@
       </setting>
     </SIL.Windows.Forms.Tests.Properties.Settings>
   </userSettings>
-  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>

diff --git a/SIL.Windows.Forms.WritingSystems.Tests/App.config b/SIL.Windows.Forms.WritingSystems.Tests/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup>
   <system.windows.forms jitDebugging="true" />
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

diff --git a/SIL.Windows.Forms/app.config b/SIL.Windows.Forms/app.config
@@ -61,6 +61,6 @@
         </SIL.Windows.Forms.Registration.Registration>
     </userSettings>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
 </configuration>
diff --git a/TestApps/FastSplitterTest/app.config b/TestApps/FastSplitterTest/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/TestApps/ReportingTest/app.config b/TestApps/ReportingTest/app.config
@@ -5,7 +5,7 @@
 		<section name="TestApp.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>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
 	<userSettings>
 		<TestApp.Properties.Settings>
 			<setting name="NeedsUpgrade" serializeAs="String">

diff --git a/TestApps/SIL.Email.TestApp/app.config b/TestApps/SIL.Email.TestApp/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/TestApps/SIL.Windows.Forms.TestApp/app.config b/TestApps/SIL.Windows.Forms.TestApp/app.config
@@ -5,7 +5,7 @@
 		<section name="SIL.Windows.Forms.TestApp.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>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
 	<userSettings>
 		<SIL.Windows.Forms.TestApp.Properties.Settings>
 			<setting name="UserSettings" serializeAs="String">

diff --git a/TestApps/SIL.Windows.Forms.TestApp/environ b/TestApps/SIL.Windows.Forms.TestApp/environ
diff --git a/TestApps/TestAppKeyboard/app.config b/TestApps/TestAppKeyboard/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/l10n/l10n.proj b/l10n/l10n.proj
@@ -46,7 +46,7 @@
 	  Lines="        &lt;note xml:lang=&quot;en&quot;&gt;Not found in static scan of compiled code (version 0.0.0)&lt;/note&gt;"/>
 	<!-- Build and extract strings -->
 	<MSBuild Projects="..\build\Palaso.proj" Targets="Build" Properties="Configuration=Release" />
-	<Exec Command="&quot;$(PkgL10NSharp_ExtractXliff)\tools\ExtractXliff.exe&quot; -n SIL -o Palaso.dll -b Palaso.en.xlf -x Palaso.en.xlf -p $(GitVersion_NuGetVersion) -m SIL.Localizer.GetString -m SIL.Localizer.Localize -g ../Output/Release/net461/SIL.*.dll" />
+	<Exec Command="&quot;$(PkgL10NSharp_ExtractXliff)\tools\ExtractXliff.exe&quot; -n SIL -o Palaso.dll -b Palaso.en.xlf -x Palaso.en.xlf -p $(GitVersion_NuGetVersion) -m SIL.Localizer.GetString -m SIL.Localizer.Localize -g ../Output/Release/net462/SIL.*.dll" />
   </Target>
 
   <Target Name="PackageL10ns" DependsOnTargets="restore;GetVersion">