diff --git a/src/Directory.build.targets b/src/Directory.build.targets index c812b1970..66ed5af18 100644 --- a/src/Directory.build.targets +++ b/src/Directory.build.targets @@ -7,29 +7,25 @@ $(DefineConstants);NET_45;XAML - - 10.0.16299.0 - $(DefineConstants);NETFX_CORE;XAML;WINDOWS_UWP - $(DefineConstants);MONO;UIKIT;COCOA;IOS - + $(DefineConstants);MONO;UIKIT;COCOA;IOS $(DefineConstants);MONO;COCOA - + $(DefineConstants);MONO;COCOA $(DefineConstants);MONO;UIKIT;COCOA;TVOS - + $(DefineConstants);MONO;UIKIT;COCOA;TVOS - + $(DefineConstants);MONO;UIKIT;COCOA;MACCATALYST @@ -38,13 +34,13 @@ $(DefineConstants);MONO;ANDROID - + $(DefineConstants);MONO;ANDROID $(DefineConstants);TIZEN - + $(DefineConstants);IS_SHARED_NET diff --git a/src/Splat.AppCenter/Splat.AppCenter.csproj b/src/Splat.AppCenter/Splat.AppCenter.csproj index 29a6cae51..9a9d2e81b 100644 --- a/src/Splat.AppCenter/Splat.AppCenter.csproj +++ b/src/Splat.AppCenter/Splat.AppCenter.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0-windows10.0.17763.0 + netstandard2.0;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0 Splat.AppCenter Splat diff --git a/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj b/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj index 7d41cfadf..1e0b69268 100644 --- a/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj +++ b/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj @@ -1,6 +1,6 @@ - + - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Splat.ApplicationInsights Splat diff --git a/src/Splat.Autofac/Splat.Autofac.csproj b/src/Splat.Autofac/Splat.Autofac.csproj index bead20705..2522fbd8b 100644 --- a/src/Splat.Autofac/Splat.Autofac.csproj +++ b/src/Splat.Autofac/Splat.Autofac.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Autofac adapter for Splat latest diff --git a/src/Splat.Drawing/DefaultPlatformModeDetector.cs b/src/Splat.Drawing/DefaultPlatformModeDetector.cs index bf697e10e..09ff45655 100644 --- a/src/Splat.Drawing/DefaultPlatformModeDetector.cs +++ b/src/Splat.Drawing/DefaultPlatformModeDetector.cs @@ -8,13 +8,6 @@ using System.Linq; using System.Reflection; -#if NETFX_CORE -using System.Threading; -using System.Threading.Tasks; - -using Windows.ApplicationModel; -#endif - namespace Splat; /// @@ -38,9 +31,6 @@ public class DefaultPlatformModeDetector : IPlatformModeDetector /// public bool? InDesignMode() { -#if NETFX_CORE - return DesignMode.DesignModeEnabled; -#else if (_cachedInDesignModeResult.HasValue) { return _cachedInDesignModeResult.Value; @@ -93,6 +83,5 @@ public class DefaultPlatformModeDetector : IPlatformModeDetector _cachedInDesignModeResult = false; return _cachedInDesignModeResult; -#endif } } diff --git a/src/Splat.Drawing/Platforms/WinRT/Bitmaps/BitmapImageBitmap.cs b/src/Splat.Drawing/Platforms/WinRT/Bitmaps/BitmapImageBitmap.cs deleted file mode 100644 index 79c547f89..000000000 --- a/src/Splat.Drawing/Platforms/WinRT/Bitmaps/BitmapImageBitmap.cs +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved. -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Diagnostics.CodeAnalysis; - -using Windows.Storage; -using Windows.UI.Xaml.Media.Imaging; - -namespace Splat; - -/// -/// A bitmap that wraps a . -/// -internal sealed class BitmapImageBitmap : IBitmap -{ - private BitmapImage? _inner; - - public BitmapImageBitmap(BitmapImage bitmap) - { - _inner = bitmap; - } - - /// - public float Width => Inner?.PixelWidth ?? 0; - - /// - public float Height => Inner?.PixelHeight ?? 0; - - /// - /// Gets the platform . - /// - public BitmapSource? Inner => _inner; - - /// - public async Task Save(CompressedBitmapFormat format, float quality, Stream target) - { - if (_inner is null) - { - return; - } - - var installedFolderImageSourceUri = _inner.UriSource.OriginalString.Replace("ms-appx:/", string.Empty); - var wb = new WriteableBitmap(_inner.PixelWidth, _inner.PixelHeight); - var file = await StorageFile.GetFileFromPathAsync(_inner.UriSource.OriginalString); - await wb.SetSourceAsync(await file.OpenReadAsync()); - - await new WriteableBitmapImageBitmap(wb).Save(format, quality, target).ConfigureAwait(false); - } - - /// - public void Dispose() - { - _inner = null; - } -} diff --git a/src/Splat.Drawing/Platforms/WinRT/Bitmaps/BitmapMixins.cs b/src/Splat.Drawing/Platforms/WinRT/Bitmaps/BitmapMixins.cs deleted file mode 100644 index b1fb72301..000000000 --- a/src/Splat.Drawing/Platforms/WinRT/Bitmaps/BitmapMixins.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved. -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using Windows.UI.Xaml.Media.Imaging; - -namespace Splat; - -/// -/// Extension methods to assist with dealing with Bitmaps. -/// -public static class BitmapMixins -{ - /// - /// Converts to a . - /// - /// The bitmap to convert. - /// A bitmap. - public static IBitmap FromNative(this BitmapImage value) - { - return new BitmapImageBitmap(value); - } - - /// - /// Converts to a . - /// - /// The bitmap to convert. - /// A bitmap. - public static IBitmap FromNative(this WriteableBitmap value) - { - return new WriteableBitmapImageBitmap(value); - } - - /// - /// Converts to a . - /// - /// The bitmap to convert. - /// A bitmap. - public static BitmapSource ToNative(this IBitmap value) - { - if (value is null) - { - throw new System.ArgumentNullException(nameof(value)); - } - - if (value is WriteableBitmapImageBitmap wbib) - { - return wbib.Inner ?? throw new InvalidOperationException("The bitmap has been disposed"); - } - - if (value is BitmapImageBitmap bitmapImage) - { - return bitmapImage.Inner ?? throw new InvalidOperationException("The bitmap has been disposed"); - } - - throw new InvalidOperationException("The bitmap type is unsupported"); - } -} diff --git a/src/Splat.Drawing/Platforms/WinRT/Bitmaps/DispatcherMixin.cs b/src/Splat.Drawing/Platforms/WinRT/Bitmaps/DispatcherMixin.cs deleted file mode 100644 index d62eadedb..000000000 --- a/src/Splat.Drawing/Platforms/WinRT/Bitmaps/DispatcherMixin.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved. -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using Windows.UI.Core; - -namespace Splat; - -internal static class DispatcherMixin -{ - public static async Task RunTaskAsync(this CoreDispatcher dispatcher, Func> func, CoreDispatcherPriority priority = CoreDispatcherPriority.Normal) - { - var taskCompletionSource = new TaskCompletionSource(); - await dispatcher.RunAsync(priority, async () => - { - try - { - taskCompletionSource.SetResult(await func().ConfigureAwait(false)); - } - catch (Exception ex) - { - taskCompletionSource.SetException(ex); - } - }); - return await taskCompletionSource.Task.ConfigureAwait(false); - } - - // There is no TaskCompletionSource so we use a bool that we throw away. - public static Task RunTaskAsync(this CoreDispatcher dispatcher, Func func, CoreDispatcherPriority priority = CoreDispatcherPriority.Normal) - { - return RunTaskAsync( - dispatcher, - async () => - { - await func().ConfigureAwait(false); - return false; - }, - priority); - } -} diff --git a/src/Splat.Drawing/Platforms/WinRT/Bitmaps/PlatformBitmapLoader.cs b/src/Splat.Drawing/Platforms/WinRT/Bitmaps/PlatformBitmapLoader.cs deleted file mode 100644 index 85e5ed5f2..000000000 --- a/src/Splat.Drawing/Platforms/WinRT/Bitmaps/PlatformBitmapLoader.cs +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved. -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Runtime.InteropServices.WindowsRuntime; - -using Windows.ApplicationModel.Core; -using Windows.Graphics.Imaging; -using Windows.Storage; -using Windows.UI.Core; -using Windows.UI.Xaml.Media.Imaging; - -namespace Splat; - -/// -/// A XAML based platform bitmap loader which will load our bitmaps for us. -/// -public class PlatformBitmapLoader : IBitmapLoader -{ - /// - public Task Load(Stream sourceStream, float? desiredWidth, float? desiredHeight) - { - return GetDispatcher().RunTaskAsync(async () => - { - using (var randomAccessStream = sourceStream.AsRandomAccessStream()) - { - randomAccessStream.Seek(0); - var decoder = await BitmapDecoder.CreateAsync(randomAccessStream); - - var targetWidth = (int)(desiredWidth ?? decoder.OrientedPixelWidth); - var targetHeight = (int)(desiredHeight ?? decoder.OrientedPixelHeight); - - var transform = new BitmapTransform - { - ScaledWidth = (uint)targetWidth, - ScaledHeight = (uint)targetHeight, - InterpolationMode = BitmapInterpolationMode.Fant, - }; - - if (decoder.OrientedPixelHeight != decoder.PixelHeight) - { - // if Exif orientation indicates 90 or 270 degrees rotation we swap width and height for the transformation. - transform.ScaledWidth = (uint)targetHeight; - transform.ScaledHeight = (uint)targetWidth; - } - - var pixelData = await decoder.GetPixelDataAsync(decoder.BitmapPixelFormat, BitmapAlphaMode.Premultiplied, transform, ExifOrientationMode.RespectExifOrientation, ColorManagementMode.ColorManageToSRgb); - var pixels = pixelData.DetachPixelData(); - - var bmp = new WriteableBitmap(targetWidth, targetHeight); - using (var bmpStream = bmp.PixelBuffer.AsStream()) - { - bmpStream.Seek(0, SeekOrigin.Begin); - await bmpStream.WriteAsync(pixels, 0, (int)bmpStream.Length); - return (IBitmap?)new WriteableBitmapImageBitmap(bmp); - } - } - }); - } - - /// - public Task LoadFromResource(string source, float? desiredWidth, float? desiredHeight) - { - return GetDispatcher().RunTaskAsync(async () => - { - var file = await StorageFile.GetFileFromApplicationUriAsync(new Uri(source)); - using (var stream = await file.OpenAsync(FileAccessMode.Read)) - { - return await Load(stream.AsStreamForRead(), desiredWidth, desiredHeight).ConfigureAwait(false); - } - }); - } - - /// - public IBitmap Create(float width, float height) - { - var disp = GetDispatcher().RunTaskAsync(async () => - { - return await Task.FromResult(new WriteableBitmapImageBitmap(new WriteableBitmap((int)width, (int)height))).ConfigureAwait(false); - }); - - return disp.GetAwaiter().GetResult(); - } - - private static CoreDispatcher GetDispatcher() - { - CoreWindow currentThreadWindow = CoreWindow.GetForCurrentThread(); - - return currentThreadWindow is null ? CoreApplication.MainView.CoreWindow.Dispatcher : currentThreadWindow.Dispatcher; - } -} diff --git a/src/Splat.Drawing/Platforms/WinRT/Bitmaps/WriteableBitmapImageBitmap.cs b/src/Splat.Drawing/Platforms/WinRT/Bitmaps/WriteableBitmapImageBitmap.cs deleted file mode 100644 index e155468b4..000000000 --- a/src/Splat.Drawing/Platforms/WinRT/Bitmaps/WriteableBitmapImageBitmap.cs +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved. -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using System.Runtime.InteropServices.WindowsRuntime; - -using Windows.Foundation; -using Windows.Graphics.Imaging; -using Windows.Storage.Streams; -using Windows.UI.Xaml.Media.Imaging; - -namespace Splat; - -/// -/// A bitmap that wraps a . -/// -internal sealed class WriteableBitmapImageBitmap : IBitmap -{ - public WriteableBitmapImageBitmap(WriteableBitmap bitmap) - { - Inner = bitmap; - } - - /// - public float Width => Inner?.PixelWidth ?? 0; - - /// - public float Height => Inner?.PixelHeight ?? 0; - - /// - /// Gets the platform . - /// - public WriteableBitmap? Inner { get; private set; } - - /// - public async Task Save(CompressedBitmapFormat format, float quality, Stream target) - { - if (Inner is null) - { - return; - } - - // NB: Due to WinRT's brain-dead design, we're copying this image - // like three times. Let Dreams Soar. - using var rwTarget = new InMemoryRandomAccessStream(); - var fmt = format == CompressedBitmapFormat.Jpeg ? BitmapEncoder.JpegEncoderId : BitmapEncoder.PngEncoderId; - var encoder = await BitmapEncoder.CreateAsync(fmt, rwTarget, new[] { new KeyValuePair("ImageQuality", new BitmapTypedValue(quality, PropertyType.Single)) }); - - var pixels = new byte[Inner.PixelBuffer.Length]; - await Inner.PixelBuffer.AsStream().ReadAsync(pixels, 0, (int)Inner.PixelBuffer.Length).ConfigureAwait(true); - - encoder.SetPixelData(BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied, (uint)Inner.PixelWidth, (uint)Inner.PixelHeight, 96, 96, pixels); - await encoder.FlushAsync(); - await rwTarget.AsStream().CopyToAsync(target).ConfigureAwait(false); - } - - /// - public void Dispose() - { - Inner = null; - } -} diff --git a/src/Splat.Drawing/Platforms/WinRT/Colors/ColorExtensions.cs b/src/Splat.Drawing/Platforms/WinRT/Colors/ColorExtensions.cs deleted file mode 100644 index da214bef7..000000000 --- a/src/Splat.Drawing/Platforms/WinRT/Colors/ColorExtensions.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved. -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using Windows.UI; -using Windows.UI.Xaml.Media; - -namespace Splat.Platforms.WinRT.Colors; - -/// -/// Provides extension methods for interacting with colors, to and from the XAML colors. -/// -public static class ColorExtensions -{ - /// - /// Converts a to a XAML native color. - /// - /// The System.Drawing.Color to convert. - /// A native XAML color. - public static Color ToNative(this System.Drawing.Color value) - { - return Color.FromArgb(value.A, value.R, value.G, value.B); - } - - /// - /// Converts a into the XAML . - /// - /// The color to convert. - /// The generated. - public static SolidColorBrush ToNativeBrush(this System.Drawing.Color value) - { - return new(value.ToNative()); - } - - /// - /// Converts a XAML color into the XAML . - /// - /// The color to convert. - /// The generated. - public static System.Drawing.Color FromNative(this Color value) - { - return System.Drawing.Color.FromArgb(value.A, value.R, value.G, value.B); - } -} diff --git a/src/Splat.Drawing/Platforms/WinRT/Colors/SplatColorExtensions.cs b/src/Splat.Drawing/Platforms/WinRT/Colors/SplatColorExtensions.cs deleted file mode 100644 index ab1f963a6..000000000 --- a/src/Splat.Drawing/Platforms/WinRT/Colors/SplatColorExtensions.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved. -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for full license information. - -using Windows.UI; -using Windows.UI.Xaml.Media; - -namespace Splat.Platforms.WinRT.Colors; - -/// -/// Extension methods associated with the struct. -/// -public static class SplatColorExtensions -{ - /// - /// Converts a into the XAML color. - /// - /// The color to convert. - /// The XAML color generated. - public static Color ToNative(this SplatColor value) - { - return Color.FromArgb(value.A, value.R, value.G, value.B); - } - - /// - /// Converts a into the XAML . - /// - /// The color to convert. - /// The generated. - public static SolidColorBrush ToNativeBrush(this SplatColor value) - { - return new(value.ToNative()); - } - - /// - /// Converts a XAML color into the XAML . - /// - /// The color to convert. - /// The generated. - public static SplatColor FromNative(this Color value) - { - return SplatColor.FromArgb(value.A, value.R, value.G, value.B); - } -} diff --git a/src/Splat.Drawing/Splat.Drawing.csproj b/src/Splat.Drawing/Splat.Drawing.csproj index 7a68ffeb9..8d0f74008 100644 --- a/src/Splat.Drawing/Splat.Drawing.csproj +++ b/src/Splat.Drawing/Splat.Drawing.csproj @@ -1,8 +1,8 @@ - MonoAndroid11.0;MonoAndroid12.1;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;netstandard2.0;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst - $(TargetFrameworks);net462;net472;uap10.0.16299;net6.0-windows + MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;netstandard2.0;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst;net7.0;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst + $(TargetFrameworks);net462;net472;net6.0-windows;net7.0-windows Splat .NET Foundation and Contributors A library to make things cross-platform that should be @@ -12,7 +12,7 @@ enable - + true true @@ -66,31 +66,19 @@ - - - - - - - + - - - - - - - + @@ -101,7 +89,7 @@ - + @@ -112,7 +100,7 @@ - + diff --git a/src/Splat.DryIoc/Splat.DryIoc.csproj b/src/Splat.DryIoc/Splat.DryIoc.csproj index 1683eda55..c30a5d9de 100644 --- a/src/Splat.DryIoc/Splat.DryIoc.csproj +++ b/src/Splat.DryIoc/Splat.DryIoc.csproj @@ -1,6 +1,6 @@ - + - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 $(NoWarn);CA1801 DryIoc adapter for Splat diff --git a/src/Splat.Exceptionless/Splat.Exceptionless.csproj b/src/Splat.Exceptionless/Splat.Exceptionless.csproj index fead34083..40518105e 100644 --- a/src/Splat.Exceptionless/Splat.Exceptionless.csproj +++ b/src/Splat.Exceptionless/Splat.Exceptionless.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Splat.Exceptionless Splat diff --git a/src/Splat.Log4Net/Splat.Log4Net.csproj b/src/Splat.Log4Net/Splat.Log4Net.csproj index e1bc9d2fe..b5157d7f1 100644 --- a/src/Splat.Log4Net/Splat.Log4Net.csproj +++ b/src/Splat.Log4Net/Splat.Log4Net.csproj @@ -1,6 +1,6 @@ - + - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Splat.Log4Net Splat diff --git a/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj b/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj index 6909012c0..e9ac0769f 100644 --- a/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj +++ b/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 latest enable diff --git a/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj b/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj index 810a20982..f68bceb96 100644 --- a/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj +++ b/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Splat.Microsoft.Extensions.Logging Splat diff --git a/src/Splat.NLog/Splat.NLog.csproj b/src/Splat.NLog/Splat.NLog.csproj index f8af5ddae..f6823e80c 100644 --- a/src/Splat.NLog/Splat.NLog.csproj +++ b/src/Splat.NLog/Splat.NLog.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Splat.NLog Splat diff --git a/src/Splat.Ninject/Splat.Ninject.csproj b/src/Splat.Ninject/Splat.Ninject.csproj index 0afd720c9..70589d9ae 100644 --- a/src/Splat.Ninject/Splat.Ninject.csproj +++ b/src/Splat.Ninject/Splat.Ninject.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Autofac adapter for Splat latest diff --git a/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj b/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj index 6c3fbe470..d808a78c7 100644 --- a/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj +++ b/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj @@ -1,7 +1,7 @@ - + - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Prism adapter for Splat including Xamarin Forms adapters. latest diff --git a/src/Splat.Prism/Splat.Prism.csproj b/src/Splat.Prism/Splat.Prism.csproj index 672d3a714..ff6464b02 100644 --- a/src/Splat.Prism/Splat.Prism.csproj +++ b/src/Splat.Prism/Splat.Prism.csproj @@ -1,7 +1,7 @@ - + - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Prism adapter for Splat latest diff --git a/src/Splat.Raygun/Splat.Raygun.csproj b/src/Splat.Raygun/Splat.Raygun.csproj index df1a848f6..df7624f48 100644 --- a/src/Splat.Raygun/Splat.Raygun.csproj +++ b/src/Splat.Raygun/Splat.Raygun.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Splat.Raygun Splat @@ -13,7 +13,7 @@ - + diff --git a/src/Splat.Serilog/Splat.Serilog.csproj b/src/Splat.Serilog/Splat.Serilog.csproj index 6a327ffe0..4e5798693 100644 --- a/src/Splat.Serilog/Splat.Serilog.csproj +++ b/src/Splat.Serilog/Splat.Serilog.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 Splat.Serilog Splat diff --git a/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj b/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj index c3ff03a48..91a96fc35 100644 --- a/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj +++ b/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 $(TargetFrameworks);net462 SimpleInjector adapter for Splat latest diff --git a/src/Splat/Logging/LocalizableAttribute.cs b/src/Splat/Logging/LocalizableAttribute.cs index 4a3aab0cb..c5133e6fe 100644 --- a/src/Splat/Logging/LocalizableAttribute.cs +++ b/src/Splat/Logging/LocalizableAttribute.cs @@ -5,7 +5,7 @@ namespace Splat; -#if PORTABLE || WINDOWS_PHONE || NETFX_CORE +#if PORTABLE || WINDOWS_PHONE /// /// Specifies whether a property should be localized. /// diff --git a/src/Splat/Splat.csproj b/src/Splat/Splat.csproj index 6fc4b9061..6790a263d 100644 --- a/src/Splat/Splat.csproj +++ b/src/Splat/Splat.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net6.0 + netstandard2.0;net6.0;net7.0 Splat Splat .NET Foundation and Contributors diff --git a/version.json b/version.json index 850795947..8fcc9e872 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "14.5", + "version": "14.6", "publicReleaseRefSpec": [ "^refs/heads/main$", // we release out of master "^refs/heads/preview/.*", // we release previews