Skip to content

Commit bfabc4a

Browse files
authored
chore: Update SplatWindowsTargets for windows net8 frameworks (#1411)
* chore: Update SplatWindowsTargets for windows net8 frameworks * Bump version from 17.0 to 17.1 * Update target framework condition for Windows 10 * Fix up API tests
1 parent 74b9d26 commit bfabc4a

7 files changed

Lines changed: 8 additions & 10 deletions

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<SplatCoreTargets Condition=" '$(SplatLegacyTargets)' != '' ">$(SplatCoreTargets);$(SplatLegacyTargets)</SplatCoreTargets>
5050

5151
<SplatAndroidTargets>net9.0-android;net10.0-android</SplatAndroidTargets>
52-
<SplatWindowsTargets>net9.0-windows10.0.17763.0;net10.0-windows10.0.17763.0</SplatWindowsTargets>
52+
<SplatWindowsTargets>net8.0-windows10.0.17763.0;net9.0-windows10.0.17763.0;net10.0-windows10.0.17763.0;net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</SplatWindowsTargets>
5353
<SplatAppleTargets>net9.0-ios;net9.0-macos;net9.0-maccatalyst;net9.0-tvos;net10.0-ios;net10.0-macos;net10.0-maccatalyst;net10.0-tvos</SplatAppleTargets>
5454
<SplatUiFinalTargetFrameworks>$(SplatCoreTargets);$(SplatAndroidTargets)</SplatUiFinalTargetFrameworks>
5555
</PropertyGroup>

‎src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.DotNet10_0.verified.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Android")]
44
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Uwp")]
55
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Tests")]
6-
[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows10.0.17763.0")]
76
[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v10.0", FrameworkDisplayName=".NET 10.0")]
8-
[assembly: System.Runtime.Versioning.TargetPlatform("Windows10.0.17763.0")]
97
namespace Splat
108
{
119
public static class BitmapLoader

‎src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.DotNet8_0.verified.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Android")]
44
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Uwp")]
55
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Tests")]
6-
[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows10.0.17763.0")]
76
[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName=".NET 8.0")]
8-
[assembly: System.Runtime.Versioning.TargetPlatform("Windows10.0.17763.0")]
97
namespace Splat
108
{
119
public static class BitmapLoader
@@ -269,6 +267,8 @@ namespace Splat
269267
}
270268
public static class ServiceLocationDrawingInitialization
271269
{
270+
[System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Needs to use reflection")]
271+
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Needs to use reflection")]
272272
public static void RegisterPlatformBitmapLoader(this Splat.IMutableDependencyResolver resolver) { }
273273
}
274274
public static class SizeExtensions

‎src/Splat.Drawing.Tests/API/ApiApprovalTests.SplatUIProject.DotNet9_0.verified.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Android")]
44
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.TestRunner.Uwp")]
55
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Splat.Tests")]
6-
[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows10.0.17763.0")]
76
[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v9.0", FrameworkDisplayName=".NET 9.0")]
8-
[assembly: System.Runtime.Versioning.TargetPlatform("Windows10.0.17763.0")]
97
namespace Splat
108
{
119
public static class BitmapLoader
@@ -457,4 +455,4 @@ namespace Splat
457455
public static System.Windows.Media.Color ToNative(this Splat.SplatColor value) { }
458456
public static System.Windows.Media.SolidColorBrush ToNativeBrush(this Splat.SplatColor value) { }
459457
}
460-
}
458+
}

‎src/Splat.Drawing/Splat.Drawing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<ItemGroup Condition=" $(TargetFramework.StartsWith('net46')) ">
4747
<PackageReference Include="System.ValueTuple"/>
4848
</ItemGroup>
49-
<ItemGroup Condition="$(TargetFramework.EndsWith('0-windows10.0.17763.0'))">
49+
<ItemGroup Condition="$(TargetFramework.EndsWith('0-windows10.0.17763.0')) or $(TargetFramework.EndsWith('0-windows10.0.19041.0'))">
5050
<Compile Include="Platforms\net6\**\*.cs"/>
5151
<Compile Include="Platforms\TypeForwardedSystemDrawing.cs"/>
5252
<Compile Include="Platforms\ReflectionStubs.cs"/>

‎src/Splat.Tests/ApiExtensions.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public static async Task CheckApproval(this Assembly assembly, string[] namespac
3333
.ScrubLines(l =>
3434
l.StartsWith("[assembly: AssemblyVersion(", StringComparison.InvariantCulture) ||
3535
l.StartsWith("[assembly: AssemblyFileVersion(", StringComparison.InvariantCulture) ||
36+
l.StartsWith("[assembly: System.Runtime.Versioning.SupportedOSPlatform(", StringComparison.InvariantCulture) ||
37+
l.StartsWith("[assembly: System.Runtime.Versioning.TargetPlatform(", StringComparison.InvariantCulture) ||
3638
l.StartsWith("[assembly: AssemblyInformationalVersion(", StringComparison.InvariantCulture) ||
3739
l.StartsWith("[assembly: System.Reflection.AssemblyMetadata(", StringComparison.InvariantCulture));
3840
}

‎version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "17.0",
2+
"version": "17.1",
33
"publicReleaseRefSpec": [
44
"^refs/heads/main$", // we release out of master
55
"^refs/heads/preview/.*", // we release previews

0 commit comments

Comments
 (0)
⌂ 换网址