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.

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
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
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
1 change: 1 addition & 0 deletions CHANGELOG.md
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

- 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
2 changes: 1 addition & 1 deletion Directory.Build.props
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
2 changes: 1 addition & 1 deletion SIL.Core/IO/RobustFile.cs
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
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
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
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
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 l10n/l10n.proj
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