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.

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

added .NET 6 dual targeting to all assemblies #5926

Merged
merged 5 commits into from
May 10, 2022

Conversation

Aaronontheweb
Copy link
Member

@Aaronontheweb Aaronontheweb commented May 6, 2022

Changes

Adds .NET 6 dual targeting to all binaries. .NET Standard 2.0 is still supported.

Checklist

For significant changes, please ensure that the following have been completed (delete if not relevant):

have not added and .NET 6-specific code yet, just added support for it in the build system
@Aaronontheweb Aaronontheweb added this to the 1.5.0 milestone May 6, 2022
@Aaronontheweb
Copy link
Member Author

Most of these files are approval files - had to change Verify such that it produced a separate file per-runtime, so any platform specific changes we make to .NET 6 are detected separately from .NET Standard 2.0.

Copy link
Contributor

@Arkatufus Arkatufus left a comment

Choose a reason for hiding this comment

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

Just have one question

src/core/Akka.Streams/Akka.Streams.csproj Show resolved Hide resolved
Copy link
Contributor

@Arkatufus Arkatufus left a comment

Choose a reason for hiding this comment

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

LGTM

@Aaronontheweb Aaronontheweb merged commit e89287f into akkadotnet:dev May 10, 2022
@Aaronontheweb Aaronontheweb deleted the net6-dual-targeting branch May 10, 2022 14:06
Aaronontheweb added a commit that referenced this pull request May 20, 2022
* Moved the `akka core` configuration page into `modules`` (#5664)

* Fix link issue with `xref` (#5666)

Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* [Docs]: Fix Metadata Reference  (#5668)

* Turn on `ProduceReferenceAssembly`

* Add `ProduceReferenceAssembly` to `common.props`

* Fix build failures in Akka.FSharp

* Revert `<ProduceReferenceAssembly>$(ProduceReferenceAssembly)</ProduceReferenceAssembly>` added to affected projects because it already exists in `common.props'

* Resolved invalid links (#5669)

* Check for possible broken documentation by failing on DocFX warning (#5542)

* Add --warningsAsErrors flag to DocFX

* Add check in AzDo pr validation yaml

* Use windows image for docfx test

* Fix build script name

* disable incremental builds for DocFx

Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* Make sure DocFX warning check step only executed in PR (#5674)

* Make sure DocFX warning check step only executed in PR

* Add run_if parameter to template

Co-authored-by: Gregorius Soedharmo <gregorius.soedharmo@petabridge.com>

* [Docs] Improve coordinated shutdown doc hygiene  (#5677)

* Extract hocon settings

* Import coordinated shutdown phases using docfx code reference

* Correct the usage of `integration` (#5679)

* Improve code reference hygiene with exisiting code block (#5680)

* Updated developement scenario (#5533)

* Updated developement scenario

* Fix markdown linting

* Fix linting

* Fix linting

* Fix linting

* Fix linting

* Fix linting

* Improve `toc.yml` for all sections

* Console deployment

* Sleep for 5 seconds

* Add ASP.NET Core page

* Fix startup issue

* Fix typo

* Fix linting issue

* Fix trailing space

* Added Headless Service

* Fixed typo

* Fix linting

* * Resolves #5533

* Resolves #5533

* Fix linting

* update solution projects

* Fix invalid path

* Solution project auto updated itself

Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* Fix ORSet.Merge with AddDeltaOperation takes too long to complete (#5686)

* Fix ORSet.Merge with AddDeltaOperation takes too long to complete

* Make sure that insertion is still correct after the changes

* Increase update timeout setting

Co-authored-by: Gregorius Soedharmo <gregorius.soedharmo@petabridge.com>

* Make PipeTo ConfigureAwait() optional (#5684)

* Remove ConfigureAwait() from PipeTo()

* Remove ConfigureAwait() from PipeTo()

* Add ConfigureAwait back to PipeTo, make it configurable instead

* Update API Approval list

* Add function overload for backward compatibility

* Update API Approval list

Co-authored-by: Gregorius Soedharmo <gregorius.soedharmo@petabridge.com>

* Optimize PipeTo ConfigureAwait call (#5688)

* Optimize PipeTo ConfigureAwait call

* Inverse the double negative parameter

Co-authored-by: Gregorius Soedharmo <gregorius.soedharmo@petabridge.com>

* Fixed broken toc.yml (#5694)

* Fix Serialization documentation discoverability (#5699)

* Fix Serialization documentation discoverability

* Rename Akka.IO

* fixed name of serializer id table

Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* Call `base.AfterAll()` to kill TestKit ActorSystem (#5705)

Co-authored-by: Gregorius Soedharmo <gregorius.soedharmo@petabridge.com>

* Fix confusing logging when receiving gossip from unknown (#5706)

* Reorder Source/FlowWithContext type parameters (#5648)

Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* Add Stateful methods for circuitbreaker (#5650)

* Add Stateful methods for circuitbreaker

* api docs

* fix api docs

Co-authored-by: Gregorius Soedharmo <arkatufus@yahoo.com>
Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* Update RELEASE_NOTES.md for 1.4.34 release (#5707)

Co-authored-by: Gregorius Soedharmo <gregorius.soedharmo@petabridge.com>

* Added placeholder for 1.4.35 (#5709)

* Fix PersistenceId Query and Sqlite unit tests (#5715)

* Fix PersistenceId Query and Sqlite unit tests

* Fix unit test assert

* [DocFx] custom Akka.NET theme (#5659)

* added updated Akka.NET DocFx theme

* added "Show and Tell" page

* added v1.5 notes

* fix video embeds on mobile (#5719)

* Fixed `IActorRef` leak inside `EventStream` (#5720)

* reproduced #5717

Reproduced `IActorRef` leak inside the `EventStream`

* cleaned up the `EventBusUnsubscriber`

* close #5719 - cleaned up `EventStream` subscription management

* added API approval

For `Obsolete` attribute.

* need to capture more data on why failures happen

* harden bugfix5717specs

* supress InvalidOperationException in xUnit OutputLogger (#5722)

* Bump Google.Protobuf from 3.17.3 to 3.19.4 (#5555)

Bumps [Google.Protobuf](https://github.com/protocolbuffers/protobuf) from 3.17.3 to 3.19.4.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](protocolbuffers/protobuf@v3.17.3...v3.19.4)

---
updated-dependencies:
- dependency-name: Google.Protobuf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add MapMaterializedValue for Source/Flow WithContext (#5711)

Co-authored-by: Gregorius Soedharmo <arkatufus@yahoo.com>

* close #5728 fix `ActorSystemSetup.And` (#5729)

* Update RELEASE_NOTES.md for 1.4.35 release (#5726)

* Update RELEASE_NOTES.md for 1.4.35 release

* Update RELEASE_NOTES.md with the latest changes

* v1.4.36 placeholder for nightlies (#5732)

* Update PersistAsync to match docs. (#5736)

This is supposed to be the example for persistAsync, but it doesn't get used at all.

https://getakka.net/articles/persistence/event-sourcing.html#relaxed-local-consistency-requirements-and-high-throughput-use-cases

I changed the code to match what is here:

https://doc.akka.io/docs/akka/current/persistence.html#relaxed-local-consistency-requirements-and-high-throughput-use-cases

* [DI] DI fails to throw an exception when DI tried to create an actor with missing constructor parameter (#5735)

* Add bug spec for DI bug

* Fix unit test to reflect the correct failure behaviour

* Fix spelling (#5745)

* Lock cspell on version `5.18.5` (#5744)

* Lock cspell on version `5.18.5`

* Use version `5.17.0`

Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* cleanup XUnit TestKit output logger (#5741)

* marked `EventBusUnsubscriber` messages as `INoSerializationVerificationNeeded` (#5743)

Eliminates issues with some `MinimalActorRef` actors subscribing to the `EventStream` when `akka.actor.serialize-messages = on`.

* Fix MSBuild does not copy xunit.runner dlls correctly (#5747)

* Add documentation on how to override serializer ids. (#5749)

* Add `Member Roles` doc (#5742)

* Add `Node Roles` doc

Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* [DOCS]: Add `Examples` section to Akka.NET Doc (#5739)

* Add initial commit

* Fix linting and spell checks

* Update examples

* Fix lint issues

* Fix spell check - American English

* fix examples href

* Update page title

* Updated page with more examples

* Update examples.md

* Fix lint and markdown errors.

* Fix docs conflict

* Fix blanks

* Delete examples.md.orig

Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* Bump Hyperion to 0.12.2 (#5805)

* Bump Hyperion to 0.12.2

* Add HyperionSerializerSettings immutable modifier methods

* Fix unit tests

* Fix leaky coordinated shutdown (#5816)

* Fix CoordinatedShutdown infinite loop

* Fix circular reference memory leak

* Fix memory leak

* Couple of fixes for the TcpConnection (#5817)

* Fix TcpConnection error handling

* Try not to get stopped by death pact before Unregistration is complete

* Update RELEASE_NOTES.md for 1.4.36 release (#5820)

* Revert changes that are unrelated to the memory leak (#5822)

* Be more explicit that a node is shutting down as it was marked as DOWN (#5821)

Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* Change the failure log inside `AllEventPublisher` from Debug to Error (#5835)

* Fix LeaseProvider instance Activator exception handling (#5838)

* Make ActorSystemImpl.Abort skip the CoordinatedShutdown check (#5839)

* Bump Microsoft.Data.SQLite from 5.0.11 to 6.0.4 (#5837)

Bumps [Microsoft.Data.SQLite](https://github.com/dotnet/efcore) from 5.0.11 to 6.0.4.
- [Release notes](https://github.com/dotnet/efcore/releases)
- [Commits](dotnet/efcore@v5.0.11...v6.0.4)

---
updated-dependencies:
- dependency-name: Microsoft.Data.SQLite
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update RELEASE_NOTES.md for 1.4.37 release (#5841)

* Add specs to test disallow-unsafe-type (#5746)

* Add spec to test disallow-unsafe-type

* Fix Hyperion disallow-unsafe-type spec

* move from ApprovalTests to Verify for api tests (#5846)

* approved to verified

* move to verify

* Update CoreAPISpec.cs

* Update Akka.API.Tests.csproj

* Update Akka.API.Tests.csproj

* Update CoreAPISpec.cs

* Bump FsCheckVersion from 2.16.3 to 2.16.4 (#5724)

Bumps `FsCheckVersion` from 2.16.3 to 2.16.4.

Updates `FsCheck` from 2.16.3 to 2.16.4
- [Release notes](https://github.com/fsharp/FsCheck/releases)
- [Changelog](https://github.com/fscheck/FsCheck/blob/master/FsCheck%20Release%20Notes.md)
- [Commits](fscheck/FsCheck@2.16.3...2.16.4)

Updates `FsCheck.Xunit` from 2.16.3 to 2.16.4
- [Release notes](https://github.com/fsharp/FsCheck/releases)
- [Changelog](https://github.com/fscheck/FsCheck/blob/master/FsCheck%20Release%20Notes.md)
- [Commits](fscheck/FsCheck@2.16.3...2.16.4)

---
updated-dependencies:
- dependency-name: FsCheck
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: FsCheck.Xunit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix Persistence.TCK specs (#5849)

* DeleteMessagesFailure message should log its failure stack trace

* Make JournalSpec facts overridable

* Make error reporting standardized.

* change `dev` version number to 1.5-x (#5856)

* Zbynek001 sharding update2 (#5857)

* Add Dropped to Akka.Actor (migrated partially from akka/akka#27160)
Log Dropped from DeadLetterListener

* Logging of UnhandledMessage (migrated from akka/akka#28414)
* make use of the existing logging of dead letter
  also for UnhandledMessage

Supress ActorSelectionMessage with DeadLetterSuppression (migrated from akka/akka#28341)
* for example the Cluster InitJoin message is marked with DeadLetterSuppression
  but was anyway logged because sent with actorSelection
* for other WrappedMessage than ActorSelectionMessage we shouldn't unwrap and publish
  the inner in SuppressedDeadLetter because that might loose some information
* therefore those are silenced in the DeadLetterListener instead

Better deadLetter logging of wrapped messages (migrated from akka/akka#28253)

* MessageBuffer implementations

* TestKit logger with prefix

* sharding update

* sharding tests

* sharding multinode tests

* api approval

* replace sqlite with MemoryJournalShared and local snapshot store

* tests

* snapshot inmem

* backwards compatible PersistenceId for PersistentShardCoordinator

* test fix

* SnapshotStoreProxy & MemorySnapshotStoreShared

* test snapshot store switched to shared inmem

* ExternalShardAllocationStrategy & tests

* ExternalShardAllocationStrategy API approval

* test timing fix

* review comments addressed

* IEquatable removed for singleton messages

* test fixes

* cleanup

* test cleanup

* protobuf generated

* cleanup

* cleanup

* Race condition in DeprecatedSupervisionSpec fixed (migrated from akka/akka#29914)

* cleanup

* Small clarification of recovery strategy in config (migrated from akka/akka#30167)

* Resolve snapshot check skipped for some events (migrated from akka/akka#30226)

* additional sharding messages serialization, tests

* api approval update

* disable durable storage on ShardRegionSpec

* extend timeout for ExternalShardAllocationSpec

* naming conventions

* missing readonly added, updated syntax

* renaming conventions

* Defer coordinator stop until region graceful stop has completed (migrated from akka/akka#30338)

* sharding: actively signal 'region stopped' to the coordinator (migrated from akka/akka#30402)

* racy test fix

* racy test verbose logging

* test update

* merge fix

* sharding ddata coordinator switch to ReadMajorityPlus/WriteMajorityPlus

* more logs to debug tests

* more logs

* fix MultiNodeClusterSpec default timeouts

* revert additional logs

* override single-expect-default only for sharding tests

* revert unrelated protobuf serializers

* Fix StartEntitySpec instability (migrated from akka/akka#30537)

The old logic allowed a race condition where the 'StartEntity' from the
test arrived at the ShardRegion before the termination of the actor did,
causing it to ignore the `StartEntity`.

* Quieter logging for ShardCoordinator initialization (migrated from akka/akka#30488)

Log the first retry on 'info', then 'warning', and finally 'error'

* reduce default write-majority-plus for sharding (migrated from akka/akka#30328)

* merge fix

* rebalance log fix

* fixed compilation error from rebase

* switch RememberEntitiesShardIdExtractorChangeSpec from ddata to persistence

* disable durable storage on PersistentShardingMigrationSpec

* clean up leveldb configuration

* fix XML-DOC warnings

Co-authored-by: zbynek001 <zbynek001@gmail.com>
Co-authored-by: Gregorius Soedharmo <arkatufus@yahoo.com>

* Bump Swashbuckle.AspNetCore from 6.2.3 to 6.3.0 (#5848)

Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 6.2.3 to 6.3.0.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](domaindrivendev/Swashbuckle.AspNetCore@v6.2.3...v6.3.0)

---
updated-dependencies:
- dependency-name: Swashbuckle.AspNetCore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* cleaned up some allocations and styling (#5855)

* fix sharding recovery (#5863)

* Update MNTR to 1.1.1 and update build script to suit (#5866)

* GroupBy fixes (#5874)

* Target incrementalist against v1.4 branch for v1.4

* Update MNTR to 1.1.1 and update build script to suit (#5867)

(cherry picked from commit 2b4267e)

* GroupBy pulls upstream when a substream materialization is waiting

* Cancel GroupBy when all substreams cancel

* Allow GroupBy to recreate already closed substreams

* Fixes GroupBy does not invoke decider

* Avoids memory being retained for GroupBy

* Revert v1.4 merge

* Fix markdownlint error

Co-authored-by: Aaron Stannard <aaron@petabridge.com>
Co-authored-by: Gregorius Soedharmo <arkatufus@yahoo.com>

* Fix Source.ActorRef not completing (#5875)

* Fix typo in `akka.remote.dot-netty.ssl.certificate` (#5895)

* enable `ChannelTaskScheduler` to work inside Akka.Cluster without causing errors inside `/system` actors (#5861) (#5920)

* close #5498

enable `ChannelTaskScheduler` to work inside Akka.Cluster without causing errors inside `/system` actors

* fix `HeartbeatSender`

* cleaned up SBR internals (style)

* cleaned up some comments

* asynchronously attempt to acquire `Cluster` inside SBR

* fixed SBR compilation

* Update SplitBrainResolver.cs

* subscribe on PreStart

* added .NET 6 dual targeting to all assemblies (#5926)

* added .NET 6 dual targeting to all assemblies

have not added and .NET 6-specific code yet, just added support for it in the build system

* adding verify files per-runtime

* added all .NET 6 files

* moved files to their own folder

* added all Verified files

* Renamed method `SetHandler` accepting both callbacks to `SetHandlers` (#5931)

* Rewrite actor ref sink as a graph stage (#5930)

Co-authored-by: Aaron Stannard <aaron@petabridge.com>

* Post-merge cleanup

* Update API verify list

* Post-merge fix and update API verify list

* Fix XML doc

* Post merge fix, docs

* Fix XML Doc

* Post merge fix

* Post merge fix

Co-authored-by: Ebere Abanonu <eaba@users.noreply.github.com>
Co-authored-by: Aaron Stannard <aaron@petabridge.com>
Co-authored-by: Gregorius Soedharmo <gregorius.soedharmo@petabridge.com>
Co-authored-by: Ismael Hamed <1279846+ismaelhamed@users.noreply.github.com>
Co-authored-by: Drew <laingas@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adrian Leonhard <adrianleonhard@gmail.com>
Co-authored-by: Simon Cropp <simon.cropp@gmail.com>
Co-authored-by: zbynek001 <zbynek001@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

2 participants