diff --git a/.editorconfig b/.editorconfig
index e323c80086..fd9640b60c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -132,7 +132,7 @@ dotnet_diagnostic.IDE0020.severity = warning # IDE0020: IDE0038: Use
dotnet_diagnostic.IDE0028.severity = warning # IDE0028: Simplify collection initialization
dotnet_diagnostic.IDE0031.severity = warning # IDE0031: Use null propagation
dotnet_style_null_propagation = true:warning # IDE0031: Use null propagation
-dotnet_diagnostic.IDE0032.severity = warning # IDE0032: Use auto-implemented property
+dotnet_diagnostic.IDE0032.severity = none # IDE0032: Use auto-implemented property
dotnet_diagnostic.IDE0034.severity = warning # IDE0034: Simplify 'default' expression
dotnet_diagnostic.IDE0035.severity = warning # IDE0035: Remove unreachable code
dotnet_diagnostic.IDE0036.severity = warning # IDE0036: Order modifiers
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4b44ce9907..4b903f1fca 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,7 +4,7 @@
true
- 8.1.0
+ 8.2.2
17.10.0-preview-24127-03
3.11.0-beta1.24318.1
3.11.0
@@ -14,7 +14,7 @@
6.2.14
17.11.1
- 1.45.1
+ 1.49.0
4.3.1
4.3.1
@@ -70,7 +70,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0dfbfb2829..dd4e180899 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,9 +13,9 @@
https://github.com/dotnet/arcade
d7f6456959c71512dd68e03021e0aadd8e27d025
-
+
https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage
- 43d6af3682f80c1fb77f0c3a7223c84bd49f7708
+ 1406857e7a6df8189656aeb9ae2a75bfc402c65f
https://github.com/microsoft/testanywhere
diff --git a/eng/Versions.props b/eng/Versions.props
index 78baeb6324..0135a7e88f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,14 +1,14 @@
- 3.6.3
+ 3.6.4
1.4.3
preview
10.0.0-beta.24429.6
- 17.12.6
+ 17.13.1
1.4.3
1.0.0-alpha.24562.1
diff --git a/global.json b/global.json
index b49cd4628a..aa3eb167a6 100644
--- a/global.json
+++ b/global.json
@@ -4,15 +4,15 @@
"runtimes": {
"dotnet": [
"3.1.32",
- "6.0.33",
+ "6.0.36",
"7.0.20",
- "8.0.8"
+ "8.0.11"
],
"dotnet/x86": [
- "8.0.8"
+ "8.0.11"
],
"aspnetcore": [
- "8.0.8"
+ "8.0.11"
]
},
"vs": {
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Solution.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Solution.cs
index e004a8ced4..7ad84c074d 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Solution.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Solution.cs
@@ -11,28 +11,9 @@ public class MSBuildTests_Solution : AcceptanceTestBase
private readonly AcceptanceFixture _acceptanceFixture;
private const string AssetName = "MSTestProject";
- static MSBuildTests_Solution()
- {
- string dotnetMuxerSDK = Directory.GetDirectories(Path.Combine(RootFinder.Find(), ".dotnet", "sdk")).OrderByDescending(x => x).First();
- File.WriteAllText(Path.Combine(dotnetMuxerSDK, "Microsoft.Common.CrossTargeting.targets"), MicrosoftCommonCrossTargeting);
- if (!File.Exists(Path.Combine(dotnetMuxerSDK, "Microsoft.Common.Test.targets")))
- {
- File.WriteAllText(Path.Combine(dotnetMuxerSDK, "Microsoft.Common.Test.targets"), MicrosoftCommonTesttargets);
- }
- }
-
public MSBuildTests_Solution(ITestExecutionContext testExecutionContext, AcceptanceFixture acceptanceFixture)
: base(testExecutionContext) => _acceptanceFixture = acceptanceFixture;
- private void CheckPatch()
- {
- // https://github.com/dotnet/sdk/issues/37712
- if (DateTime.UtcNow.Date > new DateTime(2024, 12, 1))
- {
- throw new InvalidOperationException("Check if we can remove the patch!");
- }
- }
-
internal static IEnumerable> GetBuildMatrix()
{
foreach (TestArgumentsEntry<(string SingleTfmOrMultiTfm, BuildConfiguration BuildConfiguration, bool IsMultiTfm)> entry in GetBuildMatrixSingleAndMultiTfmBuildConfiguration())
@@ -52,8 +33,6 @@ private void CheckPatch()
[ArgumentsProvider(nameof(GetBuildMatrix))]
public async Task MSBuildTests_UseMSBuildTestInfrastructure_Should_Run_Solution_Tests(string singleTfmOrMultiTfm, BuildConfiguration _, bool isMultiTfm, string command)
{
- CheckPatch();
-
using TestAsset generator = await TestAsset.GenerateAssetAsync(
AssetName,
SourceCode
@@ -155,215 +134,5 @@ public void TestMethod1()
global using Microsoft.Testing.Platform.Builder;
global using Microsoft.Testing.Internal.Framework;
global using Microsoft.Testing.Platform.MSBuild;
-""";
-
- private const string MicrosoftCommonCrossTargeting = """
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
- <_ThisProjectBuildMetadata Include="$(MSBuildProjectFullPath)">
- @(_TargetFrameworkInfo)
- @(_TargetFrameworkInfo->'%(TargetFrameworkMonikers)')
- @(_TargetFrameworkInfo->'%(TargetPlatformMonikers)')
- $(_AdditionalPropertiesFromProject)
- false
- @(_TargetFrameworkInfo->'%(IsRidAgnostic)')
-
-
- false
- $(Platform)
- $(Platforms)
-
-
-
-
-
- <_TargetFramework Include="$(TargetFrameworks)" />
-
- <_TargetFrameworkNormalized Include="@(_TargetFramework->Trim()->Distinct())" />
- <_InnerBuildProjects Include="$(MSBuildProjectFile)">
- TargetFramework=%(_TargetFrameworkNormalized.Identity)
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
- Build
-
-
-
-
-
-
-
-
-
-
-
- $([MSBuild]::IsRunningFromVisualStudio())
- $([MSBuild]::GetToolsDirectory32())\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets
- $(MSBuildToolsPath)\NuGet.targets
-
-
-
-
-
- true
-
-
-
-
- true
-
-
-
- true
-
-
-
- <_DirectoryBuildTargetsFile Condition="'$(_DirectoryBuildTargetsFile)' == ''">Directory.Build.targets
- <_DirectoryBuildTargetsBasePath Condition="'$(_DirectoryBuildTargetsBasePath)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), '$(_DirectoryBuildTargetsFile)'))
- $([System.IO.Path]::Combine('$(_DirectoryBuildTargetsBasePath)', '$(_DirectoryBuildTargetsFile)'))
-
-
-
- false
-
-
-
-""";
-
- private const string MicrosoftCommonTesttargets = """
-
-
-
""";
}
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj
index ef4a287f2f..576e802897 100644
--- a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj
+++ b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj
@@ -34,6 +34,7 @@
+
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj b/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj
index aa25491031..46dc781e59 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj
+++ b/test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj
@@ -26,6 +26,7 @@
+