Skip to content

Commit 8e33bf4

Browse files
ChrisPulmanChrisPulman
authored
Housekeeping: Retire Xamarin due to end of support (#3797)
<!-- Please be sure to read the [Contribute](https://github.com/reactiveui/reactiveui#contribute) section of the README --> **What kind of change does this PR introduce?** <!-- Bug fix, feature, docs update, ... --> Update **What is the current behavior?** <!-- You can also link to an open issue here. --> Support for Xamarin is included **What is the new behavior?** <!-- If this is a feature change --> Xamarin Support is retired inline with Microsoft. https://dotnet.microsoft.com/en-us/platform/support/policy/xamarin **What might this PR break?** Users wishing to continue using Xamarin will need to continue using release 19.6.12 of ReactiveUI, ReactiveUI.XamarinForms , ReactiveUI.AndroidX and ReactiveUI.AndroidSupport **Please check if the PR fulfills these requirements** - [ ] Tests for the changes have been added (for bug fixes / features) - [ ] Docs have been added / updated (for bug fixes / features) **Other information**:
1 parent 0e318b9 commit 8e33bf4

File tree

231 files changed

+628
-6568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+628
-6568
lines changed

‎README.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -145,37 +145,37 @@ See [Contribution Guidelines](https://www.reactiveui.net/contribute/) for furthe
145145
<table>
146146
<tbody>
147147
<tr>
148-
<td align="center" valign="top">
148+
<td align="center" valign="top" width="105">
149149
<img width="100" height="100" src="https://github.com/glennawatson.png?s=150">
150150
<br>
151151
<a href="https://github.com/glennawatson">Glenn Watson</a>
152152
<p>Melbourne, Australia</p>
153153
</td>
154-
<td align="center" valign="top">
154+
<td align="center" valign="top" width="105">
155+
<img width="100" height="100" src="https://github.com/chrispulman.png?s=150">
156+
<br>
157+
<a href="https://github.com/chrispulman">Chris Pulman</a>
158+
<p>United Kingdom</p>
159+
</td>
160+
<td align="center" valign="top" width="105">
155161
<img width="100" height="100" src="https://github.com/rlittlesii.png?s=150">
156162
<br>
157163
<a href="https://github.com/rlittlesii">Rodney Littles II</a>
158164
<p>Texas, USA</p>
159165
</td>
160-
<td align="center" valign="top">
161-
<img width="100" height="100" src="https://github.com/worldbeater.png?s=150">
162-
<br>
163-
<a href="https://github.com/worldbeater">Artyom Gorchakov</a>
164-
<p>Moscow, Russia</p>
165-
</td>
166166
</tr>
167167
<tr>
168-
<td align="center" valign="top">
168+
<td align="center" valign="top" width="105">
169169
<img width="100" height="100" src="https://github.com/cabauman.png?s=150">
170170
<br>
171171
<a href="https://github.com/cabauman">Colt Bauman</a>
172172
<p>South Korea</p>
173173
</td>
174-
<td align="center" valign="top">
175-
<img width="100" height="100" src="https://github.com/chrispulman.png?s=150">
174+
<td align="center" valign="top" width="105">
175+
<img width="100" height="100" src="https://github.com/worldbeater.png?s=150">
176176
<br>
177-
<a href="https://github.com/chrispulman">Chris Pulman</a>
178-
<p>United Kingdom</p>
177+
<a href="https://github.com/worldbeater">Artyom Gorchakov</a>
178+
<p>Moscow, Russia</p>
179179
</td>
180180
</tr>
181181
</tbody>

‎src/ApiGeneratorGlobalSuppressions.cs‎

Lines changed: 0 additions & 161 deletions
This file was deleted.

‎src/Directory.Packages.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2525
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
2626
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
27+
<PackageVersion Include="Mocks.Maui" Version="1.1.4" />
2728
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
2829
<PackageVersion Include="PublicApiGenerator" Version="11.1.0" />
2930
<PackageVersion Include="Reactive.Wasm" Version="2.1.2" />
@@ -95,4 +96,4 @@
9596
<PackageVersion Include="System.Text.Encoding.Extensions" Version="4.3.0" />
9697
<PackageVersion Include="System.Threading" Version="4.3.0" />
9798
</ItemGroup>
98-
</Project>
99+
</Project>

‎src/Directory.build.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3333
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
3434
<PublishRepositoryUrl>true</PublishRepositoryUrl>
35+
<WindowsTargetFrameworks>net462;net472;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0;net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0</WindowsTargetFrameworks>
36+
<MobileTargetFrameworks>net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst;net8.0-android;net8.0-ios;net8.0-tvos;net8.0-macos;net8.0-maccatalyst</MobileTargetFrameworks>
37+
<BaseTargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</BaseTargetFrameworks>
3538
</PropertyGroup>
3639
<!--<PropertyGroup Condition="$(IsTestProject) != 'true'">
3740
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎src/Directory.build.targets‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
1414
<DefineConstants>$(DefineConstants);NET_461;XAML</DefineConstants>
1515
</PropertyGroup>
16-
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS'))">
17-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
18-
</PropertyGroup>
1916
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-ios'))">
2017
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
2118
</PropertyGroup>
@@ -34,9 +31,6 @@
3431
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-maccatalyst'))">
3532
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
3633
</PropertyGroup>
37-
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac'))">
38-
<DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
39-
</PropertyGroup>
4034
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-macos'))">
4135
<DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
4236
</PropertyGroup>
@@ -46,9 +40,6 @@
4640
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-macos'))">
4741
<DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
4842
</PropertyGroup>
49-
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.TVOS'))">
50-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
51-
</PropertyGroup>
5243
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-tvos'))">
5344
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
5445
</PropertyGroup>
@@ -58,13 +49,6 @@
5849
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-tvos'))">
5950
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
6051
</PropertyGroup>
61-
<PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.WatchOS'))">
62-
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;WATCHOS</DefineConstants>
63-
</PropertyGroup>
64-
<PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
65-
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
66-
<DesignTimeBuild>false</DesignTimeBuild>
67-
</PropertyGroup>
6852
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-android'))">
6953
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
7054
</PropertyGroup>
@@ -74,9 +58,6 @@
7458
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-android'))">
7559
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
7660
</PropertyGroup>
77-
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
78-
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
79-
</PropertyGroup>
8061

8162
<Target Name="ValidateNugetProperties" Condition="!$(IsTestProject) or $(IsTestProject) == ''" BeforeTargets="Compile">
8263
<Error Condition="$(PackageDescription) == '' or $(PackageDescription) == $(DefaultPackageDescription)" Text="The Nuget PackageDescription property needs to be set for the project. Currently : '$(PackageDescription)'" />

‎src/GlobalUsings.cs‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/Java.Interop.dll‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/ReactiveUI.AndroidSupport/ControlFetcherMixin.cs‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎src/ReactiveUI.AndroidSupport/GlobalUsings.cs‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)