Skip to content

Commit 0801d62

Browse files
HaploisHaplois
committed
PR fixes #3 
1 parent 3f596aa commit 0801d62

6 files changed

Lines changed: 24 additions & 19 deletions

File tree

‎TestFx.sln‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ EndProject
8383
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{E374A3A6-C364-4890-B315-D60F5C682B6E}"
8484
ProjectSection(SolutionItems) = preProject
8585
src\Package\MSTest.Internal.TestFx.Documentation.nuspec = src\Package\MSTest.Internal.TestFx.Documentation.nuspec
86-
src\Package\MSTest.TestAdapter.Enu.nuspec = src\Package\MSTest.TestAdapter.Enu.nuspec
8786
src\Package\MSTest.TestAdapter.nuspec = src\Package\MSTest.TestAdapter.nuspec
8887
src\Package\MSTest.TestAdapter.symbols.nuspec = src\Package\MSTest.TestAdapter.symbols.nuspec
89-
src\Package\MSTest.TestFramework.enu.nuspec = src\Package\MSTest.TestFramework.enu.nuspec
9088
src\Package\MSTest.TestFramework.nuspec = src\Package\MSTest.TestFramework.nuspec
9189
src\Package\MSTest.TestFramework.symbols.nuspec = src\Package\MSTest.TestFramework.symbols.nuspec
9290
EndProjectSection
@@ -214,7 +212,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net5", "Net5", "{35D010CC-C
214212
ProjectSection(SolutionItems) = preProject
215213
src\Adapter\Build\Net5\MSTest.TestAdapter.props = src\Adapter\Build\Net5\MSTest.TestAdapter.props
216214
src\Adapter\Build\Net5\MSTest.TestAdapter.targets = src\Adapter\Build\Net5\MSTest.TestAdapter.targets
217-
src\Adapter\Build\Net5\MSTest.TestFramework.props = src\Adapter\Build\Net5\MSTest.TestFramework.props
215+
src\Adapter\Build\Net5\MSTest.TestFramework.targets = src\Adapter\Build\Net5\MSTest.TestFramework.targets
218216
EndProjectSection
219217
EndProject
220218
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReferencedProjectFromDataSourceTest", "test\E2ETests\TestAssets\ReferencedProjectFromDataSourceTest\ReferencedProjectFromDataSourceTest.csproj", "{6B4DE65C-4162-4C52-836A-8F9FA901814A}"
@@ -232,6 +230,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Desktop.Legacy", "Desktop.L
232230
EndProjectSection
233231
EndProject
234232
Global
233+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
234+
src\Adapter\PlatformServices.Shared\PlatformServices.Shared.projitems*{2177c273-ae07-43b3-b87a-443e47a23c5a}*SharedItemsImports = 13
235+
src\TestFramework\Extension.Shared\Extension.Shared.projitems*{23b9d9a2-4aee-47e6-97b5-060df21539fb}*SharedItemsImports = 5
236+
src\TestFramework\Extension.Shared\Extension.Shared.projitems*{272ca5e1-8e81-4825-9e47-86cce02f700d}*SharedItemsImports = 13
237+
src\TestFramework\Extension.Shared\Extension.Shared.projitems*{df131865-84ee-4540-8112-e88acebdea09}*SharedItemsImports = 4
238+
EndGlobalSection
235239
GlobalSection(SolutionConfigurationPlatforms) = preSolution
236240
Code Analysis Debug|Any CPU = Code Analysis Debug|Any CPU
237241
Code Analysis Debug|ARM = Code Analysis Debug|ARM
@@ -1453,10 +1457,4 @@ Global
14531457
GlobalSection(ExtensibilityGlobals) = postSolution
14541458
SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9}
14551459
EndGlobalSection
1456-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
1457-
src\Adapter\PlatformServices.Shared\PlatformServices.Shared.projitems*{2177c273-ae07-43b3-b87a-443e47a23c5a}*SharedItemsImports = 13
1458-
src\TestFramework\Extension.Shared\Extension.Shared.projitems*{23b9d9a2-4aee-47e6-97b5-060df21539fb}*SharedItemsImports = 5
1459-
src\TestFramework\Extension.Shared\Extension.Shared.projitems*{272ca5e1-8e81-4825-9e47-86cce02f700d}*SharedItemsImports = 13
1460-
src\TestFramework\Extension.Shared\Extension.Shared.projitems*{df131865-84ee-4540-8112-e88acebdea09}*SharedItemsImports = 4
1461-
EndGlobalSection
14621460
EndGlobal

‎src/Adapter/Build/Net5/MSTest.TestAdapter.props‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
2+
<Project>
3+
<!--
4+
Directives here are moved to MSTest.TestAdapter.targets file to make sure they are
5+
included after WinUI properties are specified.
6+
-->
47
</Project>

‎src/Package/MSTest.TestAdapter.nuspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
Supported platforms:
1414
- .NET 4.5.0+
1515
- .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
16-
- .NET 5.0 Windows.17763+ (WinUI Desktop Apps) (Visual Studio 2019)
16+
- .NET 5.0 (Visual Studio 2019)
17+
- .NET 5.0 Windows.18362+ (WinUI Desktop Apps) (Visual Studio 2019)
1718
- ASP.NET Core 1.0+ (Visual Studio 2017)
1819
</description>
1920
<projectUrl>https://github.com/microsoft/testfx</projectUrl>

‎src/Package/MSTest.TestAdapter.symbols.nuspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
Supported platforms:
1414
- .NET 4.5.0+
1515
- .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
16-
- .NET 5.0 Windows.17763+ (WinUI Desktop Apps) (Visual Studio 2019)
16+
- .NET 5.0 (Visual Studio 2019)
17+
- .NET 5.0 Windows.18362+ (WinUI Desktop Apps) (Visual Studio 2019)
1718
- ASP.NET Core 1.0+ (Visual Studio 2017)
1819
</description>
1920
<projectUrl>https://github.com/microsoft/testfx</projectUrl>

‎src/Package/MSTest.TestFramework.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313

1414
Supported platforms:
1515
- .NET 4.5.0+
16-
- .NET Core 1.0+ (Universal Windows Apps 10+, DNX Core 5+)
17-
- .NET 5.0 Windows.17763+ (WinUI Desktop Apps) (Visual Studio 2019)
18-
- ASP.NET Core 1.0+
16+
- .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
17+
- .NET 5.0 (Visual Studio 2019)
18+
- .NET 5.0 Windows.18362+ (WinUI Desktop Apps) (Visual Studio 2019)
19+
- ASP.NET Core 1.0+ (Visual Studio 2017)
1920

2021
To discover and execute tests install MSTest.TestAdapter.
2122
</description>

‎src/Package/MSTest.TestFramework.symbols.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212

1313
Supported platforms:
1414
- .NET 4.5.0+
15-
- .NET Core 1.0+ (Universal Windows Apps 10+)
16-
- .NET 5.0 Windows.17763+ (WinUI Desktop Apps) (Visual Studio 2019)
17-
- ASP.NET Core 1.0+
15+
- .NET Core 1.0+ (Universal Windows Apps 10+) (Visual Studio 2017)
16+
- .NET 5.0 (Visual Studio 2019)
17+
- .NET 5.0 Windows.18362+ (WinUI Desktop Apps) (Visual Studio 2019)
18+
- ASP.NET Core 1.0+ (Visual Studio 2017)
1819

1920
To discover and execute tests install MSTest.TestAdapter.
2021
</description>

0 commit comments

Comments
 (0)