From dd80ba85c53425b212103448c69d59cbef844988 Mon Sep 17 00:00:00 2001 From: tombogle Date: Thu, 10 Oct 2024 10:44:19 -0400 Subject: [PATCH 1/2] +semver:major WIP: Changed to target .Net Framework 4.6.2 instead of 4.6.1 --- AddSortKey/AddSortKey.csproj | 2 +- CHANGELOG.md | 1 + Directory.Build.props | 2 +- SIL.Core/IO/RobustFile.cs | 2 +- SIL.Core/Migration/XslMigrationStrategy.cs | 2 +- SIL.Core/PlatformUtilities/Platform.cs | 2 +- SIL.Core/Progress/XslTransformWithProgress.cs | 2 +- SIL.Lift/Utilities.cs | 2 +- l10n/l10n.proj | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/AddSortKey/AddSortKey.csproj b/AddSortKey/AddSortKey.csproj index 616a82878..cdbb7f9a1 100644 --- a/AddSortKey/AddSortKey.csproj +++ b/AddSortKey/AddSortKey.csproj @@ -2,7 +2,7 @@ WinExe - net461 + net462 AddSortKey AddSortKey Debug;Release diff --git a/CHANGELOG.md b/CHANGELOG.md index ff9cb9f87..fef729754 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Changed +- 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. diff --git a/Directory.Build.props b/Directory.Build.props index 276c6cadb..15cb4a624 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net461;net48 + net462;net48 Debug;Release SIL International SIL International diff --git a/SIL.Core/IO/RobustFile.cs b/SIL.Core/IO/RobustFile.cs index de4e92622..64c757153 100644 --- a/SIL.Core/IO/RobustFile.cs +++ b/SIL.Core/IO/RobustFile.cs @@ -338,7 +338,7 @@ public static void WriteAllLines(string path, IEnumerable 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 index 909c5757d..e301057ce 100644 --- 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 index 191d229cc..fde986041 100644 --- 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 index 683e7244f..00fdb097f 100644 --- 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 index 66a6d4133..1f9f8c62b 100644 --- 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/l10n/l10n.proj b/l10n/l10n.proj index 71b5d298c..bd17c7970 100644 --- a/l10n/l10n.proj +++ b/l10n/l10n.proj @@ -46,7 +46,7 @@ Lines=" <note xml:lang="en">Not found in static scan of compiled code (version 0.0.0)</note>"/> - + From 3cbc821241f4f6c4f58244196d90c14200990473 Mon Sep 17 00:00:00 2001 From: tombogle Date: Thu, 10 Oct 2024 16:42:05 -0400 Subject: [PATCH 2/2] changed sku in app.config files to 4.6.2. Removed file with info about sil-mono --- AddSortKey/app.config | 2 +- CHANGELOG.md | 3 +- ExtractCopyright/App.config | 4 +- SIL.Media.Tests/app.config | 2 +- SIL.Media/app.config | 2 +- SIL.Windows.Forms.Archiving/app.config | 2 +- .../App.config | 2 +- SIL.Windows.Forms.Keyboarding/app.config | 2 +- SIL.Windows.Forms.Scripture.Tests/App.config | 2 +- SIL.Windows.Forms.Tests/App.config | 2 +- .../App.config | 2 +- SIL.Windows.Forms/app.config | 2 +- TestApps/FastSplitterTest/app.config | 2 +- TestApps/ReportingTest/app.config | 2 +- TestApps/SIL.Email.TestApp/app.config | 2 +- TestApps/SIL.Windows.Forms.TestApp/app.config | 2 +- TestApps/SIL.Windows.Forms.TestApp/environ | 79 ------------------- TestApps/TestAppKeyboard/app.config | 2 +- 18 files changed, 19 insertions(+), 97 deletions(-) delete mode 100644 TestApps/SIL.Windows.Forms.TestApp/environ diff --git a/AddSortKey/app.config b/AddSortKey/app.config index 0dff63a07..ac5aa757c 100644 --- a/AddSortKey/app.config +++ b/AddSortKey/app.config @@ -1,3 +1,3 @@ - + diff --git a/CHANGELOG.md b/CHANGELOG.md index fef729754..9cb8e8506 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,7 +44,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Changed -- Changed to target .Net Framework 4.6.2 instead of 4.6.1 +- 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. @@ -81,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/ExtractCopyright/App.config b/ExtractCopyright/App.config index 731f6de6c..df1d0c64f 100755 --- a/ExtractCopyright/App.config +++ b/ExtractCopyright/App.config @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/SIL.Media.Tests/app.config b/SIL.Media.Tests/app.config index b15cb84c2..c9738e8d4 100644 --- a/SIL.Media.Tests/app.config +++ b/SIL.Media.Tests/app.config @@ -1,4 +1,4 @@ - + diff --git a/SIL.Media/app.config b/SIL.Media/app.config index b15cb84c2..c9738e8d4 100644 --- a/SIL.Media/app.config +++ b/SIL.Media/app.config @@ -1,4 +1,4 @@ - + diff --git a/SIL.Windows.Forms.Archiving/app.config b/SIL.Windows.Forms.Archiving/app.config index 7b6889ce0..17b37abda 100644 --- a/SIL.Windows.Forms.Archiving/app.config +++ b/SIL.Windows.Forms.Archiving/app.config @@ -2,5 +2,5 @@ - + diff --git a/SIL.Windows.Forms.Keyboarding.Tests/App.config b/SIL.Windows.Forms.Keyboarding.Tests/App.config index 8a3d6d6d3..d62eeb6b2 100644 --- a/SIL.Windows.Forms.Keyboarding.Tests/App.config +++ b/SIL.Windows.Forms.Keyboarding.Tests/App.config @@ -1,6 +1,6 @@ - + diff --git a/SIL.Windows.Forms.Keyboarding/app.config b/SIL.Windows.Forms.Keyboarding/app.config index 93342171c..4e043d000 100644 --- a/SIL.Windows.Forms.Keyboarding/app.config +++ b/SIL.Windows.Forms.Keyboarding/app.config @@ -6,7 +6,7 @@ - + diff --git a/SIL.Windows.Forms.Scripture.Tests/App.config b/SIL.Windows.Forms.Scripture.Tests/App.config index 4ccad0f6e..7c6fa8731 100644 --- a/SIL.Windows.Forms.Scripture.Tests/App.config +++ b/SIL.Windows.Forms.Scripture.Tests/App.config @@ -1,6 +1,6 @@ - + diff --git a/SIL.Windows.Forms.Tests/App.config b/SIL.Windows.Forms.Tests/App.config index 5b95f5f75..398f8c9b4 100644 --- a/SIL.Windows.Forms.Tests/App.config +++ b/SIL.Windows.Forms.Tests/App.config @@ -25,7 +25,7 @@ - + diff --git a/SIL.Windows.Forms.WritingSystems.Tests/App.config b/SIL.Windows.Forms.WritingSystems.Tests/App.config index e6c577f71..afd79568d 100644 --- a/SIL.Windows.Forms.WritingSystems.Tests/App.config +++ b/SIL.Windows.Forms.WritingSystems.Tests/App.config @@ -1,6 +1,6 @@ - + diff --git a/SIL.Windows.Forms/app.config b/SIL.Windows.Forms/app.config index 33952164d..e59c74607 100644 --- a/SIL.Windows.Forms/app.config +++ b/SIL.Windows.Forms/app.config @@ -61,6 +61,6 @@ - + diff --git a/TestApps/FastSplitterTest/app.config b/TestApps/FastSplitterTest/app.config index 0dff63a07..ac5aa757c 100644 --- a/TestApps/FastSplitterTest/app.config +++ b/TestApps/FastSplitterTest/app.config @@ -1,3 +1,3 @@ - + diff --git a/TestApps/ReportingTest/app.config b/TestApps/ReportingTest/app.config index c01208618..65fef0b5a 100644 --- a/TestApps/ReportingTest/app.config +++ b/TestApps/ReportingTest/app.config @@ -5,7 +5,7 @@
- + diff --git a/TestApps/SIL.Email.TestApp/app.config b/TestApps/SIL.Email.TestApp/app.config index 0dff63a07..ac5aa757c 100644 --- a/TestApps/SIL.Email.TestApp/app.config +++ b/TestApps/SIL.Email.TestApp/app.config @@ -1,3 +1,3 @@ - + diff --git a/TestApps/SIL.Windows.Forms.TestApp/app.config b/TestApps/SIL.Windows.Forms.TestApp/app.config index 7c8e968d8..8d7b742c0 100644 --- a/TestApps/SIL.Windows.Forms.TestApp/app.config +++ b/TestApps/SIL.Windows.Forms.TestApp/app.config @@ -5,7 +5,7 @@
- + diff --git a/TestApps/SIL.Windows.Forms.TestApp/environ b/TestApps/SIL.Windows.Forms.TestApp/environ deleted file mode 100644 index 02309fabe..000000000 --- a/TestApps/SIL.Windows.Forms.TestApp/environ +++ /dev/null @@ -1,79 +0,0 @@ -# Environment settings for running programs with the SIL version of mono -# Set MONO_ENVIRON to this file's pathname, then run, for example, -# /opt/mono-sil/bin/mono --debug PalasoUIWindowsForms.TestApp.exe -# These setting assume that the packaged SIL Mono is installed in /opt/mono-sil. - -# the sourcing script should cd/pushd to the directory containing this script -BASE="$(pwd)" -[ -z "$BUILD" ] && BUILD=Debug -[ -z "$MONO_PREFIX" ] && MONO_PREFIX=/opt/mono5-sil - -# MonoDevelop seems to set PKG_CONFIG_LIBDIR to the empty string, which is bad -# for us because that eliminates most packages, including geckofx29. -# If PKG_CONFIG_LIBDIR is not set at all, then the default paths are searched. -# To be safe, we'll preserve the old value (if it is set) and restore it. -if [ "${PKG_CONFIG_LIBDIR+set}" = set ]; then - OLD_PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR}" - unset PKG_CONFIG_LIBDIR -fi - -# Simplified setup - assuming the nuget packages got installed in ~/.nuget/packages -if [ "$(uname -m)" == "x86_64" ]; then - ARCH=64 -else - ARCH=32 -fi -XULRUNNER=$HOME/.nuget/packages/geckofx45.$ARCH.linux/45.0.37/content/Firefox-Linux${ARCH} - -LD_LIBRARY_PATH="${XULRUNNER}:${LD_LIBRARY_PATH}" -export LD_PRELOAD=${XULRUNNER}/libgeckofix.so -export XULRUNNER - -if [ "${OLD_PKG_CONFIG_LIBDIR+set}" = set ]; then - export PKG_CONFIG_LIBDIR="${OLD_PKG_CONFIG_LIBDIR}" - unset OLD_PKG_CONFIG_LIBDIR -fi - -GDK_SHARP=/usr/lib/cli/gdk-sharp-2.0 - -MONO_RUNTIME=v4.0.30319 -MONO_PATH="${GDK_SHARP}:${GECKOFX}" - -################################################################################################ - -# Add the build output to paths -PATH="${BASE}/output/${BUILD}/net461:${PATH}" -LD_LIBRARY_PATH="${BASE}/output/${BUILD}/net461:${LD_LIBRARY_PATH}" -MONO_PATH="${BASE}/output/${BUILD}/net461:${MONO_PATH}" - -################################################################################################ - -# Add locally-built mono items to paths -# We also add the default values for PKG_CONFIG_PATH - MonoDevelop resets the PKG_CONFIG_PATH -# environment variable if we're running under a different Mono runtime so that some -# packages that got installed in standard locations can't be found otherwise. -PATH="${MONO_PREFIX}/bin:${PATH}" -LD_LIBRARY_PATH="${MONO_PREFIX}/lib:${LD_LIBRARY_PATH}" -PKG_CONFIG_PATH="${MONO_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/lib/pkgconfig:/usr/lib/pkgconfig" -MONO_GAC_PREFIX="${MONO_PREFIX}:/usr" - -################################################################################################ - -MONO_TRACE_LISTENER="Console.Out" -#MONO_IOMAP=case -MONO_MWF_SCALING=disable -# if debugging for performance unset DEBUG_ENABLE_PTR_VALIDATION env var. -#export DEBUG_ENABLE_PTR_VALIDATION=1 - -export \ - PATH LD_LIBRARY_PATH PKG_CONFIG_PATH LD_PRELOAD \ - MONO_PATH \ - MONO_RUNTIME MONO_PREFIX MONO_GAC_PREFIX \ - MONO_TRACE_LISTENER MONO_IOMAP MONO_MWF_SCALING - -# prevent Gecko from printing scary message about "double free or corruption" on shutdown -# (See FWNX-1216.) Tom Hindle suggested this hack as a stopgap. -export MALLOC_CHECK_=0 - -#sets keyboard input method to none -unset XMODIFIERS diff --git a/TestApps/TestAppKeyboard/app.config b/TestApps/TestAppKeyboard/app.config index 0dff63a07..ac5aa757c 100644 --- a/TestApps/TestAppKeyboard/app.config +++ b/TestApps/TestAppKeyboard/app.config @@ -1,3 +1,3 @@ - +