Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

.NET 6 Upgrade #379

Merged
merged 16 commits into from
Sep 10, 2022
Merged

.NET 6 Upgrade #379

merged 16 commits into from
Sep 10, 2022

Conversation

elucidsoft
Copy link
Owner

Merge with conflict resolutions

eric and others added 16 commits June 10, 2022 09:28
Fixed Balance.Asset exception when Balance is a liquidity pool shares balance.
Changed Asset.GetType to Asset.Type to avoid shadowing object.GetType.
# Conflicts:
#	stellar-dotnet-sdk-test/BalanceTests.cs
#	stellar-dotnet-sdk-test/Generators/AlphaNum12Generator.cs
#	stellar-dotnet-sdk-test/Generators/AlphaNum4Generator.cs
#	stellar-dotnet-sdk-test/responses/AccountDeserializerTest.cs
#	stellar-dotnet-sdk-test/stellar-dotnet-sdk-test.csproj
@elucidsoft elucidsoft changed the title Rival coins net6 upgrade .NET 6 Upgrade Sep 6, 2022
@elucidsoft elucidsoft mentioned this pull request Sep 6, 2022
5 tasks
Copy link
Collaborator

@Kirbyrawr Kirbyrawr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@GuyWhoKnowsTheGuy GuyWhoKnowsTheGuy merged commit 404d34d into master Sep 10, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants