diff --git a/eng/Versions.props b/eng/Versions.props index f3cec1cc89..f105226537 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,35 +56,35 @@ 17.4.1 - 2.3.0-preview-20220711-02 - 2.3.0-preview-20220711-02 + 3.0.4 + 3.0.4 1.0.3-preview - 2.3.1 - 2.3.1 - 2.3.1 - 3.10.1 - 3.11.0 - 3.8.0 + 2.4.2 + 2.4.5 + 2.4.2 + 3.13.3 + 4.5.0 + 3.16.3 - [2.3.0-preview-20220613-02] - [2.2.10] - [2.2.9] - [2.1.0] - [2.1.0] + [3.2.0-preview.23577.2] + [3.1.1] + [3.0.2] + [2.2.10] + [2.1.2] [1.4.0] - [17.2.0-preview-20220401-08] - [17.2.0] - [17.1.0] - [16.6.1] + [17.9.0-preview-23531-01] + [17.8.0] + [17.7.0] + [17.5.0] [16.11.0] [15.9.2] 5.0.0 diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs index 977ae98fbc..478c595d3d 100644 --- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs +++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreRunnerAttribute.cs @@ -65,8 +65,8 @@ public IEnumerable GetData(MethodInfo methodInfo) return dataRows; } - public string GetDisplayName(MethodInfo methodInfo, object[] data) + public string GetDisplayName(MethodInfo methodInfo, object?[]? data) { - return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data)); + return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data ?? Array.Empty())); } } diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs index eec13fe74c..5cc808dd7f 100644 --- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs +++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetCoreTargetFrameworkDataSourceAttribute.cs @@ -81,8 +81,8 @@ public IEnumerable GetData(MethodInfo methodInfo) return dataRows; } - public string GetDisplayName(MethodInfo methodInfo, object[] data) + public string GetDisplayName(MethodInfo methodInfo, object?[]? data) { - return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data)); + return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data ?? Array.Empty())); } } diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs index 4d8b56c92e..3ade381b25 100644 --- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs +++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFrameworkRunnerAttribute.cs @@ -68,8 +68,8 @@ public IEnumerable GetData(MethodInfo methodInfo) return dataRows; } - public string GetDisplayName(MethodInfo methodInfo, object[] data) + public string GetDisplayName(MethodInfo methodInfo, object?[]? data) { - return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data)); + return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data ?? Array.Empty())); } } diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs index 0179019a1f..c38cdde9cf 100644 --- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs +++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs @@ -110,8 +110,8 @@ public IEnumerable GetData(MethodInfo methodInfo) return dataRows; } - public string GetDisplayName(MethodInfo methodInfo, object[] data) + public string GetDisplayName(MethodInfo methodInfo, object?[]? data) { - return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data)); + return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", methodInfo.Name, string.Join(",", data ?? Array.Empty())); } } diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestDataSourceAttribute.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestDataSourceAttribute.cs index 6f7a6adae2..90f520aeb3 100644 --- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestDataSourceAttribute.cs +++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Extension/TestDataSourceAttribute.cs @@ -32,9 +32,9 @@ IEnumerable ITestDataSource.GetData(MethodInfo methodInfo) return _data; } - string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object[] data) + string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object?[]? data) { - return GetDisplayName(methodInfo, (T1)data[0]); + return GetDisplayName(methodInfo, (T1)data![0]!); } } @@ -63,9 +63,9 @@ IEnumerable ITestDataSource.GetData(MethodInfo methodInfo) return _data; } - string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object[] data) + string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object?[]? data) { - return GetDisplayName(methodInfo, (T1)data[0], (T2)data[1]); + return GetDisplayName(methodInfo, (T1)data![0]!, (T2)data![1]!); } } @@ -95,9 +95,9 @@ IEnumerable ITestDataSource.GetData(MethodInfo methodInfo) return _data; } - string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object[] data) + string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object?[]? data) { - return GetDisplayName(methodInfo, (T1)data[0], (T2)data[1], (T3)data[2]); + return GetDisplayName(methodInfo, (T1)data![0]!, (T2)data[1]!, (T3)data[2]!); } } @@ -128,8 +128,8 @@ IEnumerable ITestDataSource.GetData(MethodInfo methodInfo) return _data; } - string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object[] data) + string ITestDataSource.GetDisplayName(MethodInfo methodInfo, object?[]? data) { - return GetDisplayName(methodInfo, (T1)data[0], (T2)data[1], (T3)data[2], (T4)data[3]); + return GetDisplayName(methodInfo, (T1)data![0]!, (T2)data[1]!, (T3)data[2]!, (T4)data[3]!); } } diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/DataCollectorAttachmentProcessorAppDomainTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/DataCollectorAttachmentProcessorAppDomainTests.cs index eeef74233d..ca3ebea968 100644 --- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/DataCollectorAttachmentProcessorAppDomainTests.cs +++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/AttachmentsProcessing/DataCollectorAttachmentProcessorAppDomainTests.cs @@ -87,17 +87,18 @@ public async Task DataCollectorAttachmentProcessorAppDomain_ShouldReturnCorrectA Assert.IsTrue(dcap.LoadSucceded); var attachmentsResult = await dcap.ProcessAttachmentSetsAsync(doc.DocumentElement, attachments, new Progress(), _loggerMock.Object, CancellationToken.None); + var firstAttachmentSet = attachmentsResult.First(); // assert // We return same instance but we're marshaling so we expected different pointers - Assert.AreNotSame(attachmentSet, attachmentsResult); + Assert.AreNotSame(attachmentSet, firstAttachmentSet); - Assert.AreEqual(attachmentSet.DisplayName, attachmentsResult.First().DisplayName); - Assert.AreEqual(attachmentSet.Uri, attachmentsResult.First().Uri); + Assert.AreEqual(attachmentSet.DisplayName, firstAttachmentSet.DisplayName); + Assert.AreEqual(attachmentSet.Uri, firstAttachmentSet.Uri); Assert.AreEqual(attachmentSet.Attachments.Count, attachmentsResult.Count); - Assert.AreEqual(attachmentSet.Attachments[0].Description, attachmentsResult.First().Attachments[0].Description); - Assert.AreEqual(attachmentSet.Attachments[0].Uri, attachmentsResult.First().Attachments[0].Uri); - Assert.AreEqual(attachmentSet.Attachments[0].Uri, attachmentsResult.First().Attachments[0].Uri); + Assert.AreEqual(attachmentSet.Attachments[0].Description, firstAttachmentSet.Attachments[0].Description); + Assert.AreEqual(attachmentSet.Attachments[0].Uri, firstAttachmentSet.Attachments[0].Uri); + Assert.AreEqual(attachmentSet.Attachments[0].Uri, firstAttachmentSet.Attachments[0].Uri); } [TestMethod] diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageDataAttachmentsHandlerTests.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageDataAttachmentsHandlerTests.cs index b6626f081b..0761e61d69 100644 --- a/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageDataAttachmentsHandlerTests.cs +++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/CodeCoverageDataAttachmentsHandlerTests.cs @@ -33,7 +33,7 @@ public class CodeCoverageDataAttachmentsHandlerTests public TestContext? TestContext { get; set; } - internal string TestFilesDirectory => Path.Combine(TestContext!.DeploymentDirectory, "TestFiles"); + internal string TestFilesDirectory => Path.Combine(TestContext!.DeploymentDirectory!, "TestFiles"); public CodeCoverageDataAttachmentsHandlerTests() { @@ -50,19 +50,17 @@ public CodeCoverageDataAttachmentsHandlerTests() #endif } -#if NETFRAMEWORK [ClassInitialize] public static void ClassInitialize(TestContext context) { // Copying test files to correct place, var assemblyPath = AppDomain.CurrentDomain.BaseDirectory; - var testFilesDirectory = Path.Combine(context.DeploymentDirectory, "TestFiles"); + var testFilesDirectory = Path.Combine(context.DeploymentDirectory!, "TestFiles"); Directory.CreateDirectory(testFilesDirectory); var files = Directory.GetFiles(Path.Combine(assemblyPath, "TestFiles")); foreach (var file in files) File.Copy(file, Path.Combine(testFilesDirectory, Path.GetFileName(file))); } -#endif [TestMethod] public async Task HandleDataCollectionAttachmentSetsShouldReturnEmptySetWhenNoAttachmentsOrAttachmentsAreNull() diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj index 01a6a79ab8..2ef1dbe427 100644 --- a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj @@ -15,7 +15,7 @@ - +