v0.14.1

Author: saucecontrol

build/Common.props

@@ -57,8 +57,8 @@
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(Configuration)'=='Dist' Or '$(Configuration)'=='Coverage'">
-		<None Include="$(MSBuildThisFileDirectory)$(Company).png" Pack="true" PackagePath="/" />
-		<None Include="$(ProjectRoot)readme.md" Pack="true" PackagePath="/" />
+		<None Include="$(MSBuildThisFileDirectory)$(PackageIcon)" Pack="true" PackagePath="/" />
+		<None Include="$(ProjectRoot)$(PackageReadmeFile)" Pack="true" PackagePath="/" />
 		<None Include="$(RepositoryRoot)license" Pack="true" PackagePath="/" />
 		<None Include="$(RepositoryRoot)third-party-notices" Pack="true" PackagePath="/" />
 		<SourceRoot Include="$(RepositoryRoot)" />

src/Directory.Build.props

@@ -31,7 +31,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(Configuration)'=='Dist'">
-		<PackageReference Include="SauceControl.InheritDoc" Version="2.0.0" PrivateAssets="all" />
+		<PackageReference Include="SauceControl.InheritDoc" Version="2.0.1" PrivateAssets="all" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(Configuration)'!='Dist'">

src/Directory.Build.targets

@@ -22,7 +22,8 @@
 		<ItemGroup>
 			<_ProjectReferencesWithExactVersions Include="@(_ProjectReferencesWithVersions)">
 				<ProjectVersion>[$([System.Text.RegularExpressions.Regex]::Match('%(_ProjectReferencesWithVersions.ProjectVersion)', '^\d+\.\d+\.\d+').Value),$([MSBuild]::Add($([System.Text.RegularExpressions.Regex]::Match('%(_ProjectReferencesWithVersions.ProjectVersion)', '^\d+\.\d+').Value), '0.01').ToString('f2')))</ProjectVersion>
-				<ProjectVersion Condition="'$(VersionSuffix)'!=''">[%(_ProjectReferencesWithVersions.ProjectVersion)]</ProjectVersion>
+				<ProjectVersion Condition="'$(VersionSuffix)'!=''">[$([System.Text.RegularExpressions.Regex]::Match('%(_ProjectReferencesWithVersions.ProjectVersion)', '^\d+\.\d+\.\d+').Value)]</ProjectVersion>
+				<ProjectVersion Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(%(_ProjectReferencesWithVersions.ProjectVersion), '-ci\d+$'))">[%(_ProjectReferencesWithVersions.ProjectVersion)]</ProjectVersion>
 			</_ProjectReferencesWithExactVersions>
 		</ItemGroup>
 

src/MagicScaler/Magic/ColorProfileTransform.cs

@@ -1,6 +1,7 @@
 // Copyright © Clinton Ingram and Contributors.  Licensed under the MIT License.
 
 using System;
+using System.Runtime.InteropServices;
 using System.Diagnostics.CodeAnalysis;
 
 using static PhotoSauce.Interop.Lcms.Lcms;
@@ -15,6 +16,9 @@ internal sealed unsafe class ColorProfileTransform(PixelSource source, PixelForm
 	public static bool HaveLcms => dependencyValid.Value;
 
 	private static readonly Lazy<bool> dependencyValid = new(() => {
+		if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && !AppConfig.EnableWindowsLcms)
+			return false;
+
 		try
 		{
 			if (cmsGetEncodedCMMversion() is >= 2090 and < 3000)

src/MagicScaler/MagicScaler.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<VersionPrefix>0.14.1</VersionPrefix>
@@ -54,6 +54,10 @@
 		<EmbeddedResource Include="$(BaseModulesPath)CompactProfiles\profiles\CGATS001Compat-v2-micro.icc" Link="Resources\%(FileName)%(Extension)" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<None Include="Package\build\*" Pack="true" PackagePath="build/netcoreapp3.0/;buildTransitive/netcoreapp3.0/" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
 		<None Update="Magic\Processors\Convolvers.tt" LastGenOutput="Convolvers.cs" Generator="TextTemplatingFileGenerator" />

src/MagicScaler/Package/build/PhotoSauce.MagicScaler.targets

@@ -0,0 +1,5 @@
+<Project InitialTargets="_MagicScalerTfmSupportWarning">
+	<Target Name="_MagicScalerTfmSupportWarning" Condition="'$(SuppressTfmSupportBuildWarnings)' == ''">
+		<Warning Text="MagicScaler is no longer hardware accelerated on $(TargetFramework). Upgrade your TargetFramework to net6.0 or later (or use an older version of the library) for the best performance. You may also set &lt;SuppressTfmSupportBuildWarnings&gt;true&lt;/SuppressTfmSupportBuildWarnings&gt; in the project file to ignore this warning." />
+	</Target>
+</Project>

src/MagicScaler/Utilities/AppConfig.cs

@@ -9,13 +9,11 @@ internal class AppConfig
 {
 	private const string prefix = $"{nameof(PhotoSauce)}.{nameof(MagicScaler)}";
 
-	public const string MaxPooledBufferSizeName = $"{prefix}.{nameof(MaxPooledBufferSize)}";
-	public const string EnablePixelSourceStatsName = $"{prefix}.{nameof(EnablePixelSourceStats)}";
-	public const string ThrowOnFinalizerName = $"{prefix}.{nameof(ThrowOnFinalizer)}";
-
-	public static readonly int MaxPooledBufferSize = getAppContextInt(MaxPooledBufferSizeName);
-	public static readonly bool EnablePixelSourceStats = AppContext.TryGetSwitch(EnablePixelSourceStatsName, out bool val) && val;
-	public static readonly bool ThrowOnFinalizer = AppContext.TryGetSwitch(ThrowOnFinalizerName, out bool val) && val;
+	public static readonly int MaxPooledBufferSize = getAppContextInt($"{prefix}.{nameof(MaxPooledBufferSize)}");
+	public static readonly bool EnablePixelSourceStats = AppContext.TryGetSwitch($"{prefix}.{nameof(EnablePixelSourceStats)}", out bool val) && val;
+	public static readonly bool GdsMitigationsDisabled = AppContext.TryGetSwitch($"{prefix}.{nameof(GdsMitigationsDisabled)}", out bool val) && val;
+	public static readonly bool EnableWindowsLcms = AppContext.TryGetSwitch($"{prefix}.{nameof(EnableWindowsLcms)}", out bool val) && val;
+	public static readonly bool ThrowOnFinalizer = AppContext.TryGetSwitch($"{prefix}.{nameof(ThrowOnFinalizer)}", out bool val) && val;
 
 	private static int getAppContextInt(string name)
 	{

src/MagicScaler/Utilities/HWIntrinsics.cs

@@ -40,6 +40,9 @@ public static int VectorCount<T>() where T : struct =>
 
 	private static bool getFastGather()
 	{
+		if (!AppConfig.GdsMitigationsDisabled)
+			return false;
+
 		bool intel = X86Base.CpuId(0, 0) is (_, 0x756e6547, 0x6c65746e, 0x49656e69); // "Genu", "ntel", "ineI"
 		uint fms = (uint)X86Base.CpuId(1, 0).Eax;
 		uint fam = ((fms & 0xfu << 20) >> 16) + ((fms & 0xfu << 8) >> 8);