Skip to content

Commit

Permalink
Update ph1 to net8 (#542)
Browse files Browse the repository at this point in the history
* Update documentation & CI (#501)

* Simplify projects to SDK style (#498)

* Migrate to .NET6+ (#513)

* Migrate from Xamarin.Essentials to Microsoft.Maui.Essentials (#517)

* Update documentation & rework nested namespaces (#514)

* Resolve warnings (#515)

* Implementation of 'Notification' and 'Bluetooth'  permissions (#519)

Co-authored-by: Yauheni Pakala <[email protected]>

* Add System.Text.Json serializer and tests (#521)

* Show warning when ConfigureAwait should be used (#522)

* Remove Chunkify method (#523)

* Remove Newtonsoft.Json (#524)

* Update CI environment (#530)

* Migrate Common.iOS & Common.Droid Tests to .NET6 (#525)

* Replace Connectivity plugin to MAUI Essentials (#531)

* location eq added

* comment fixed

* Refactor permissions library (#535)

* Add binding support for Count property (ObservableKeyGroupsCollection) (#538)

* Update docfx (#534)

* Improvements before migration to .NET8 (#539)

* Add supported os versions

* Bump year

* Update target framework for nuspecs

* Sync wl.essentials platform target frameworks

* Add install missed android sdk for api 32

* Bump android target api

* Revert "Add install missed android sdk for api 32"

This reverts commit a89a7c4.

* Migrate to .NET8 (#536)

* Bump dotnet version

* Bump target framework to .net8

* Migrate Microsoft.Maui.Essentials to use as explicit NuGet packages

* Remove obsoleted binary serialization for BiDictionary

* Cleanup

* Migrate Maui to use as explicit NuGet package

* Sync target frameworks and min supported os

* Use the same MAUI version in all projects

* Bump .NET8 to stable

* Update pipelines env

* Bump iOS target framework for latest maui & essentials

* Resolve warnings related to supported versions

* Update nuget package

* Sync versions

* add extensions

* make permission method virtual

* remove unused property

* add methods to icontainerbuilder

* Feature/minor fixes (#545)

* Updated copyright

* Fixed binding to ObservableRangeCollection.Count when calling RemoveRange (#544)

* Removed excess AndroidResource tags

* Restored mistakenly deleted PropertyGroup

* Fixed copyright

* rename methods

---------

Co-authored-by: Pavel Leonenko <[email protected]>
Co-authored-by: s.leushunou <[email protected]>

---------

Co-authored-by: Yauheni Pakala <[email protected]>
Co-authored-by: nkrisko <[email protected]>
Co-authored-by: Kirill Akulich <[email protected]>
Co-authored-by: Pavel Leonenko <[email protected]>
Co-authored-by: Pavel Leonenko <[email protected]>
  • Loading branch information
6 people authored Mar 27, 2024
1 parent 4460e00 commit acd47d9
Show file tree
Hide file tree
Showing 420 changed files with 5,449 additions and 6,089 deletions.
11 changes: 10 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<LangVersion>8.0</LangVersion>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<DebugType>portable</DebugType>
<MauiVersion>8.0.3</MauiVersion>
</PropertyGroup>

<!-- Assembly Info -->
<PropertyGroup>
<Product>XToolkit</Product>
<Company>Softeq Development Corporation</Company>
<Copyright>Copyright © 2024 Softeq Development Corporation</Copyright>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Softeq
Copyright (c) 2024 Softeq

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ Common | [![Softeq.XToolkit.Common](https://buildstats.info/nuget/Softeq.XToo
Bindings | [![Softeq.XToolkit.Bindings](https://buildstats.info/nuget/Softeq.XToolkit.Bindings?includePreReleases=true)](https://www.nuget.org/packages/Softeq.XToolkit.Bindings)
Permissions | [![Softeq.XToolkit.Permissions](https://buildstats.info/nuget/Softeq.XToolkit.Permissions?includePreReleases=true)](https://www.nuget.org/packages/Softeq.XToolkit.Permissions)
PushNotifications | [![Softeq.XToolkit.PushNotifications](https://buildstats.info/nuget/Softeq.XToolkit.PushNotifications?includePreReleases=true)](https://www.nuget.org/packages/Softeq.XToolkit.PushNotifications)
Remote | [![Softeq.XToolkit.Remote](https://buildstats.info/nuget/Softeq.XToolkit.Remote?includePreReleases=true)](https://www.nuget.org/packages/Softeq.XToolkit.Remote)
WhiteLabel | [![Softeq.XToolkit.WhiteLabel](https://buildstats.info/nuget/Softeq.XToolkit.WhiteLabel?includePreReleases=true)](https://www.nuget.org/packages/Softeq.XToolkit.WhiteLabel)
WhiteLabel.Essentials | [![Softeq.XToolkit.WhiteLabel.Essentials](https://buildstats.info/nuget/Softeq.XToolkit.WhiteLabel.Essentials?includePreReleases=true)](https://www.nuget.org/packages/Softeq.XToolkit.WhiteLabel.Essentials)
WhiteLabel.Forms | [![Softeq.XToolkit.WhiteLabel.Forms](https://buildstats.info/nuget/Softeq.XToolkit.WhiteLabel.Forms?includePreReleases=true)](https://www.nuget.org/packages/Softeq.XToolkit.WhiteLabel.Forms)
Remote | [![Softeq.XToolkit.Remote](https://buildstats.info/nuget/Softeq.XToolkit.Remote?includePreReleases=true)](https://www.nuget.org/packages/Softeq.XToolkit.Remote)

## Documentation

Expand Down
31 changes: 0 additions & 31 deletions Softeq.XToolkit.Bindings.Droid/Properties/AssemblyInfo.cs

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,84 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2B4A678B-63B4-49DB-99B1-BFE7793110C4}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Softeq.XToolkit.Bindings.Droid</RootNamespace>
<AssemblyName>Softeq.XToolkit.Bindings.Droid</AssemblyName>
<FileAlignment>512</FileAlignment>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
<TargetFramework>net8.0-android34.0</TargetFramework>
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.5" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
<ProjectReference Include="..\Softeq.XToolkit.Common.Droid\Softeq.XToolkit.Common.Droid.csproj" />
<ProjectReference Include="..\Softeq.XToolkit.Bindings\Softeq.XToolkit.Bindings.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Include="DroidBinding.cs" />
<Compile Include="DroidBindingFactory.cs" />
<Compile Include="ObservableAdapter.cs" />
<Compile Include="ObservableAdapterExtended.cs" />
<Compile Include="ObservableGroupAdapter.cs" />
<Compile Include="ObservableRecyclerGroupViewAdapter.cs" />
<Compile Include="ObservableRecyclerViewAdapter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Bindable\IBindableViewHolder.cs" />
<Compile Include="Bindable\BindableViewHolder.cs" />
<Compile Include="Bindable\BindableRecyclerViewAdapter.cs" />
<Compile Include="Bindable\BindableViewHolderLayoutAttribute.cs" />
<Compile Include="Bindable\ItemType.cs" />
<Compile Include="Bindable\FlatItem.cs" />
<Compile Include="Handlers\DroidRecyclerObservableKeyGroupCollectionHandler.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Softeq.XToolkit.Bindings\Softeq.XToolkit.Bindings.csproj">
<Project>{0F1F09A8-9CDB-4933-AA1B-898AB43D394C}</Project>
<Name>Softeq.XToolkit.Bindings</Name>
</ProjectReference>
<ProjectReference Include="..\Softeq.XToolkit.Common.Droid\Softeq.XToolkit.Common.Droid.csproj">
<Project>{18d3fdc1-b0a1-401e-87f2-1c43034e610c}</Project>
<Name>Softeq.XToolkit.Common.Droid</Name>
</ProjectReference>
<ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj">
<Project>{24588814-B93D-4528-8917-9C2A3C4E85CA}</Project>
<Name>Softeq.XToolkit.Common</Name>
</ProjectReference>
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.5" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>

</Project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
34 changes: 0 additions & 34 deletions Softeq.XToolkit.Bindings.iOS/Properties/AssemblyInfo.cs

This file was deleted.

88 changes: 14 additions & 74 deletions Softeq.XToolkit.Bindings.iOS/Softeq.XToolkit.Bindings.iOS.csproj
Original file line number Diff line number Diff line change
@@ -1,84 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2D399BA9-1878-43E2-AF05-6873EAE9151B}</ProjectGuid>
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>Softeq.XToolkit.Bindings.iOS</RootNamespace>
<AssemblyName>Softeq.XToolkit.Bindings.iOS</AssemblyName>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<TargetFramework>net8.0-ios12.0</TargetFramework>
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
<CreatePackage>false</CreatePackage>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<MtouchLink>None</MtouchLink>
<LinkMode>None</LinkMode>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<MtouchLink>SdkOnly</MtouchLink>
<LinkMode>SdkOnly</LinkMode>
</PropertyGroup>

<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
<ProjectReference Include="..\Softeq.XToolkit.Common.iOS\Softeq.XToolkit.Common.iOS.csproj" />
<ProjectReference Include="..\Softeq.XToolkit.Bindings\Softeq.XToolkit.Bindings.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="AppleBinding.cs" />
<Compile Include="AppleBindingExtensions.cs" />
<Compile Include="AppleBindingFactory.cs" />
<Compile Include="Bindable\BindableCollectionViewCell.cs" />
<Compile Include="Bindable\BindableCollectionViewSource.cs" />
<Compile Include="Bindable\BindableUICollectionViewDelegateFlowLayout.cs" />
<Compile Include="Gestures\BehaviourExtensions.cs" />
<Compile Include="Gestures\SwipeGestureRecognizerBehaviour.cs" />
<Compile Include="Gestures\TapGestureRecognizerBehaviour.cs" />
<Compile Include="Handlers\IosDataSourceHandler.cs" />
<Compile Include="ObservableCollectionViewSource.cs" />
<Compile Include="ObservableGroupTableViewSource.cs" />
<Compile Include="ObservableTableViewController.cs" />
<Compile Include="ObservableTableViewSource.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Gestures\GestureRecognizerBehaviour.cs" />
<Compile Include="Bindable\BindableTableViewHeaderFooterView.cs" />
<Compile Include="Bindable\BindableTableViewCell.cs" />
<Compile Include="Gestures\PanGestureRecognizerBehaviour.cs" />
<Compile Include="Bindable\BindableTableViewSource.cs" />
<Compile Include="Bindable\BindableGroupCollectionViewSource.cs" />
<Compile Include="Bindable\BindableUICollectionReusableView.cs" />
<Compile Include="Extensions\NSThreadExtensions.cs" />
<Compile Include="Handlers\IosCollectionObservableKeyGroupCollectionHandler.cs" />
<Compile Include="Handlers\IosTableObservableKeyGroupCollectionHandler.cs" />
<Compile Include="GestureRecognizerBinding.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Softeq.XToolkit.Bindings\Softeq.XToolkit.Bindings.csproj">
<Project>{0F1F09A8-9CDB-4933-AA1B-898AB43D394C}</Project>
<Name>Softeq.XToolkit.Bindings</Name>
</ProjectReference>
<ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj">
<Project>{24588814-B93D-4528-8917-9C2A3C4E85CA}</Project>
<Name>Softeq.XToolkit.Common</Name>
</ProjectReference>
<ProjectReference Include="..\Softeq.XToolkit.Common.iOS\Softeq.XToolkit.Common.iOS.csproj">
<Project>{6BCB2009-2E46-458C-BCAA-AFC27A631924}</Project>
<Name>Softeq.XToolkit.Common.iOS</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

</Project>
2 changes: 1 addition & 1 deletion Softeq.XToolkit.Bindings/Softeq.XToolkit.Bindings.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand Down
5 changes: 0 additions & 5 deletions Softeq.XToolkit.Common.Droid.Tests/Assets/xunit.runner.json

This file was deleted.

Loading

0 comments on commit acd47d9

Please sign in to comment.