Skip to content

Commit c1cd55d

Browse files
azchohfiHaplois
andauthored
Added basic WinUI3 support. (#782)
* Added basic WinUI3 support. * Added DeploymentItemAttribute to WinUI Extensions.WinUI. Co-authored-by: Medeni Baykal <[email protected]>
1 parent 5154abd commit c1cd55d

19 files changed

+335
-62
lines changed

TestFx.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimeoutTestProjectNetCore",
184184
EndProject
185185
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpTestProject", "test\E2ETests\TestAssets\FSharpTestProject\FSharpTestProject.fsproj", "{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}"
186186
EndProject
187+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extension.WinUI", "src\TestFramework\Extension.WinUI\Extension.WinUI.csproj", "{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}"
188+
EndProject
187189
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetCore", "NetCore", "{D11C6664-1C4E-48F0-AA92-7F5BADC6F82C}"
188190
ProjectSection(SolutionItems) = preProject
189191
src\Adapter\Build\NetCore\MSTest.TestAdapter.props = src\Adapter\Build\NetCore\MSTest.TestAdapter.props
@@ -193,6 +195,7 @@ Global
193195
GlobalSection(SharedMSBuildProjectFiles) = preSolution
194196
src\Adapter\PlatformServices.Shared\PlatformServices.Shared.projitems*{2177c273-ae07-43b3-b87a-443e47a23c5a}*SharedItemsImports = 13
195197
src\TestFramework\Extension.Shared\Extension.Shared.projitems*{272ca5e1-8e81-4825-9e47-86cce02f700d}*SharedItemsImports = 13
198+
src\TestFramework\Extension.Shared\Extension.Shared.projitems*{23b9d9a2-4aee-47e6-97b5-060df21539fb}*SharedItemsImports = 5
196199
src\TestFramework\Extension.Shared\Extension.Shared.projitems*{df131865-84ee-4540-8112-e88acebdea09}*SharedItemsImports = 4
197200
EndGlobalSection
198201
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1170,6 +1173,30 @@ Global
11701173
{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}.Release|x64.Build.0 = Release|Any CPU
11711174
{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}.Release|x86.ActiveCfg = Release|Any CPU
11721175
{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D}.Release|x86.Build.0 = Release|Any CPU
1176+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|Any CPU.ActiveCfg = Debug|Any CPU
1177+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|Any CPU.Build.0 = Debug|Any CPU
1178+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|ARM.ActiveCfg = Debug|Any CPU
1179+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|ARM.Build.0 = Debug|Any CPU
1180+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x64.ActiveCfg = Debug|Any CPU
1181+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x64.Build.0 = Debug|Any CPU
1182+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x86.ActiveCfg = Debug|Any CPU
1183+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Code Analysis Debug|x86.Build.0 = Debug|Any CPU
1184+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1185+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
1186+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|ARM.ActiveCfg = Debug|Any CPU
1187+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|ARM.Build.0 = Debug|Any CPU
1188+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x64.ActiveCfg = Debug|Any CPU
1189+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x64.Build.0 = Debug|Any CPU
1190+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x86.ActiveCfg = Debug|Any CPU
1191+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Debug|x86.Build.0 = Debug|Any CPU
1192+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
1193+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|Any CPU.Build.0 = Release|Any CPU
1194+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|ARM.ActiveCfg = Release|Any CPU
1195+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|ARM.Build.0 = Release|Any CPU
1196+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x64.ActiveCfg = Release|Any CPU
1197+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x64.Build.0 = Release|Any CPU
1198+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x86.ActiveCfg = Release|Any CPU
1199+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB}.Release|x86.Build.0 = Release|Any CPU
11731200
EndGlobalSection
11741201
GlobalSection(SolutionProperties) = preSolution
11751202
HideSolutionNode = FALSE
@@ -1234,6 +1261,7 @@ Global
12341261
{26F0B8EF-92D4-4A23-ACB4-D1B662F0EEBE} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
12351262
{ED27A844-6870-4FE6-8FEF-3ABDD1ED6564} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
12361263
{E5E58613-82FC-44CD-B75F-4F1C7ED52D0D} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
1264+
{23B9D9A2-4AEE-47E6-97B5-060DF21539FB} = {E48AC786-E150-4F41-9A16-32F02E4493D8}
12371265
{D11C6664-1C4E-48F0-AA92-7F5BADC6F82C} = {CA01DAF5-8D9D-496E-9AD3-94BB7FBB2D34}
12381266
EndGlobalSection
12391267
GlobalSection(ExtensibilityGlobals) = postSolution

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
jobs:
55
- job: Windows
66
pool:
7-
vmImage: 'vs2017-win2016'
7+
vmImage: 'windows-2019'
88
variables:
99
buildConfiguration: 'Release'
1010

1111
steps:
1212

1313
- task: NuGetToolInstaller@0
14-
displayName: 'Pull in NuGet 4.9.2'
14+
displayName: 'Pull in NuGet 5.8.1'
1515
inputs:
16-
versionSpec: 4.9.2
16+
versionSpec: 5.8.1
1717

1818
- powershell: |
1919
reg DELETE "HKLM\Software\Microsoft\StrongName\Verification" /f

scripts/Build.ps1

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ function Create-NugetPackages {
253253
$packageOutDir = Join-Path $stagingDir "MSTestPackages"
254254
$tfSrcPackageDir = Join-Path $env:TF_SRC_DIR "Package"
255255

256+
"" > "$stagingDir\_._"
257+
256258
# Copy over the nuspecs to the staging directory
257259
if ($TFB_Official) {
258260
$nuspecFiles = @("MSTest.TestAdapter.nuspec", "MSTest.TestAdapter.symbols.nuspec", "MSTest.TestFramework.nuspec", "MSTest.TestFramework.symbols.nuspec", "MSTest.Internal.TestFx.Documentation.nuspec")
@@ -264,6 +266,8 @@ function Create-NugetPackages {
264266
foreach ($file in $nuspecFiles) {
265267
Copy-Item $tfSrcPackageDir\$file $stagingDir -Force
266268
}
269+
270+
Copy-Item (Join-Path $tfSrcPackageDir "Icon.png") $stagingDir -Force
267271

268272
Copy-Item -Path "$($env:TF_PACKAGES_DIR)\microsoft.testplatform.adapterutilities\$TestPlatformVersion\lib" -Destination "$($stagingDir)\Microsoft.TestPlatform.AdapterUtilities" -Recurse -Force
269273

@@ -286,9 +290,8 @@ function Create-NugetPackages {
286290
$version = $version + "-" + $versionSuffix
287291
}
288292

289-
Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version=$version -Properties Version=$version"
290-
& $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutDir -Version $version -Properties Version=$version`;Srcroot=$env:TF_SRC_DIR`;Packagesroot=$env:TF_PACKAGES_DIR`;TestPlatformVersion=$TestPlatformVersion
291-
293+
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`""
294+
& $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"
292295
if ($lastExitCode -ne 0) {
293296
throw "Nuget pack failed with an exit code of '$lastExitCode'."
294297
}

scripts/build/TestFx.Loc.targets

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,14 @@
7070

7171
<!-- Localization for documentation files. -->
7272
<Target Name="CopyLocalizedXmls" BeforeTargets="BeforeBuild" Condition="$(LocDocumentationSubPath) != ''">
73-
<Exec Command="xcopy /Y /I /S /E $(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath) $(OutDir)" />
73+
<PropertyGroup>
74+
<_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath)</_SourcePath>
75+
</PropertyGroup>
76+
<ItemGroup>
77+
<_LocalizedFiles Include="$(_SourcePath)\**\*.*" />
78+
</ItemGroup>
79+
<Warning Text="Localized documentation doesn't exist: $(LocDocumentationSubPath), $(_SourcePath)" Condition="!Exists('$(_SourcePath)')" />
80+
<Copy SourceFiles="@(_LocalizedFiles)" DestinationFiles="@(_LocalizedFiles->'$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)')" Condition="Exists('$(_SourcePath)')" />
7481
</Target>
7582

7683
<Target Name ="CopyStaticResourcesToOutput">

scripts/common.lib.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Global Variables
88
#
99
$global:msbuildVersion = "15.0"
10-
$global:nugetVersion = "4.9.4"
10+
$global:nugetVersion = "5.8.1"
1111
$global:vswhereVersion = "2.0.2"
1212
$global:nugetUrl = "https://dist.nuget.org/win-x86-commandline/v$nugetVersion/NuGet.exe"
1313

src/Package/Icon.png

6.84 KB
Loading

src/Package/MSTest.Internal.TestFx.Documentation.nuspec

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
1313
<license type="file">LICENSE</license>
1414
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
15+
<icon>Icon.png</icon>
1516
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1617
<tags>MSTest TestFramework MSTestV2</tags>
1718
</metadata>
@@ -21,9 +22,13 @@
2122
<file src="Extension.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\Core" />
2223
<file src="Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\Desktop" />
2324
<file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\UWP" />
25+
<file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="contentFiles\any\any\Extensions\WinUI" />
2426

2527
<!-- LICENSE -->
2628
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
2729
<file src="LICENS*" target="" />
30+
31+
<!-- Icon -->
32+
<file src="Icon.png" target="" />
2833
</files>
2934
</package>

src/Package/MSTest.TestAdapter.Enu.nuspec

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@
88
<authors>Microsoft</authors>
99
<owners>Microsoft</owners>
1010
<description>
11-
The adapter to discover and execute MSTest Framework based tests.
11+
The adapter to discover and execute MSTest Framework based tests.
1212

13-
Supported platforms:
14-
- .NET 4.5.0+
15-
- .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
16-
- ASP.NET Core 1.0+ (Visual Studio 2017)
13+
Supported platforms:
14+
- .NET 4.5.0+
15+
- .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
16+
- ASP.NET Core 1.0+ (Visual Studio 2017)
1717
</description>
1818
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
1919
<license type="file">LICENSE</license>
2020
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
21+
<icon>Icon.png</icon>
2122
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
2223
<tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
2324

@@ -35,6 +36,8 @@
3536
<group targetFramework="net45" />
3637

3738
<group targetFramework="uap10.0" />
39+
40+
<group targetFramework="net5.0-windows10.0.18362" />
3841
</dependencies>
3942
</metadata>
4043
<files>
@@ -68,5 +71,8 @@
6871
<!-- LICENSE -->
6972
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
7073
<file src="LICENS*" target="" />
74+
75+
<!-- Icon -->
76+
<file src="Icon.png" target="" />
7177
</files>
7278
</package>

src/Package/MSTest.TestAdapter.nuspec

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
1919
<license type="file">LICENSE</license>
2020
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
21+
<icon>Icon.png</icon>
2122
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
2223
<tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
2324

@@ -35,6 +36,8 @@
3536
<group targetFramework="net45" />
3637

3738
<group targetFramework="uap10.0" />
39+
40+
<group targetFramework="net5.0-windows10.0.18362" />
3841
</dependencies>
3942
</metadata>
4043
<files>
@@ -73,5 +76,8 @@
7376
<!-- LICENSE -->
7477
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
7578
<file src="LICENS*" target="" />
79+
80+
<!-- Icon -->
81+
<file src="Icon.png" target="" />
7682
</files>
7783
</package>

src/Package/MSTest.TestAdapter.symbols.nuspec

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,35 @@
88
<authors>Microsoft</authors>
99
<owners>Microsoft</owners>
1010
<description>
11-
The adapter to discover and execute MSTest Framework based tests.
11+
The adapter to discover and execute MSTest Framework based tests.
1212

13-
Supported platforms:
14-
- .NET 4.5.0+
15-
- .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
16-
- ASP.NET Core 1.0+ (Visual Studio 2017)
13+
Supported platforms:
14+
- .NET 4.5.0+
15+
- .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
16+
- ASP.NET Core 1.0+ (Visual Studio 2017)
1717
</description>
1818
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
1919
<license type="file">LICENSE</license>
2020
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
21+
<icon>Icon.png</icon>
2122
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
2223
<tags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</tags>
2324
<dependencies>
2425
<group targetFramework="netcoreapp1.0">
2526
<dependency id="NETStandard.Library" version="1.6.1" />
2627
<dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
2728
</group>
29+
30+
<group targetFramework="netstandard1.5">
31+
<dependency id="NETStandard.Library" version="1.6.1" />
32+
<dependency id="System.Diagnostics.TextWriterTraceListener" version="4.3.0" />
33+
</group>
34+
35+
<group targetFramework="net45" />
36+
37+
<group targetFramework="uap10.0" />
38+
39+
<group targetFramework="net5.0-windows10.0.18362" />
2840
</dependencies>
2941
</metadata>
3042
<files>
@@ -35,19 +47,24 @@
3547
<file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\_common\" />
3648

3749
<!-- netcoreapp1.0 -->
38-
<file src="Build\NetCore\MSTest.TestAdapter.props" target="build\netcoreapp1.0\" />
50+
<file src="Build\NetCore\MSTest.TestAdapter.props" target="build\netcoreapp1.0\MSTest.TestAdapter.symbols.props" />
3951
<file src="PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netcoreapp1.0\" />
52+
<file src="Microsoft.TestPlatform.AdapterUtilities\netstandard1.0\" target="build\netcoreapp1.0\" />
53+
54+
<!-- netstandard1.5 -->
55+
<file src="Build\NetCore\MSTest.TestAdapter.props" target="build\netstandard1.5\MSTest.TestAdapter.symbols.props" />
56+
<file src="PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netstandard1.5\" />
4057
<file src="Microsoft.TestPlatform.AdapterUtilities\netstandard1.0\" target="build\netstandard1.5\" />
4158

4259
<!-- uap10.0 -->
43-
<file src="Build\Universal\MSTest.TestAdapter.props" target="build\uap10.0\MSTest.TestAdapter.props" />
44-
<file src="Build\Universal\MSTest.TestAdapter.targets" target="build\uap10.0\MSTest.TestAdapter.targets" />
60+
<file src="Build\Universal\MSTest.TestAdapter.props" target="build\uap10.0\MSTest.TestAdapter.symbols.props" />
61+
<file src="Build\Universal\MSTest.TestAdapter.targets" target="build\uap10.0\MSTest.TestAdapter.symbols.targets" />
4562
<file src="PlatformServices.Universal\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\uap10.0\" />
4663
<file src="Microsoft.TestPlatform.AdapterUtilities\uap10.0\" target="build\uap10.0\" />
4764

4865
<!-- net45 -->
49-
<file src="Build\Desktop\MSTest.TestAdapter.props" target="build\net45\MSTest.TestAdapter.props" />
50-
<file src="Build\Desktop\MSTest.TestAdapter.targets" target="build\net45\MSTest.TestAdapter.targets" />
66+
<file src="Build\Desktop\MSTest.TestAdapter.props" target="build\net45\MSTest.TestAdapter.symbols.props" />
67+
<file src="Build\Desktop\MSTest.TestAdapter.targets" target="build\net45\MSTest.TestAdapter.symbols.targets" />
5168
<file src="Microsoft.TestPlatform.AdapterUtilities\netstandard2.0\" target="build\net45\" />
5269

5370
<!-- Symbols -->
@@ -62,6 +79,9 @@
6279
<!-- uap10.0 -->
6380
<file src="PlatformServices.Universal\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" target="build\uap10.0\" />
6481

82+
<!-- netstandard1.5 -->
83+
<file src="PlatformServices.Universal\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" target="build\netstandard1.5\" />
84+
6585
<!-- Source code -->
6686
<file src="$srcroot$\**\*.cs" target="src" />
6787

@@ -73,5 +93,8 @@
7393
<!-- LICENSE -->
7494
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
7595
<file src="LICENS*" target="" />
96+
97+
<!-- Icon -->
98+
<file src="Icon.png" target="" />
7699
</files>
77100
</package>

src/Package/MSTest.TestFramework.enu.nuspec

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,21 @@
99
<owners>Microsoft</owners>
1010
<summary>This is MSTest V2, the evolution of Microsoft's Test Framework.</summary>
1111
<description>
12-
This is MSTest V2, the evolution of Microsoft's Test Framework.
12+
This is MSTest V2, the evolution of Microsoft's Test Framework.
1313

14-
Supported platforms:
15-
- .NET 4.5.0+
16-
- .NET Core 1.0+ (Universal Windows Apps 10+, DNX Core 5+)
17-
- ASP.NET Core 1.0+
14+
Supported platforms:
15+
- .NET 4.5.0+
16+
- .NET Core 1.0+ (Universal Windows Apps 10+)
17+
- ASP.NET Core 1.0+
1818

19-
To discover and execute tests install MSTest.TestAdapter.
19+
To discover and execute tests install MSTest.TestAdapter.
2020

21-
To discover and execute tests for project.json based projects install dotnet-test-mstest.
21+
To discover and execute tests for project.json based projects install dotnet-test-mstest.
2222
</description>
2323
<projectUrl>https://github.com/microsoft/testfx</projectUrl>
2424
<license type="file">LICENSE</license>
2525
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
26+
<icon>Icon.png</icon>
2627
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
2728
<tags>MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework </tags>
2829

@@ -35,6 +36,8 @@
3536
<group targetFramework="net45" />
3637

3738
<group targetFramework="uap10.0" />
39+
40+
<group targetFramework="net5.0-windows10.0.18362.0" />
3841
</dependencies>
3942
</metadata>
4043
<files>
@@ -56,8 +59,17 @@
5659
<file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\uap10.0" />
5760
<file src="Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\uap10.0" />
5861

62+
<!-- WinUI -->
63+
<file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net5.0-windows10.0.18362.0" />
64+
<file src="MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net5.0-windows10.0.18362.0" />
65+
<file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\net5.0-windows10.0.18362.0" />
66+
<file src="Extension.WinUI\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\net5.0-windows10.0.18362.0" />
67+
5968
<!-- LICENSE -->
6069
<!-- Workaround for https://github.com/NuGet/Home/issues/7601 -->
6170
<file src="LICENS*" target="" />
71+
72+
<!-- Icon -->
73+
<file src="Icon.png" target="" />
6274
</files>
63-
</package>
75+
</package>

0 commit comments

Comments
 (0)