Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add UWP .NET 9 support for MSTest extensions #3848

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+488 −51
Open

Add UWP .NET 9 support for MSTest extensions #3848

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
38c299b
Add UWP .NET 9 support for MSTest extensions
Sergio0694 Sep 16, 2024
6a38f82
Copy public API list to new TFM folder
Sergio0694 Sep 16, 2024
6366254
Fix API surface for new UWP target
Sergio0694 Sep 16, 2024
e6678a1
Remove 'net8.0-windows10.0.26100.0' TFM
Sergio0694 Sep 16, 2024
7f8f4e4
Define 'UwpNet9Minimum' internally
Sergio0694 Oct 19, 2024
29abbe2
Update UWP settings for .NET 9 GA
Sergio0694 Nov 25, 2024
eeccd73
WIP handling modern uwp
Evangelink Nov 29, 2024
be2a1a0
Add sample test app
Evangelink Nov 29, 2024
08743d4
UseUwpTools
Evangelink Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<PropertyGroup>
<NetFrameworkMinimum>net462</NetFrameworkMinimum>
<UwpMinimum>uap10.0.16299</UwpMinimum>
<UwpNet9Minimum>net9.0-windows10.0.17763.0</UwpNet9Minimum>
<WinUiMinimum>net6.0-windows10.0.18362.0</WinUiMinimum>
<NetCurrent>net8.0</NetCurrent>

Expand Down
4 changes: 4 additions & 0 deletions src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net8.0\" />
<file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net8.0\" />

<!-- net9.0 -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<!-- net9.0 -->
<!-- net9.0-windows10.0.17763.0 -->

<file src="net9.0-windows10.0.17763.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net9.0\uwp\" />
<file src="net9.0-windows10.0.17763.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net9.0\uwp\" />

<!-- Source code -->
<file src="$srcroot$\**\*.cs" target="src" />

Expand Down
4 changes: 4 additions & 0 deletions ...ework/TestFramework.Extensions/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Shipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#nullable enable
Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute
Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute.UITestMethodAttribute() -> void
override Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer.UITestMethodAttribute.Execute(Microsoft.VisualStudio.TestTools.UnitTesting.ITestMethod! testMethod) -> Microsoft.VisualStudio.TestTools.UnitTesting.TestResult![]!
1 change: 1 addition & 0 deletions ...ork/TestFramework.Extensions/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#nullable enable
10 changes: 9 additions & 1 deletion src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />

<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(WinUiMinimum)</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(UwpNet9Minimum);$(WinUiMinimum)</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">$(SupportedNetFrameworks);netstandard2.0</TargetFrameworks>
<UseAssemblyVersion14>true</UseAssemblyVersion14>
</PropertyGroup>
Expand All @@ -28,6 +28,7 @@
- .NET 6.0
- .NET 6.0 Windows.18362+
- UWP 10.0.16299
- UWP 10.0.17763 with .NET 9
</PackageDescription>
</PropertyGroup>

Expand All @@ -49,6 +50,13 @@
<PropertyGroup Condition=" '$(TargetFramework)' == '$(UwpMinimum)' ">
<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == '$(UwpNet9Minimum)' ">
<DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
</PropertyGroup>

<ItemGroup>
<ProjectReference Condition=" '$(TargetFramework)' == '$(UwpMinimum)' " Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" SetTargetFramework="TargetFramework=netstandard2.0" Private="True" />
Expand Down
3 changes: 3 additions & 0 deletions src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
<PropertyGroup Condition=" '$(UseWinUI)' == 'true' ">
<_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net6.0/winui/</_TestFrameworkExtensionsRoot>
</PropertyGroup>
<PropertyGroup Condition=" '$(UseUwpTools)' == 'true' ">
<_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net9.0/uwp/</_TestFrameworkExtensionsRoot>
</PropertyGroup>
<PropertyGroup Condition=" '$(UseWinUI)' != 'true' ">
<_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)</_TestFrameworkExtensionsRoot>
</PropertyGroup>
Expand Down
Loading