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

Jump to bottom

Update ph1 to net8 #542

Merged
merged 33 commits into from
Mar 27, 2024
Merged

Update ph1 to net8 #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
239965f
Update documentation & CI (#501)
wcoder Jan 27, 2023
846a0c5
Simplify projects to SDK style (#498)
wcoder Feb 14, 2023
13e3ad0
Migrate to .NET6+ (#513)
wcoder Feb 21, 2023
545b06a
Migrate from Xamarin.Essentials to Microsoft.Maui.Essentials (#517)
wcoder Feb 24, 2023
08ad4e5
Update documentation & rework nested namespaces (#514)
wcoder Feb 24, 2023
860f848
Resolve warnings (#515)
wcoder Feb 27, 2023
a4cb501
Implementation of 'Notification' and 'Bluetooth' permissions (#519)
nkrisko Mar 2, 2023
174a957
Add System.Text.Json serializer and tests (#521)
wcoder Mar 9, 2023
bce6fc3
Show warning when ConfigureAwait should be used (#522)
wcoder Mar 24, 2023
27a1124
Remove Chunkify method (#523)
wcoder Mar 28, 2023
107c72d
Remove Newtonsoft.Json (#524)
wcoder Mar 29, 2023
0f589bb
Update CI environment (#530)
wcoder Aug 2, 2023
da8d58b
Migrate Common.iOS & Common.Droid Tests to .NET6 (#525)
wcoder Aug 2, 2023
5645e21
Replace Connectivity plugin to MAUI Essentials (#531)
wcoder Aug 3, 2023
70783d4
location eq added
Oct 13, 2023
ee61471
comment fixed
Oct 16, 2023
2505c34
Merge pull request #537 from Softeq/feature/add-equatable-interface-f…
wcoder Oct 25, 2023
27f1b7a
Refactor permissions library (#535)
wcoder Oct 25, 2023
f87e2c8
Add binding support for Count property (ObservableKeyGroupsCollection…
wcoder Oct 25, 2023
4fdd0da
Update docfx (#534)
wcoder Oct 27, 2023
84e4ef3
Improvements before migration to .NET8 (#539)
wcoder Dec 20, 2023
1e59f30
Migrate to .NET8 (#536)
wcoder Dec 27, 2023
3c9fb9d
1
sleushunou Jan 22, 2024
b539e23
Merge branch 'update-ph1-to-net8' into project/PH1
sleushunou Feb 8, 2024
2675c82
merge
sleushunou Feb 8, 2024
27a0253
resolve conflicts
sleushunou Mar 8, 2024
1cb0d0c
add extensions
sleushunou Mar 11, 2024
c3fc30c
make permission method virtual
sleushunou Mar 18, 2024
612521c
remove unused property
sleushunou Mar 25, 2024
2f3b6b5
add methods to icontainerbuilder
sleushunou Mar 26, 2024
885b9a8
resolve conflicts
sleushunou Mar 26, 2024
4ea3f80
Feature/minor fixes (#545)
pavel-leonenko Mar 27, 2024
535a709
merge
sleushunou Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 10 additions & 1 deletion Directory.Build.props
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

85 changes: 14 additions & 71 deletions Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj
View file
Open in desktop
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>
2 changes: 1 addition & 1 deletion Softeq.XToolkit.Bindings.Tests/Softeq.XToolkit.Bindings.Tests.csproj
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

88 changes: 14 additions & 74 deletions Softeq.XToolkit.Bindings.iOS/Softeq.XToolkit.Bindings.iOS.csproj
View file
Open in desktop
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
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>
<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
View file
Open in desktop

This file was deleted.

Loading
Loading