Resolved conflicts with master #546
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Yauheni Pakala <[email protected]>
…or-location-master
* 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.
* 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
* 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]>
# Conflicts: # Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj # Softeq.XToolkit.Common.Droid.Tests/Softeq.XToolkit.Common.Droid.Tests.csproj # Softeq.XToolkit.Permissions.Droid/PermissionsManager.cs # Softeq.XToolkit.PushNotifications.Droid/Abstract/INotificationsSettingsProvider.cs # Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj # Softeq.XToolkit.PushNotifications.iOS/Softeq.XToolkit.PushNotifications.iOS.csproj # Softeq.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj # Softeq.XToolkit.WhiteLabel/Bootstrapper/BootstrapperBase.cs # azure-pipelines/templates/vars.yml
sleushunou
approved these changes
Mar 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Issues Resolved
API Changes
None
Platforms Affected
Behavioral/Visual Changes
None
Before/After Screenshots
Not applicable
PR Checklist