Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

+semver:major Changed to target .Net Framework 4.6.2 instead of 4.6.1 #1351

Merged
merged 2 commits into from
Oct 11, 2024
Merged

+semver:major Changed to target .Net Framework 4.6.2 instead of 4.6.1 #1351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd80ba8
+semver:major WIP: Changed to target .Net Framework 4.6.2 instead of …
tombogle Oct 10, 2024
3cbc821
changed sku in app.config files to 4.6.2.
tombogle Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AddSortKey/AddSortKey.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net461</TargetFrameworks>
<TargetFrameworks>net462</TargetFrameworks>
<RootNamespace>AddSortKey</RootNamespace>
<AssemblyName>AddSortKey</AssemblyName>
<Configurations>Debug;Release</Configurations>
Expand Down
2 changes: 1 addition & 1 deletion AddSortKey/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ExtractCopyright/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion SIL.Core/IO/RobustFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
Expand Down
2 changes: 1 addition & 1 deletion SIL.Core/Migration/XslMigrationStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion SIL.Core/PlatformUtilities/Platform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion SIL.Core/Progress/XslTransformWithProgress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...";
Expand Down
2 changes: 1 addition & 1 deletion SIL.Lift/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion SIL.Media.Tests/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion SIL.Media/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion SIL.Windows.Forms.Archiving/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion SIL.Windows.Forms.Keyboarding.Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
2 changes: 1 addition & 1 deletion SIL.Windows.Forms.Keyboarding/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion SIL.Windows.Forms.Scripture.Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion SIL.Windows.Forms.Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion SIL.Windows.Forms.WritingSystems.Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
2 changes: 1 addition & 1 deletion SIL.Windows.Forms/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion TestApps/FastSplitterTest/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion TestApps/ReportingTest/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion TestApps/SIL.Email.TestApp/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion TestApps/SIL.Windows.Forms.TestApp/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
79 changes: 0 additions & 79 deletions TestApps/SIL.Windows.Forms.TestApp/environ
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion TestApps/TestAppKeyboard/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion l10n/l10n.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down