From 851b9cf68a3e71e3fd7d5fbd766a535359d61616 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Tue, 23 Feb 2021 16:51:15 -0800 Subject: [PATCH 1/7] Added basic WinUI3 support. --- TestFx.sln | 32 ++++++- azure-pipelines.yml | 6 +- scripts/common.lib.ps1 | 2 +- ...STest.Internal.TestFx.Documentation.nuspec | 1 + src/Package/MSTest.TestFramework.enu.nuspec | 10 +++ src/Package/MSTest.TestFramework.nuspec | 38 +++++++++ .../MSTest.TestFramework.symbols.nuspec | 10 +++ .../Extension.Shared/TestContext.cs | 10 +-- .../Extension.WinUI/Extension.WinUI.csproj | 43 ++++++++++ .../Extension.WinUI/UITestMethodAttribute.cs | 85 +++++++++++++++++++ .../Resources/FrameworkMessages.Designer.cs | 11 ++- .../Resources/FrameworkMessages.resx | 3 + 12 files changed, 239 insertions(+), 12 deletions(-) create mode 100644 src/TestFramework/Extension.WinUI/Extension.WinUI.csproj create mode 100644 src/TestFramework/Extension.WinUI/UITestMethodAttribute.cs diff --git a/TestFx.sln b/TestFx.sln index 33d02154c5..06b91d0d02 100644 --- a/TestFx.sln +++ b/TestFx.sln @@ -142,8 +142,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "targets", "targets", "{F60B ProjectSection(SolutionItems) = preProject scripts\build\TestFx.Loc.targets = scripts\build\TestFx.Loc.targets scripts\build\TestFx.Settings.targets = scripts\build\TestFx.Settings.targets - scripts\build\TestFx.Versions.targets = scripts\build\TestFx.Versions.targets scripts\build\TestFx.targets = scripts\build\TestFx.targets + scripts\build\TestFx.Versions.targets = scripts\build\TestFx.Versions.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BCF525B1-E67F-486D-B091-06A8BB8A2793}" @@ -186,10 +186,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeploymentTestProjectNetCor EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimeoutTestProjectNetCore", "test\E2ETests\TestAssets\TimeoutTestProjectNetCore\TimeoutTestProjectNetCore.csproj", "{ED27A844-6870-4FE6-8FEF-3ABDD1ED6564}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpTestProject", "test\E2ETests\TestAssets\FSharpTestProject\FSharpTestProject.fsproj", "{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpTestProject", "test\E2ETests\TestAssets\FSharpTestProject\FSharpTestProject.fsproj", "{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extension.WinUI", "src\TestFramework\Extension.WinUI\Extension.WinUI.csproj", "{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution + src\TestFramework\Extension.Shared\Extension.Shared.projitems*{23b9d9a2-4aee-47e6-97b5-060df21539fb}*SharedItemsImports = 5 src\TestFramework\Extension.Shared\Extension.Shared.projitems*{272ca5e1-8e81-4825-9e47-86cce02f700d}*SharedItemsImports = 13 src\TestFramework\Extension.Shared\Extension.Shared.projitems*{df131865-84ee-4540-8112-e88acebdea09}*SharedItemsImports = 4 EndGlobalSection @@ -1168,6 +1171,30 @@ Global {E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}.Release|x64.Build.0 = Release|Any CPU {E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}.Release|x86.ActiveCfg = Release|Any CPU {E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}.Release|x86.Build.0 = Release|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|Any CPU.ActiveCfg = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|Any CPU.Build.0 = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|ARM.ActiveCfg = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|ARM.Build.0 = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x64.ActiveCfg = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x64.Build.0 = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x86.ActiveCfg = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x86.Build.0 = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|ARM.ActiveCfg = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|ARM.Build.0 = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x64.ActiveCfg = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x64.Build.0 = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x86.ActiveCfg = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x86.Build.0 = Debug|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|Any CPU.Build.0 = Release|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|ARM.ActiveCfg = Release|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|ARM.Build.0 = Release|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x64.ActiveCfg = Release|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x64.Build.0 = Release|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x86.ActiveCfg = Release|Any CPU + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1232,6 +1259,7 @@ Global {26F0B8EF-92D4-4A23-ACB4-D1B662F0EEBE} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8} {ED27A844-6870-4FE6-8FEF-3ABDD1ED6564} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8} {E5E58613-82FC-44CD-B75F-4F1C7ED52D0D} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8} + {23B9D9A2-4AEE-47E6-97B5-060DF21539FB} = {E48AC786-E150-4F41-9A16-32F02E4493D8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5f895d71b8..fc52a8e666 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,16 +4,16 @@ jobs: - job: Windows pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-2019' variables: buildConfiguration: 'Release' steps: - task: NuGetToolInstaller@0 - displayName: 'Pull in NuGet 4.9.2' + displayName: 'Pull in NuGet 5.8.1' inputs: - versionSpec: 4.9.2 + versionSpec: 5.8.1 - powershell: | reg DELETE "HKLM\Software\Microsoft\StrongName\Verification" /f diff --git a/scripts/common.lib.ps1 b/scripts/common.lib.ps1 index 213eae1fe1..83b7a57a52 100644 --- a/scripts/common.lib.ps1 +++ b/scripts/common.lib.ps1 @@ -7,7 +7,7 @@ # Global Variables # $global:msbuildVersion = "15.0" -$global:nugetVersion = "4.9.4" +$global:nugetVersion = "5.8.1" $global:vswhereVersion = "2.0.2" $global:nugetUrl = "https://dist.nuget.org/win-x86-commandline/v$nugetVersion/NuGet.exe" diff --git a/src/Package/MSTest.Internal.TestFx.Documentation.nuspec b/src/Package/MSTest.Internal.TestFx.Documentation.nuspec index ae836acc0e..8cceca8cdf 100644 --- a/src/Package/MSTest.Internal.TestFx.Documentation.nuspec +++ b/src/Package/MSTest.Internal.TestFx.Documentation.nuspec @@ -21,6 +21,7 @@ + diff --git a/src/Package/MSTest.TestFramework.enu.nuspec b/src/Package/MSTest.TestFramework.enu.nuspec index 3b4bcef938..9d5ea3ac2a 100644 --- a/src/Package/MSTest.TestFramework.enu.nuspec +++ b/src/Package/MSTest.TestFramework.enu.nuspec @@ -40,6 +40,10 @@ + + + + @@ -61,6 +65,12 @@ + + + + + + diff --git a/src/Package/MSTest.TestFramework.nuspec b/src/Package/MSTest.TestFramework.nuspec index 46ae9d569e..9c5f5ff970 100644 --- a/src/Package/MSTest.TestFramework.nuspec +++ b/src/Package/MSTest.TestFramework.nuspec @@ -40,6 +40,10 @@ + + + + @@ -145,6 +149,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Package/MSTest.TestFramework.symbols.nuspec b/src/Package/MSTest.TestFramework.symbols.nuspec index 0a21e2783c..e19e898c8c 100644 --- a/src/Package/MSTest.TestFramework.symbols.nuspec +++ b/src/Package/MSTest.TestFramework.symbols.nuspec @@ -56,6 +56,16 @@ + + + + + + + + + + diff --git a/src/TestFramework/Extension.Shared/TestContext.cs b/src/TestFramework/Extension.Shared/TestContext.cs index 1db99d2f27..2641369742 100644 --- a/src/TestFramework/Extension.Shared/TestContext.cs +++ b/src/TestFramework/Extension.Shared/TestContext.cs @@ -3,11 +3,11 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting { - using System; - using System.Collections; - using System.Collections.Generic; - using System.Globalization; - using System.Threading; + using global::System; + using global::System.Collections; + using global::System.Collections.Generic; + using global::System.Globalization; + using global::System.Threading; /// /// TestContext class. This class should be fully abstract and not contain any diff --git a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj new file mode 100644 index 0000000000..0f44e674d3 --- /dev/null +++ b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj @@ -0,0 +1,43 @@ + + + + Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions + Microsoft.VisualStudio.TestTools.UnitTesting + Microsoft Corporation + Extension.WinUI + Extension.WinUI + © Microsoft Corporation. All rights reserved. + + net5.0-windows10.0.18362.0 + 10.0.18362.0 + 10.0.18362.0 + 10.0.18362.0 + + false + win10-x86;win10-x64;win10-arm64 + + + + ..\..\..\ + NetCore + + + + + + + + + + + + + + + $(OutputPath)\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.XML + Extensions\WinUI + + + + + diff --git a/src/TestFramework/Extension.WinUI/UITestMethodAttribute.cs b/src/TestFramework/Extension.WinUI/UITestMethodAttribute.cs new file mode 100644 index 0000000000..db1d3002d2 --- /dev/null +++ b/src/TestFramework/Extension.WinUI/UITestMethodAttribute.cs @@ -0,0 +1,85 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer +{ + using global::System; + using global::System.Runtime.CompilerServices; + + /// + /// Execute test code in UI thread for Windows store apps. + /// + public class UITestMethodAttribute : TestMethodAttribute + { + /// + /// Gets or sets the that should be used to invoke the UITestMethodAttribute. + /// If none is provided, it will try to use the Microsoft.UI.Xaml.Window.Current.DispatcherQueue, which only works on UWP. + /// + public static Microsoft.System.DispatcherQueue DispatcherQueue { get; set; } + + /// + /// Executes the test method on the UI Thread. + /// + /// + /// The test method. + /// + /// + /// An array of instances. + /// + /// Throws when run on an async test method. + /// + public override TestResult[] Execute(ITestMethod testMethod) + { + var attrib = testMethod.GetAttributes(false); + if (attrib.Length > 0) + { + throw new NotSupportedException(FrameworkMessages.AsyncUITestMethodNotSupported); + } + + TestResult result = null; + + var dispatcher = DispatcherQueue ?? global::Microsoft.UI.Xaml.Window.Current?.DispatcherQueue; + if (dispatcher == null) + { + throw new InvalidOperationException(FrameworkMessages.AsyncUITestMethodWithNoDispatcherQueue); + } + + if (dispatcher.HasThreadAccess) + { + try + { + result = testMethod.Invoke(Array.Empty()); + } + catch (Exception e) + { + return new TestResult[] { new TestResult { TestFailureException = e } }; + } + } + else + { + var taskCompletionSource = new global::System.Threading.Tasks.TaskCompletionSource(); + + if (!dispatcher.TryEnqueue(System.DispatcherQueuePriority.Normal, () => + { + try + { + result = testMethod.Invoke(Array.Empty()); + taskCompletionSource.SetResult(null); + } + catch (Exception e) + { + result = new TestResult { TestFailureException = e }; + taskCompletionSource.SetException(e); + } + })) + { + taskCompletionSource.SetResult(null); + } + + taskCompletionSource.Task.GetAwaiter().GetResult(); + } + + return new TestResult[] { result }; + } + } +} diff --git a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs index be4d3d96eb..06565c8eb4 100644 --- a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs +++ b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs @@ -20,7 +20,7 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class FrameworkMessages { @@ -169,6 +169,15 @@ internal static string AsyncUITestMethodNotSupported { } } + /// + /// Looks up a localized string similar to UITestMethodAttribute.DispatcherQueue should not be nul. To use UITestMethodAttribute within a WinUI Desktop App, remember to set the static UITestMethodAttribute.DispatcherQueue during the test initialization.. + /// + internal static string AsyncUITestMethodWithNoDispatcherQueue { + get { + return ResourceManager.GetString("AsyncUITestMethodWithNoDispatcherQueue", resourceCulture); + } + } + /// /// Looks up a localized string similar to Both collections are empty. {0}. /// diff --git a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx index a5c5a370be..4b2a1ac943 100644 --- a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx +++ b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx @@ -277,6 +277,9 @@ Stack Trace: {4} async TestMethod with UITestMethodAttribute are not supported. Either remove async or use TestMethodAttribute. + + UITestMethodAttribute.DispatcherQueue should not be nul. To use UITestMethodAttribute within a WinUI Desktop App, remember to set the static UITestMethodAttribute.DispatcherQueue during the test initialization. + Property or method {0} on {1} does not return IEnumerable<object[]>. From ebcc490cb048553245aed5077167fa3d7a378ec0 Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Wed, 24 Feb 2021 12:44:39 +0100 Subject: [PATCH 2/7] Fixed warnings on nuspec files - Fixed obsolution warnings on nuspec files. - Fixed a small typo on a resource. --- scripts/Build.ps1 | 4 ++++ src/Package/Icon.png | Bin 0 -> 7006 bytes .../MSTest.Internal.TestFx.Documentation.nuspec | 4 ++++ src/Package/MSTest.TestAdapter.Dotnet.nuspec | 9 +++++++++ src/Package/MSTest.TestAdapter.Enu.nuspec | 9 +++++++++ src/Package/MSTest.TestAdapter.nuspec | 4 ++++ src/Package/MSTest.TestAdapter.symbols.nuspec | 4 ++++ src/Package/MSTest.TestFramework.enu.nuspec | 4 ++++ src/Package/MSTest.TestFramework.nuspec | 4 ++++ src/Package/MSTest.TestFramework.symbols.nuspec | 4 ++++ .../Resources/FrameworkMessages.Designer.cs | 2 +- .../MSTest.Core/Resources/FrameworkMessages.resx | 2 +- 12 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 src/Package/Icon.png diff --git a/scripts/Build.ps1 b/scripts/Build.ps1 index 0c499937d3..e039bcf10d 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -247,6 +247,8 @@ function Create-NugetPackages { $packageOutDir = Join-Path $stagingDir "MSTestPackages" $tfSrcPackageDir = Join-Path $env:TF_SRC_DIR "Package" + "" > "$stagingDir\_._" + # Copy over the nuspecs to the staging directory if ($TFB_Official) { $nuspecFiles = @("MSTest.TestAdapter.Dotnet.nuspec", "MSTest.TestAdapter.nuspec", "MSTest.TestAdapter.symbols.nuspec", "MSTest.TestFramework.nuspec", "MSTest.TestFramework.symbols.nuspec", "MSTest.Internal.TestFx.Documentation.nuspec") @@ -258,6 +260,8 @@ function Create-NugetPackages { foreach ($file in $nuspecFiles) { Copy-Item $tfSrcPackageDir\$file $stagingDir -Force } + + Copy-Item (Join-Path $tfSrcPackageDir "Icon.png") $stagingDir -Force # Copy over LICENSE file to staging directory $licenseFilePath = Join-Path $env:TF_ROOT_DIR "LICENSE" diff --git a/src/Package/Icon.png b/src/Package/Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a0f1fdbf4d5eae0e561018cccee74f6a454cdb9c GIT binary patch literal 7006 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 literal 0 HcmV?d00001 diff --git a/src/Package/MSTest.Internal.TestFx.Documentation.nuspec b/src/Package/MSTest.Internal.TestFx.Documentation.nuspec index 6b1f488cbe..59a08d4000 100644 --- a/src/Package/MSTest.Internal.TestFx.Documentation.nuspec +++ b/src/Package/MSTest.Internal.TestFx.Documentation.nuspec @@ -12,6 +12,7 @@ https://github.com/microsoft/testfx LICENSE http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework MSTestV2 @@ -26,5 +27,8 @@ + + + \ No newline at end of file diff --git a/src/Package/MSTest.TestAdapter.Dotnet.nuspec b/src/Package/MSTest.TestAdapter.Dotnet.nuspec index d33731c5df..fefb7559a2 100644 --- a/src/Package/MSTest.TestAdapter.Dotnet.nuspec +++ b/src/Package/MSTest.TestAdapter.Dotnet.nuspec @@ -11,7 +11,13 @@ https://github.com/microsoft/testfx LICENSE http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png © Microsoft Corporation. All rights reserved. + + + + + @@ -28,5 +34,8 @@ + + + \ No newline at end of file diff --git a/src/Package/MSTest.TestAdapter.Enu.nuspec b/src/Package/MSTest.TestAdapter.Enu.nuspec index 9295e19211..6f5835d3c7 100644 --- a/src/Package/MSTest.TestAdapter.Enu.nuspec +++ b/src/Package/MSTest.TestAdapter.Enu.nuspec @@ -18,6 +18,7 @@ https://github.com/microsoft/testfx LICENSE http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft @@ -59,5 +60,13 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Package/MSTest.TestAdapter.nuspec b/src/Package/MSTest.TestAdapter.nuspec index 17656fa26e..5415c307fc 100644 --- a/src/Package/MSTest.TestAdapter.nuspec +++ b/src/Package/MSTest.TestAdapter.nuspec @@ -18,6 +18,7 @@ https://github.com/microsoft/testfx LICENSE http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft @@ -102,5 +103,8 @@ + + + \ No newline at end of file diff --git a/src/Package/MSTest.TestAdapter.symbols.nuspec b/src/Package/MSTest.TestAdapter.symbols.nuspec index df91647c7f..e667277695 100644 --- a/src/Package/MSTest.TestAdapter.symbols.nuspec +++ b/src/Package/MSTest.TestAdapter.symbols.nuspec @@ -18,6 +18,7 @@ https://github.com/microsoft/testfx LICENSE http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft @@ -107,5 +108,8 @@ + + + \ No newline at end of file diff --git a/src/Package/MSTest.TestFramework.enu.nuspec b/src/Package/MSTest.TestFramework.enu.nuspec index 35372df4f7..a6b6473410 100644 --- a/src/Package/MSTest.TestFramework.enu.nuspec +++ b/src/Package/MSTest.TestFramework.enu.nuspec @@ -23,6 +23,7 @@ https://github.com/microsoft/testfx LICENSE http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework @@ -74,5 +75,8 @@ + + + \ No newline at end of file diff --git a/src/Package/MSTest.TestFramework.nuspec b/src/Package/MSTest.TestFramework.nuspec index febb3b23f4..215d37bd7d 100644 --- a/src/Package/MSTest.TestFramework.nuspec +++ b/src/Package/MSTest.TestFramework.nuspec @@ -23,6 +23,7 @@ https://github.com/microsoft/testfx LICENSE http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework @@ -186,5 +187,8 @@ + + + \ No newline at end of file diff --git a/src/Package/MSTest.TestFramework.symbols.nuspec b/src/Package/MSTest.TestFramework.symbols.nuspec index 68f3b544bc..5caca33cff 100644 --- a/src/Package/MSTest.TestFramework.symbols.nuspec +++ b/src/Package/MSTest.TestFramework.symbols.nuspec @@ -22,6 +22,7 @@ https://github.com/microsoft/testfx LICENSE http://go.microsoft.com/fwlink/?LinkID=288859 + Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework @@ -72,5 +73,8 @@ + + + \ No newline at end of file diff --git a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs index 06565c8eb4..943a1585d6 100644 --- a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs +++ b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs @@ -170,7 +170,7 @@ internal static string AsyncUITestMethodNotSupported { } /// - /// Looks up a localized string similar to UITestMethodAttribute.DispatcherQueue should not be nul. To use UITestMethodAttribute within a WinUI Desktop App, remember to set the static UITestMethodAttribute.DispatcherQueue during the test initialization.. + /// Looks up a localized string similar to UITestMethodAttribute.DispatcherQueue should not be null. To use UITestMethodAttribute within a WinUI Desktop App, remember to set the static UITestMethodAttribute.DispatcherQueue during the test initialization.. /// internal static string AsyncUITestMethodWithNoDispatcherQueue { get { diff --git a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx index 4b2a1ac943..0c8cb9ab97 100644 --- a/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx +++ b/src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx @@ -278,7 +278,7 @@ Stack Trace: {4} async TestMethod with UITestMethodAttribute are not supported. Either remove async or use TestMethodAttribute. - UITestMethodAttribute.DispatcherQueue should not be nul. To use UITestMethodAttribute within a WinUI Desktop App, remember to set the static UITestMethodAttribute.DispatcherQueue during the test initialization. + UITestMethodAttribute.DispatcherQueue should not be null. To use UITestMethodAttribute within a WinUI Desktop App, remember to set the static UITestMethodAttribute.DispatcherQueue during the test initialization. Property or method {0} on {1} does not return IEnumerable<object[]>. From 653d85d9ae6cc81703e7d2c662c1c23fe0ff140b Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Wed, 24 Feb 2021 16:39:51 -0800 Subject: [PATCH 3/7] Added DeploymentItemAttribute to WinUI Extensions.WinUI. --- src/TestFramework/Extension.UWP/DeploymentItemAttribute.cs | 2 +- src/TestFramework/Extension.WinUI/Extension.WinUI.csproj | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/TestFramework/Extension.UWP/DeploymentItemAttribute.cs b/src/TestFramework/Extension.UWP/DeploymentItemAttribute.cs index 13dbd70a9d..4fa5834e45 100644 --- a/src/TestFramework/Extension.UWP/DeploymentItemAttribute.cs +++ b/src/TestFramework/Extension.UWP/DeploymentItemAttribute.cs @@ -3,7 +3,7 @@ namespace Microsoft.VisualStudio.TestTools.UnitTesting { - using System; + using global::System; /// /// Used to specify deployment item (file or directory) for per-test deployment. diff --git a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj index 0f44e674d3..6887798c06 100644 --- a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj +++ b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj @@ -24,6 +24,9 @@ + + + From 8f1cce9ac81ab2b77a15227cb5e58abaf9b8d84a Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Thu, 11 Mar 2021 16:09:59 -0800 Subject: [PATCH 4/7] Updated to Microsoft.ProjectReunion 0.5.0-prerelease. --- Nuget.config | 1 + src/TestFramework/Extension.WinUI/Extension.WinUI.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Nuget.config b/Nuget.config index bdab0c8ccf..61e3438f39 100644 --- a/Nuget.config +++ b/Nuget.config @@ -10,6 +10,7 @@ + diff --git a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj index 6887798c06..fa943aea78 100644 --- a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj +++ b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj @@ -29,7 +29,7 @@ - + From b0ad2c758a20406280ef02bcda9630cddea7054f Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Mon, 15 Mar 2021 12:07:07 -0700 Subject: [PATCH 5/7] Apply suggestions from code review Co-authored-by: Medeni Baykal <433724+Haplois@users.noreply.github.com> --- Nuget.config | 1 - src/Package/MSTest.TestFramework.enu.nuspec | 4 ++-- src/Package/MSTest.TestFramework.nuspec | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Nuget.config b/Nuget.config index 61e3438f39..bdab0c8ccf 100644 --- a/Nuget.config +++ b/Nuget.config @@ -10,7 +10,6 @@ - diff --git a/src/Package/MSTest.TestFramework.enu.nuspec b/src/Package/MSTest.TestFramework.enu.nuspec index 685761bacb..72e6b04ead 100644 --- a/src/Package/MSTest.TestFramework.enu.nuspec +++ b/src/Package/MSTest.TestFramework.enu.nuspec @@ -43,7 +43,7 @@ - + @@ -79,4 +79,4 @@ - \ No newline at end of file + diff --git a/src/Package/MSTest.TestFramework.nuspec b/src/Package/MSTest.TestFramework.nuspec index ce109eb112..8273384786 100644 --- a/src/Package/MSTest.TestFramework.nuspec +++ b/src/Package/MSTest.TestFramework.nuspec @@ -43,7 +43,7 @@ - + @@ -191,4 +191,4 @@ - \ No newline at end of file + From 8851fbbeffa53b71ddb3509e590e9f313446f4f6 Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Wed, 17 Mar 2021 17:16:46 +0100 Subject: [PATCH 6/7] Fixed localization package script --- scripts/Build.ps1 | 5 +- scripts/build/TestFx.Loc.targets | 9 ++- src/Package/MSTest.TestAdapter.Enu.nuspec | 17 +++-- src/Package/MSTest.TestAdapter.nuspec | 2 + src/Package/MSTest.TestAdapter.symbols.nuspec | 39 +++++++++--- src/Package/MSTest.TestFramework.enu.nuspec | 14 ++--- src/Package/MSTest.TestFramework.nuspec | 63 ++++++------------- .../MSTest.TestFramework.symbols.nuspec | 35 +++++++---- 8 files changed, 97 insertions(+), 87 deletions(-) diff --git a/scripts/Build.ps1 b/scripts/Build.ps1 index 34e4d0b560..2f6aa55ed4 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -290,9 +290,8 @@ function Create-NugetPackages { $version = $version + "-" + $versionSuffix } - Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version=$version -Properties Version=$version" - & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion - + Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version``;Srcroot=$env:TF_SRC_DIR``;Packagesroot=$env:TF_PACKAGES_DIR``;TestPlatformVersion=$TestPlatformVersion``;NOWARN=`"NU5127,NU5128,NU5129`"" + & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion`;NOWARN="NU5127,NU5128,NU5129" if ($lastExitCode -ne 0) { throw "Nuget pack failed with an exit code of '$lastExitCode'." } diff --git a/scripts/build/TestFx.Loc.targets b/scripts/build/TestFx.Loc.targets index f151887fd7..16b75c229d 100644 --- a/scripts/build/TestFx.Loc.targets +++ b/scripts/build/TestFx.Loc.targets @@ -70,7 +70,14 @@ - + + <_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath) + + + <_LocalizedFiles Include="$(_SourcePath)\**\*.*" /> + + + diff --git a/src/Package/MSTest.TestAdapter.Enu.nuspec b/src/Package/MSTest.TestAdapter.Enu.nuspec index 1d73a2bddd..b11801ed8a 100644 --- a/src/Package/MSTest.TestAdapter.Enu.nuspec +++ b/src/Package/MSTest.TestAdapter.Enu.nuspec @@ -8,12 +8,12 @@ Microsoft Microsoft - The adapter to discover and execute MSTest Framework based tests. + The adapter to discover and execute MSTest Framework based tests. - Supported platforms: - - .NET 4.5.0+ - - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) - - ASP.NET Core 1.0+ (Visual Studio 2017) + Supported platforms: + - .NET 4.5.0+ + - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) + - ASP.NET Core 1.0+ (Visual Studio 2017) https://github.com/microsoft/testfx LICENSE @@ -36,6 +36,8 @@ + + @@ -72,10 +74,5 @@ - - - - - \ No newline at end of file diff --git a/src/Package/MSTest.TestAdapter.nuspec b/src/Package/MSTest.TestAdapter.nuspec index 82653d4e60..6f00113747 100644 --- a/src/Package/MSTest.TestAdapter.nuspec +++ b/src/Package/MSTest.TestAdapter.nuspec @@ -36,6 +36,8 @@ + + diff --git a/src/Package/MSTest.TestAdapter.symbols.nuspec b/src/Package/MSTest.TestAdapter.symbols.nuspec index 66468a31dc..697c607c1b 100644 --- a/src/Package/MSTest.TestAdapter.symbols.nuspec +++ b/src/Package/MSTest.TestAdapter.symbols.nuspec @@ -8,12 +8,12 @@ Microsoft Microsoft - The adapter to discover and execute MSTest Framework based tests. + The adapter to discover and execute MSTest Framework based tests. - Supported platforms: - - .NET 4.5.0+ - - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) - - ASP.NET Core 1.0+ (Visual Studio 2017) + Supported platforms: + - .NET 4.5.0+ + - .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017) + - ASP.NET Core 1.0+ (Visual Studio 2017) https://github.com/microsoft/testfx LICENSE @@ -26,6 +26,17 @@ + + + + + + + + + + + @@ -36,19 +47,24 @@ - + + + + + + - - + + - - + + @@ -63,6 +79,9 @@ + + + diff --git a/src/Package/MSTest.TestFramework.enu.nuspec b/src/Package/MSTest.TestFramework.enu.nuspec index 59aceb62b3..ea3bc49682 100644 --- a/src/Package/MSTest.TestFramework.enu.nuspec +++ b/src/Package/MSTest.TestFramework.enu.nuspec @@ -9,16 +9,16 @@ Microsoft This is MSTest V2, the evolution of Microsoft's Test Framework. - This is MSTest V2, the evolution of Microsoft's Test Framework. + This is MSTest V2, the evolution of Microsoft's Test Framework. - Supported platforms: - - .NET 4.5.0+ - - .NET Core 1.0+ (Universal Windows Apps 10+, DNX Core 5+) - - ASP.NET Core 1.0+ + Supported platforms: + - .NET 4.5.0+ + - .NET Core 1.0+ (Universal Windows Apps 10+) + - ASP.NET Core 1.0+ - To discover and execute tests install MSTest.TestAdapter. + To discover and execute tests install MSTest.TestAdapter. - To discover and execute tests for project.json based projects install dotnet-test-mstest. + To discover and execute tests for project.json based projects install dotnet-test-mstest. https://github.com/microsoft/testfx LICENSE diff --git a/src/Package/MSTest.TestFramework.nuspec b/src/Package/MSTest.TestFramework.nuspec index 4b346dbc5a..d7698b58f9 100644 --- a/src/Package/MSTest.TestFramework.nuspec +++ b/src/Package/MSTest.TestFramework.nuspec @@ -42,63 +42,36 @@ - - - - + + + + - - - - + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/src/Package/MSTest.TestFramework.symbols.nuspec b/src/Package/MSTest.TestFramework.symbols.nuspec index 5712daf681..86d6927aac 100644 --- a/src/Package/MSTest.TestFramework.symbols.nuspec +++ b/src/Package/MSTest.TestFramework.symbols.nuspec @@ -8,16 +8,16 @@ Microsoft Microsoft - This is MSTest V2, the evolution of Microsoft's Test Framework. + This is MSTest V2, the evolution of Microsoft's Test Framework. - Supported platforms: - - .NET 4.5.0+ - - .NET Core 1.0+ (Universal Windows Apps 10+, DNX Core 5+) - - ASP.NET Core 1.0+ + Supported platforms: + - .NET 4.5.0+ + - .NET Core 1.0+ (Universal Windows Apps 10+) + - ASP.NET Core 1.0+ - To discover and execute tests install MSTest.TestAdapter. + To discover and execute tests install MSTest.TestAdapter. - To discover and execute tests for project.json based projects install dotnet-test-mstest. + To discover and execute tests for project.json based projects install dotnet-test-mstest. https://github.com/microsoft/testfx LICENSE @@ -25,6 +25,19 @@ Icon.png © Microsoft Corporation. All rights reserved. MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework + + + + + + + + + + + + + @@ -36,7 +49,7 @@ - + @@ -47,12 +60,12 @@ - + - + @@ -62,7 +75,7 @@ - + From 213bc65439f1af6edd0eb77337c0b246c79003fe Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi Date: Mon, 29 Mar 2021 09:37:04 -0700 Subject: [PATCH 7/7] Updated to Project Reunion 0.5.0. --- src/TestFramework/Extension.WinUI/Extension.WinUI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj index fa943aea78..58aa6b4c42 100644 --- a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj +++ b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj @@ -29,7 +29,7 @@ - +