diff --git a/docs/Changelog-Platform.md b/docs/Changelog-Platform.md
index e15c53d074..49941540d2 100644
--- a/docs/Changelog-Platform.md
+++ b/docs/Changelog-Platform.md
@@ -4,6 +4,78 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
+## [1.4.0] - 2024-09-11
+
+See full log [here](https://github.com/microsoft/testanywhere/compare/v1.3.2...v1.4.0)
+
+### Added
+
+* Handle `--` for msbuild dotnet test integration by @MarcoRossignoli in [#3309](https://github.com/microsoft/testfx/pull/3309)
+* Support StandardOutput/StandardError for TA in VS by @MarcoRossignoli in [#3486](https://github.com/microsoft/testfx/pull/3486)
+* Interactive display for terminals by @nohwnd in [#3292](https://github.com/microsoft/testfx/pull/3292)
+* Add --? alias for --help by @engyebrahim in [#3522](https://github.com/microsoft/testfx/pull/3522)
+* Platform.MSBuild should allow generating a helper for registration of extensions by @MarcoRossignoli in [#3525](https://github.com/microsoft/testfx/pull/3525)
+* Humanize progress time, and reduce update to 500ms by @nohwnd in [#3535](https://github.com/microsoft/testfx/pull/3535)
+* Add `--no-progress` and `--no-ansi` by @nohwnd in [#3550](https://github.com/microsoft/testfx/pull/3550)
+* Add `--output` option by @nohwnd in [#3565](https://github.com/microsoft/testfx/pull/3565)
+* Warn about unsupported runsettings entries by @Evangelink in [#3647](https://github.com/microsoft/testfx/pull/3647)
+* Allow digit inside option name by @MarcoRossignoli in [#3651](https://github.com/microsoft/testfx/pull/3651)
+* Expose `TestFrameworkCapabilitiesExtensions` in experimental mode by @MarcoRossignoli in [#3653](https://github.com/microsoft/testfx/pull/3653)
+* Platform should expose a timeout option by @engyebrahim in [#3642](https://github.com/microsoft/testfx/pull/3642)
+* Bridge message logger also forward info to output by @Evangelink in [#3712](https://github.com/microsoft/testfx/pull/3712)
+* Add `StandardOutputProperty` and `StandardErrorProperty` (#3748) by @MarcoRossignoli in [#3749](https://github.com/microsoft/testfx/pull/3749)
+* Fix missing skip reason (#3754) by @MarcoRossignoli in [#3755](https://github.com/microsoft/testfx/pull/3755)
+
+### Fixed
+
+* Fix ResultFiles placement in TRX report by @nohwnd in [#3265](https://github.com/microsoft/testfx/pull/3265)
+* Fix: VSTest bridge - use TestCase.Id for the TestNodeUID by @Evangelink in [#3270](https://github.com/microsoft/testfx/pull/3270)
+* Fix test case id filtering for server mode by @MarcoRossignoli in [#3284](https://github.com/microsoft/testfx/pull/3284)
+* Fix TE tests execution for TA mode by @MarcoRossignoli in [#3290](https://github.com/microsoft/testfx/pull/3290)
+* Fix MessageBusProxy.InitAsync to be proxying _messageBus.InitAsync by @SimonCropp in [#3300](https://github.com/microsoft/testfx/pull/3300)
+* Fix shutdown order for server mode by @MarcoRossignoli in [#3306](https://github.com/microsoft/testfx/pull/3306)
+* Fix possible deadlock inside MSBuild task by @MarcoRossignoli in [#3307](https://github.com/microsoft/testfx/pull/3307)
+* avoid marshing async to sync when there is a sync alternative by @SimonCropp in [#3383](https://github.com/microsoft/testfx/pull/3383)
+* pass cancellationToken where possible by @SimonCropp in [#3465](https://github.com/microsoft/testfx/pull/3465)
+* reuse TestRun node in AddArtifactsAsync and throw a more accurate exception by @SimonCropp in [#3463](https://github.com/microsoft/testfx/pull/3463)
+* Remove Condition=" '$(GenerateTestingPlatformEntryPoint)' == 'True' " from extensions by @engyebrahim in [#3524](https://github.com/microsoft/testfx/pull/3524)
+* Exclude tool-related options in help option by @mariam-abdulla in [#3542](https://github.com/microsoft/testfx/pull/3542)
+* Fix shortening TFM and architecture by @nohwnd in [#3583](https://github.com/microsoft/testfx/pull/3583)
+* Fix `Content-Length` by @MarcoRossignoli in [#3641](https://github.com/microsoft/testfx/pull/3641)
+* Fix `CommandLineHandler` duplication check message by @MarcoRossignoli in [#3660](https://github.com/microsoft/testfx/pull/3660)
+* Localize proxies exceptions by @MarcoRossignoli in [#3678](https://github.com/microsoft/testfx/pull/3678)
+* Manual resolution of the muxer for `dotnet test` MSBuild extension by @MarcoRossignoli in [#3703](https://github.com/microsoft/testfx/pull/3703)
+* Fix the usage of the DOTNET_HOST_PATH by @MarcoRossignoli in [#3707](https://github.com/microsoft/testfx/pull/3707)
+* Fix timedout test does not fail test run (in ui) by @nohwnd in [#3774](https://github.com/microsoft/testfx/pull/3774)
+* Cherry-pick fix skipped Test isn't shown as skipped/not executed in Trx Report by @engyebrahim in [#3787](https://github.com/microsoft/testfx/pull/3787)
+
+### Housekeeping
+
+* improve perf of PropertyBag.SingleOrDefault by @SimonCropp in [#3302](https://github.com/microsoft/testfx/pull/3302)
+* Modulename is never empty by @nohwnd in [#3328](https://github.com/microsoft/testfx/pull/3328)
+* dont attach callback if there is no OnExit configured by @SimonCropp in [#3438](https://github.com/microsoft/testfx/pull/3438)
+* missing process using in DebuggerUtility by @SimonCropp in [#3434](https://github.com/microsoft/testfx/pull/3434)
+* remove triple enumeration evaluation and linq usage in CollectEntriesAndErrors by @SimonCropp in [#3451](https://github.com/microsoft/testfx/pull/3451)
+* use XDocument.SaveAsync from polyfill by @SimonCropp in [#3448](https://github.com/microsoft/testfx/pull/3448)
+* Save all code files with UTF8BOM by @nohwnd in [#3536](https://github.com/microsoft/testfx/pull/3536)
+* Save all project files with UTF8 (NOBOM) by @nohwnd in [#3539](https://github.com/microsoft/testfx/pull/3539)
+* Give to json default protocol a name `--server jsonrpc` by @MarcoRossignoli in [#3655](https://github.com/microsoft/testfx/pull/3655)
+* Change --help formatting (and fix --info) by @nohwnd in [#3649](https://github.com/microsoft/testfx/pull/3649)
+* Disable out of process extensions in case of `--list-tests` by @MarcoRossignoli in [#3722](https://github.com/microsoft/testfx/pull/3722)
+
+### Artifacts
+
+* Microsoft.Testing.Extensions.CrashDump: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.CrashDump/1.4.0)
+* Microsoft.Testing.Extensions.HangDump: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.HangDump/1.4.0)
+* Microsoft.Testing.Extensions.HotReload: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.HotReload/1.4.0)
+* Microsoft.Testing.Extensions.Retry: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.Retry/1.4.0)
+* Microsoft.Testing.Extensions.Telemetry: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.Telemetry/1.4.0)
+* Microsoft.Testing.Extensions.TrxReport: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.TrxReport/1.4.0)
+* Microsoft.Testing.Extensions.TrxReport.Abstractions: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.TrxReport.Abstractions/1.4.0)
+* Microsoft.Testing.Extensions.VSTestBridge: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.VSTestBridge/1.4.0)
+* Microsoft.Testing.Platform: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Platform/1.4.0)
+* Microsoft.Testing.Platform.MSBuild: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Platform.MSBuild/1.4.0)
+
## [1.3.2] - 2024-08-05
See full log [here](https://github.com/microsoft/testanywhere/compare/v1.3.1...v1.3.2)
diff --git a/docs/Changelog.md b/docs/Changelog.md
index b32b8d66ba..4e2edb3088 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -4,6 +4,90 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
+## [3.6.0] - 2024-09-11
+
+See full log [here](https://github.com/microsoft/testfx/compare/v3.5.2...v3.6.0)
+
+### Added
+
+* Feat: Add code suppressor for CS8618 on TestContext property by @Evangelink in [#3271](https://github.com/microsoft/testfx/pull/3271)
+* Feature: add support for injecting TestContext in ctor by @Evangelink in [#3267](https://github.com/microsoft/testfx/pull/3267)
+* Feat: Add `[STATestClass]` by @Evangelink in [#3278](https://github.com/microsoft/testfx/pull/3278)
+* Feat: Add [STATestMethod] by @Evangelink in [#3286](https://github.com/microsoft/testfx/pull/3286)
+* Feat: add support for overloaded parameterized tests by @Evangelink in [#3298](https://github.com/microsoft/testfx/pull/3298)
+* Improve display name for DynamicDataAttribute by @Evangelink in [#3293](https://github.com/microsoft/testfx/pull/3293)
+* Feat: allow cooperative timeout by @Evangelink in [#3314](https://github.com/microsoft/testfx/pull/3314)
+* MSTEST0010: report when class is abstract and inheritance is not set by @engyebrahim in [#3347](https://github.com/microsoft/testfx/pull/3347)
+* MSTEST0011: report when class is abstract and inheritance is not specified by @engyebrahim in [#3352](https://github.com/microsoft/testfx/pull/3352)
+* MSTEST0010: report if InheritanceBehavior.BeforeEachDerivedClass is set on a sealed class by @engyebrahim in [#3369](https://github.com/microsoft/testfx/pull/3369)
+* MSTEST0011: report if InheritanceBehavior.BeforeEachDerivedClass is set on a sealed class by @engyebrahim in [#3370](https://github.com/microsoft/testfx/pull/3370)
+* MSTEST0018: DynamicData usage should be valid by @Evangelink in [#3374](https://github.com/microsoft/testfx/pull/3374)
+* Add analyzer for DeploymentItem by @engyebrahim in [#3387](https://github.com/microsoft/testfx/pull/3387)
+* MSTEST0004: Add code fix by @engyebrahim in [#3482](https://github.com/microsoft/testfx/pull/3482)
+* MSTEST0003: Add code fix by @engyebrahim in [#3493](https://github.com/microsoft/testfx/pull/3493)
+* Warn on invalid DisableParallelization configuration entry by @engyebrahim in [#3526](https://github.com/microsoft/testfx/pull/3526)
+* MSTEST0007: Add code fix by @engyebrahim in [#3540](https://github.com/microsoft/testfx/pull/3540)
+* MSTEST0002: Add code fix by @engyebrahim in [#3554](https://github.com/microsoft/testfx/pull/3554)
+* MSTEST0005: Add code fix by @engyebrahim in [#3571](https://github.com/microsoft/testfx/pull/3571)
+* MSTest.Sdk handles library mode by @Evangelink in [#3581](https://github.com/microsoft/testfx/pull/3581)
+* MSTest.Sdk warn or error on invalid or untested properties by @Evangelink in [#3603](https://github.com/microsoft/testfx/pull/3603)
+* MSTEST0036: Add analyzer for when a test member is shadowing another member by @engyebrahim in [#3589](https://github.com/microsoft/testfx/pull/3589)
+* Allows to cancel at multiple points before test execution by @Evangelink in [#3723](https://github.com/microsoft/testfx/pull/3723)
+* Add option to order tests by name by @Evangelink in [#3796](https://github.com/microsoft/testfx/pull/3796)
+
+### Fixed
+
+* Fix timeout message to reflect that 0 is not allowed by @Evangelink in [#3279](https://github.com/microsoft/testfx/pull/3279)
+* Fix TestInitialize and TestCleanup analyzers to allow generic class by @Evangelink in [#3280](https://github.com/microsoft/testfx/pull/3280)
+* Fix test case id filtering for server mode by @MarcoRossignoli in [#3284](https://github.com/microsoft/testfx/pull/3284)
+* Fix collectionAssert.AreEqual fails for list of lists by @engyebrahim in [#3275](https://github.com/microsoft/testfx/pull/3275)
+* MSTEST0034: Use CleanupBehavior.EndOfClass on ClassCleanupAttribute by @engyebrahim in [#3289](https://github.com/microsoft/testfx/pull/3289)
+* Fix MSTEST0029 false positive on TestInitialize/TestCleanup by @engyebrahim in [#3318](https://github.com/microsoft/testfx/pull/3318)
+* Fix passing null to DataRow when signature is object[] by @Evangelink in [#3331](https://github.com/microsoft/testfx/pull/3331)
+* Fix spelling issues by @Evangelink in [#3330](https://github.com/microsoft/testfx/pull/3330)
+* Fix: TestCleanup is always called in case of timeout by @Evangelink in [#3334](https://github.com/microsoft/testfx/pull/3334)
+* Fix cooperative cancellation for TestInit/TestCleanup by @Evangelink in [#3333](https://github.com/microsoft/testfx/pull/3333)
+* Fix message when step is canceled through TestContext by @Evangelink in [#3335](https://github.com/microsoft/testfx/pull/3335)
+* Fix: Skip AssemblyInitialize/Cleanup when all tests are skipped by @Evangelink in [#3339](https://github.com/microsoft/testfx/pull/3339)
+* Fix XmlDataConnection by @Evangelink in [#3346](https://github.com/microsoft/testfx/pull/3346)
+* Fix class initialization/cleanup calls by @Evangelink in [#3362](https://github.com/microsoft/testfx/pull/3362)
+* Fix Assert.VerifyThrows to use standard message pattern by @Evangelink in [#3363](https://github.com/microsoft/testfx/pull/3363)
+* Refactor TestMethod DisplayName by @Evangelink in [#3365](https://github.com/microsoft/testfx/pull/3365)
+* Fix display name for parameterized tests by @Evangelink in [#3366](https://github.com/microsoft/testfx/pull/3366)
+* Fix settings parsing ignore invalid values by @engyebrahim in [#3338](https://github.com/microsoft/testfx/pull/3338)
+* use GetExceptionMessage instead of ex.Message in TestDataSource by @SimonCropp in [#3415](https://github.com/microsoft/testfx/pull/3415)
+* Fix MSTEST0036 to report only on ordinary methods by @Evangelink in [#3711](https://github.com/microsoft/testfx/pull/3711)
+* fix: TRLPlusCCancellationTokenSource doesn't cancel current TestRun by @engyebrahim in [#3672](https://github.com/microsoft/testfx/pull/3672)
+* Fix running cleanup after first test method by @nohwnd in [#3764](https://github.com/microsoft/testfx/pull/3764)
+
+### Housekeeping
+
+* Perf: avoid creation of tasks by @Evangelink in [#3282](https://github.com/microsoft/testfx/pull/3282)
+* For fixtures in STA thread, use TCS instead of Task.Run by @Evangelink in [#3308](https://github.com/microsoft/testfx/pull/3308)
+* Fix typo in initialized by @nohwnd in [#3319](https://github.com/microsoft/testfx/pull/3319)
+* Highlight C# code in analyzer tests by @Evangelink in [#3327](https://github.com/microsoft/testfx/pull/3327)
+* MSTest.Sdk use Playwright 1.45.1 by @Evangelink in [#3380](https://github.com/microsoft/testfx/pull/3380)
+* MSTest.Sdk use aspire 8.1.0 by @Evangelink in [#3379](https://github.com/microsoft/testfx/pull/3379)
+* Update description for (init/cleanup) analyzers by @engyebrahim in [#3391](https://github.com/microsoft/testfx/pull/3391)
+* use SupportedOSPlatform from polyfill by @SimonCropp in [#3409](https://github.com/microsoft/testfx/pull/3409)
+* use Guard from Polyfill by @SimonCropp in [#3508](https://github.com/microsoft/testfx/pull/3508)
+* Save all code files with UTF8BOM by @nohwnd in [#3536](https://github.com/microsoft/testfx/pull/3536)
+* Save all project files with UTF8 (NOBOM) by @nohwnd in [#3539](https://github.com/microsoft/testfx/pull/3539)
+* Reduce verbosity of internal test framework by @Evangelink in [#3537](https://github.com/microsoft/testfx/pull/3537)
+
+### Artifacts
+
+* MSTest: [3.6.0](https://www.nuget.org/packages/MSTest/3.6.0)
+* MSTest.TestFramework: [3.6.0](https://www.nuget.org/packages/MSTest.TestFramework/3.6.0)
+* MSTest.TestAdapter: [3.6.0](https://www.nuget.org/packages/MSTest.TestAdapter/3.6.0)
+* MSTest.Analyzers: [3.6.0](https://www.nuget.org/packages/MSTest.Analyzers/3.6.0)
+* MSTest.Sdk: [3.6.0](https://www.nuget.org/packages/MSTest.Sdk/3.6.0)
+* Microsoft.Testing.Extensions.CrashDump: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.CrashDump/1.4.0)
+* Microsoft.Testing.Extensions.HangDump: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.HangDump/1.4.0)
+* Microsoft.Testing.Extensions.HotReload: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.HotReload/1.4.0)
+* Microsoft.Testing.Extensions.Retry: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.Retry/1.4.0)
+* Microsoft.Testing.Extensions.TrxReport: [1.4.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.TrxReport/1.4.0)
+
## [3.5.2] - 2024-08-13
See full log [here](https://github.com/microsoft/testfx/compare/v3.5.1...v3.5.2)