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

breaking: Remove Unsupported Targets #975

Merged
merged 9 commits into from
Dec 7, 2022
Merged

breaking: Remove Unsupported Targets #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f5c6079
Remove Unsupported Targets
ChrisPulman Dec 5, 2022
62bc262
Merge branch 'main' into RemoveUnsupportedTargets
glennawatson Dec 6, 2022
9867a10
Merge branch 'main' into RemoveUnsupportedTargets
glennawatson Dec 6, 2022
5af86fd
housekeeping: Fix tests and formatting
glennawatson Dec 7, 2022
7f0bfb9
Merge branch 'main' into RemoveUnsupportedTargets
glennawatson Dec 7, 2022
3a2b670
Merge branch 'main' of https://github.com/reactiveui/splat
glennawatson Dec 7, 2022
2c0ea6c
Merge branch 'main' into RemoveUnsupportedTargets
glennawatson Dec 7, 2022
75bec42
Remove uap support, users can now use net6-windows or net7-windows
glennawatson Dec 7, 2022
4a43b9e
Bump version number
glennawatson Dec 7, 2022
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
16 changes: 6 additions & 10 deletions src/Directory.build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,25 @@
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
<DefineConstants>$(DefineConstants);NET_45;XAML</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS_UWP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-ios'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-ios')) or $(TargetFramework.StartsWith('net7.0-ios'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac'))">
<DefineConstants>$(DefineConstants);MONO;COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-macos'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-macos')) or $(TargetFramework.StartsWith('net7.0-macos'))">
<DefineConstants>$(DefineConstants);MONO;COCOA</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.TVOS'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-tvos'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-tvos')) or $(TargetFramework.StartsWith('net7.0-tvos'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-maccatalyst'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-maccatalyst')) or $(TargetFramework.StartsWith('net7.0-maccatalyst'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;MACCATALYST</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.WatchOS'))">
Expand All @@ -38,13 +34,13 @@
<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-android'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-android')) or $(TargetFramework.StartsWith('net7.0-android'))">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.Equals('net6.0')) or $(TargetFramework.Equals('netstandard2.1')) or $(TargetFramework.Equals('netstandard2.0'))">
<PropertyGroup Condition="$(TargetFramework.Equals('net6.0')) or $(TargetFramework.Equals('net7.0')) or $(TargetFramework.Equals('netstandard2.1')) or $(TargetFramework.Equals('netstandard2.0'))">
<DefineConstants>$(DefineConstants);IS_SHARED_NET</DefineConstants>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Splat.AppCenter/Splat.AppCenter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0-windows10.0.17763.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0</TargetFrameworks>
<!--need to consider? monoandroid50;xamarin.ios10,uap10.0 -->
<AssemblyName>Splat.AppCenter</AssemblyName>
<RootNamespace>Splat</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462</TargetFrameworks>
<AssemblyName>Splat.ApplicationInsights</AssemblyName>
<RootNamespace>Splat</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/Splat.Autofac/Splat.Autofac.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462</TargetFrameworks>
<Description>Autofac adapter for Splat</Description>
<LangVersion>latest</LangVersion>
Expand Down
11 changes: 0 additions & 11 deletions src/Splat.Drawing/DefaultPlatformModeDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/// <summary>
Expand All @@ -38,9 +31,6 @@ public class DefaultPlatformModeDetector : IPlatformModeDetector
/// <inheritdoc />
public bool? InDesignMode()
{
#if NETFX_CORE
return DesignMode.DesignModeEnabled;
#else
if (_cachedInDesignModeResult.HasValue)
{
return _cachedInDesignModeResult.Value;
Expand Down Expand Up @@ -93,6 +83,5 @@ public class DefaultPlatformModeDetector : IPlatformModeDetector
_cachedInDesignModeResult = false;

return _cachedInDesignModeResult;
#endif
}
}
57 changes: 0 additions & 57 deletions src/Splat.Drawing/Platforms/WinRT/Bitmaps/BitmapImageBitmap.cs
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions src/Splat.Drawing/Platforms/WinRT/Bitmaps/BitmapMixins.cs
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions src/Splat.Drawing/Platforms/WinRT/Bitmaps/DispatcherMixin.cs
View file
Open in desktop

This file was deleted.

92 changes: 0 additions & 92 deletions src/Splat.Drawing/Platforms/WinRT/Bitmaps/PlatformBitmapLoader.cs
View file
Open in desktop

This file was deleted.

Loading