diff --git a/Directory.Packages.props b/Directory.Packages.props
index 05ded62687..639f668e92 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -22,8 +22,8 @@
6.2.14
- 18.0.0
- 1.55.0
+ 18.0.1
+ 1.56.018.1.11.5.0-preview.24577.44.5.4
diff --git a/docs/Changelog-Platform.md b/docs/Changelog-Platform.md
index 3be0df25cd..57f38cab39 100644
--- a/docs/Changelog-Platform.md
+++ b/docs/Changelog-Platform.md
@@ -4,6 +4,26 @@ 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/)
+## [2.0.2] - 2025-11-11
+
+See full log [of v4.0.1...v4.0.2](https://github.com/microsoft/testfx/compare/v4.0.1...v4.0.2)
+
+* No change, released to keep version aligned with MSTest.
+
+### Artifacts
+
+* Microsoft.Testing.Platform: [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Platform/2.0.2)
+* Microsoft.Testing.Platform.MSBuild: [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Platform.MSBuild/2.0.2)
+* Microsoft.Testing.Extensions.CrashDump: [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Extensions.CrashDump/2.0.2)
+* Microsoft.Testing.Extensions.HangDump: [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Extensions.HangDump/2.0.2)
+* Microsoft.Testing.Extensions.HotReload: [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Extensions.HotReload/2.0.2)
+* Microsoft.Testing.Extensions.Retry: [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Extensions.Retry/2.0.2)
+* Microsoft.Testing.Extensions.Telemetry: [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Extensions.Telemetry/2.0.2)
+* Microsoft.Testing.Extensions.TrxReport: [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Extensions.TrxReport/2.0.2)
+* Microsoft.Testing.Extensions.TrxReport.Abstractions: [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Extensions.TrxReport.Abstractions/2.0.2)
+* Microsoft.Testing.Extensions.VSTestBridge: [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Extensions.VSTestBridge/2.0.2)
+* Microsoft.Testing.Extensions.AzureDevOpsReport [2.0.2](https://www.nuget.org/packages/Microsoft.Testing.Extensions.AzureDevOpsReport/2.0.2)
+
## [2.0.1] - 2025-10-14
See full log [of v4.0.0...v4.0.1](https://github.com/microsoft/testfx/compare/v4.0.0...v4.0.1)
@@ -48,6 +68,26 @@ See full log [of v3.11.0...v4.0.0](https://github.com/microsoft/testfx/compare/v
* Microsoft.Testing.Extensions.VSTestBridge: [2.0.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.VSTestBridge/2.0.0)
* Microsoft.Testing.Extensions.AzureDevOpsReport [2.0.0](https://www.nuget.org/packages/Microsoft.Testing.Extensions.AzureDevOpsReport/2.0.0)
+## [1.9.1] - 2025-11-11
+
+See full log [of v4.0.1...v4.0.2](https://github.com/microsoft/testfx/compare/v4.0.1...v4.0.2)
+
+* No change, released to keep version aligned with MSTest.
+
+### Artifacts
+
+* Microsoft.Testing.Platform: [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Platform/1.9.1)
+* Microsoft.Testing.Platform.MSBuild: [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Platform.MSBuild/1.9.1)
+* Microsoft.Testing.Extensions.CrashDump: [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Extensions.CrashDump/1.9.1)
+* Microsoft.Testing.Extensions.HangDump: [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Extensions.HangDump/1.9.1)
+* Microsoft.Testing.Extensions.HotReload: [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Extensions.HotReload/1.9.1)
+* Microsoft.Testing.Extensions.Retry: [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Extensions.Retry/1.9.1)
+* Microsoft.Testing.Extensions.Telemetry: [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Extensions.Telemetry/1.9.1)
+* Microsoft.Testing.Extensions.TrxReport: [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Extensions.TrxReport/1.9.1)
+* Microsoft.Testing.Extensions.TrxReport.Abstractions: [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Extensions.TrxReport.Abstractions/1.9.1)
+* Microsoft.Testing.Extensions.VSTestBridge: [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Extensions.VSTestBridge/1.9.1)
+* Microsoft.Testing.Extensions.AzureDevOpsReport [1.9.1](https://www.nuget.org/packages/Microsoft.Testing.Extensions.AzureDevOpsReport/1.9.1)
+
## [1.9.0] - 2025-10-01
See full log [of v3.10.5...v3.11.0](https://github.com/microsoft/testfx/compare/v3.10.5...v3.11.0)
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 3839cca51b..6cb93482f4 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -4,6 +4,29 @@ 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/)
+## [4.0.2] - 2025-11-11
+
+See full log [of v4.0.1...v4.0.2](https://github.com/microsoft/testfx/compare/v4.0.1...v4.0.2)
+
+### Fixed
+
+* Fix DisableAppDomain default value when not running in isolation under VSTest by @Copilot in [#6909](https://github.com/microsoft/testfx/pull/6909)
+* Update Microsoft.NET.Test.Sdk version to 18.0.1 by @nohwnd in [#6924](https://github.com/microsoft/testfx/pull/6924)
+
+### Housekeeping
+
+* Update Microsoft.Build.Utilities.Core to 17.11.48 by @Youssef1313 in [#6846](https://github.com/microsoft/testfx/pull/6846)
+
+### Artifacts
+
+* MSTest: [4.0.2](https://www.nuget.org/packages/MSTest/4.0.2)
+* MSTest.TestFramework: [4.0.2](https://www.nuget.org/packages/MSTest.TestFramework/4.0.2)
+* MSTest.TestAdapter: [4.0.2](https://www.nuget.org/packages/MSTest.TestAdapter/4.0.2)
+* MSTest.Analyzers: [4.0.2](https://www.nuget.org/packages/MSTest.Analyzers/4.0.2)
+* MSTest.Sdk: [4.0.2](https://www.nuget.org/packages/MSTest.Sdk/4.0.2)
+* MSTest.SourceGeneration: [2.0.0-alpha.25561.4](https://www.nuget.org/packages/MSTest.SourceGeneration/2.0.0-alpha.25561.4)
+* MSTest.Engine: [2.0.0-alpha.25561.4](https://www.nuget.org/packages/MSTest.Engine/2.0.0-alpha.25561.4)
+
## [4.0.1] - 2025-10-14
See full log [of v4.0.0...v4.0.1](https://github.com/microsoft/testfx/compare/v4.0.0...v4.0.1)
@@ -45,6 +68,28 @@ See full log [of v3.11.0...v4.0.0](https://github.com/microsoft/testfx/compare/v
* MSTest.SourceGeneration: [2.0.0-alpha.25507.7](https://www.nuget.org/packages/MSTest.SourceGeneration/2.0.0-alpha.25507.7)
* MSTest.Engine: [2.0.0-alpha.25507.7](https://www.nuget.org/packages/MSTest.Engine/2.0.0-alpha.25507.7)
+## [3.11.1] - 2025-11-11
+
+See full log [of v3.11.0...v3.11.1](https://github.com/microsoft/testfx/compare/v3.11.0...v3.11.1)
+
+### Fixed
+
+* Fix deployment regression by @Youssef1313 in [#6904](https://github.com/microsoft/testfx/pull/6904)
+
+### Housekeeping
+
+* Update Microsoft.Build.Utilities.Core to 17.11.48 by @Youssef1313 in [#6847](https://github.com/microsoft/testfx/pull/6847)
+
+### Artifacts
+
+* MSTest: [3.11.1](https://www.nuget.org/packages/MSTest/3.11.1)
+* MSTest.TestFramework: [3.11.1](https://www.nuget.org/packages/MSTest.TestFramework/3.11.1)
+* MSTest.TestAdapter: [3.11.1](https://www.nuget.org/packages/MSTest.TestAdapter/3.11.1)
+* MSTest.Analyzers: [3.11.1](https://www.nuget.org/packages/MSTest.Analyzers/3.11.1)
+* MSTest.Sdk: [3.11.1](https://www.nuget.org/packages/MSTest.Sdk/3.11.1)
+* MSTest.SourceGeneration: [1.0.0-alpha.25561.5](https://www.nuget.org/packages/MSTest.SourceGeneration/1.0.0-alpha.25561.5)
+* MSTest.Engine: [1.0.0-alpha.25561.5](https://www.nuget.org/packages/MSTest.Engine/1.0.0-alpha.25561.5)
+
## [3.11.0] - 2025-10-01
See full log [of v3.10.5...v3.11.0](https://github.com/microsoft/testfx/compare/v3.10.5...v3.11.0)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 70cf59b7ed..7d6d02a4a6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,29 +1,29 @@
-
+ https://github.com/dotnet/arcade
- 7d717a49d570577936361c14de38bf61271aa274
+ 3a7f017be1c42a4ecc516446977cf55d429cf390
-
+ https://github.com/dotnet/arcade
- 7d717a49d570577936361c14de38bf61271aa274
+ 3a7f017be1c42a4ecc516446977cf55d429cf390
-
+ https://github.com/dotnet/arcade
- 7d717a49d570577936361c14de38bf61271aa274
+ 3a7f017be1c42a4ecc516446977cf55d429cf390https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverageb3ec110c7b23b6f726c516763f6810e74be7b192
-
+ https://github.com/microsoft/testfx
- 7df896aeec9505a44371dbe0dd2712764d0ce0f6
+ 29aa788ac17beff2313e392de6c484f585b4f59b
-
+ https://github.com/microsoft/testfx
- 7df896aeec9505a44371dbe0dd2712764d0ce0f6
+ 29aa788ac17beff2313e392de6c484f585b4f59b
diff --git a/eng/Versions.props b/eng/Versions.props
index a99b2c2822..9329d1bad7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -7,10 +7,10 @@
preview
- 11.0.0-beta.25557.2
+ 11.0.0-beta.25560.118.1.0-preview.25507.2
- 4.1.0-preview.25558.6
- 2.1.0-preview.25558.6
+ 4.1.0-preview.25559.1
+ 2.1.0-preview.25559.1
diff --git a/global.json b/global.json
index aec92dc2bb..b74ede60a2 100644
--- a/global.json
+++ b/global.json
@@ -39,7 +39,7 @@
"runner": "Microsoft.Testing.Platform"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25557.2",
+ "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25560.1",
"MSBuild.Sdk.Extras": "3.0.44"
}
}
diff --git a/samples/public/Directory.Build.props b/samples/public/Directory.Build.props
index 9cda6ad52f..de64c982f5 100644
--- a/samples/public/Directory.Build.props
+++ b/samples/public/Directory.Build.props
@@ -3,10 +3,10 @@
9.5.118.1.0
- 4.0.1
- 2.0.0-alpha.25514.6
- 1.55.0
- 2.0.1
+ 4.0.2
+ 2.0.0-alpha.25561.4
+ 1.56.0
+ 2.0.218.0.0false$(NoWarn);SA0001;EnableGenerateDocumentationFile
diff --git a/samples/public/global.json b/samples/public/global.json
index 228b700818..ab49e414dc 100644
--- a/samples/public/global.json
+++ b/samples/public/global.json
@@ -1,5 +1,5 @@
{
"msbuild-sdks": {
- "MSTest.Sdk": "4.0.0"
+ "MSTest.Sdk": "4.0.2"
}
}
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/MSTestAdapterSettings.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/MSTestAdapterSettings.cs
index a9c9bf0192..4e2a109300 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/MSTestAdapterSettings.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/MSTestAdapterSettings.cs
@@ -189,9 +189,11 @@ public static bool IsAppDomainCreationDisabled(string? settingsXml)
bool disableAppDomain = true;
// HACK: When running VSTest, and VSTest didn't create TestHostAppDomain (default behavior), we must be enabling appdomain in MSTest.
// Otherwise, we will not merge app.config properly, nor we will have correct BaseDirectory of current domain.
+ // This detects if we run in testhost.*.exe or in vstest.console.exe.This covers all: running with vstest.console.exe because there we can run in both modes, running with dotnet test or VS, because there we can run only in testhost(in isolation).
#if NETFRAMEWORK
if (AppDomain.CurrentDomain.Id == 1 &&
- AppDomain.CurrentDomain.FriendlyName.StartsWith("testhost.", StringComparison.Ordinal) &&
+ (AppDomain.CurrentDomain.FriendlyName.StartsWith("testhost.", StringComparison.Ordinal) ||
+ AppDomain.CurrentDomain.FriendlyName.StartsWith("vstest.console.", StringComparison.Ordinal)) &&
AppDomain.CurrentDomain.FriendlyName.EndsWith(".exe", StringComparison.Ordinal))
{
disableAppDomain = false;
diff --git a/src/Analyzers/MSTest.Analyzers/xlf/Resources.cs.xlf b/src/Analyzers/MSTest.Analyzers/xlf/Resources.cs.xlf
index b7b156acca..a416844e86 100644
--- a/src/Analyzers/MSTest.Analyzers/xlf/Resources.cs.xlf
+++ b/src/Analyzers/MSTest.Analyzers/xlf/Resources.cs.xlf
@@ -991,17 +991,17 @@ Typ deklarující tyto metody by měl také respektovat následující pravidla:
Do not use asserts in catch blocks
- Do not use asserts in catch blocks
+ Nepoužívat kontrolní výrazy v blocích catchDo not use asserts in catch blocks because they may not fail the test if no exception is thrown
- Do not use asserts in catch blocks because they may not fail the test if no exception is thrown
+ Nepoužívejte kontrolní výrazy v blocích catch, protože test nemusí selhat, pokud není vyvolána žádná výjimka.Using asserts in catch blocks is problematic because the test will pass even if no exception is thrown and the catch block is never executed. Use 'Assert.Throws', 'Assert.ThrowsExactly', 'Assert.ThrowsAsync' or 'Assert.ThrowsExactlyAsync' to verify that an exception is thrown, and then make additional assertions on the caught exception without using the try-catch block.
- Using asserts in catch blocks is problematic because the test will pass even if no exception is thrown and the catch block is never executed. Use 'Assert.Throws', 'Assert.ThrowsExactly', 'Assert.ThrowsAsync' or 'Assert.ThrowsExactlyAsync' to verify that an exception is thrown, and then make additional assertions on the caught exception without using the try-catch block.
+ Používání kontrolních výrazů v blocích catch je problematické, protože test projde, i když se nevyvolá žádná výjimka a blok catch se nikdy nespustí. K ověření, že je vyvolána výjimka, použijte metody Assert.Throws, Assert.ThrowsExactly, Assert.ThrowsAsync nebo Assert.ThrowsExactlyAsync a poté proveďte další kontrolní výrazy nad zachycenou výjimkou bez použití bloku try-catch.