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

Merged
merged 53 commits into from
Feb 6, 2025
Merged

Add UWP .NET 9 support for MSTest extensions #3848

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
53 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
13d8b85
fix code analyzer rules
adam-stephenson Jan 9, 2025
d0333e4
merge main
adam-stephenson Jan 9, 2025
e472752
fixing nuget pack
adam-stephenson Jan 9, 2025
09e0b17
update test package references
adam-stephenson Jan 9, 2025
18565f6
Blank project update
adam-stephenson Jan 11, 2025
ecb9349
merge main
adam-stephenson Jan 29, 2025
f2e9e19
remove directory build prop net462 requirement
adam-stephenson Jan 29, 2025
2810169
remove MSTest.Internal.TestFx.Documentation from verify-nupkgs
adam-stephenson Jan 29, 2025
f227d13
remove debug launch from app xaml
adam-stephenson Jan 29, 2025
cbf51a9
update testadapter.nuspec
adam-stephenson Jan 29, 2025
42bf9f4
remove TestFx.Documentation.nuspec
adam-stephenson Jan 29, 2025
cd8dbb0
fix indentation in MSTest.csproj
adam-stephenson Jan 29, 2025
e1782ba
update platformservices csproj
adam-stephenson Jan 29, 2025
fdad4fa
remvoe WINDOWS_UWP constant
adam-stephenson Jan 29, 2025
b648fc0
Update src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
adstep Jan 29, 2025
a8217f9
revert testadapter.nuspec
adam-stephenson Jan 29, 2025
d865745
Merge branch 'user/adstep/uwp-net9-support' of github.com:adstep/test…
adam-stephenson Jan 29, 2025
6801387
fix spacing
adam-stephenson Jan 29, 2025
dc031c5
fix spacing again
adam-stephenson Jan 29, 2025
be53cd2
removing netcurrent from directory.build.props
adam-stephenson Jan 29, 2025
80ad518
Merge branch 'main' into pr/4817
Evangelink Jan 29, 2025
4949712
Make code compile
Evangelink Jan 29, 2025
e3524f7
Simplify samples
Evangelink Jan 29, 2025
2a1baea
Merge pull request #1 from Evangelink/uwp-fixes
adstep Jan 29, 2025
75ccbd2
Merge pull request #1 from adstep/user/adstep/uwp-net9-support
Sergio0694 Jan 29, 2025
7802d1d
Update UWP sample project
Sergio0694 Jan 30, 2025
ad21693
Use file-scoped namespaces
Sergio0694 Jan 30, 2025
5415c69
Merge branch 'main' into user/sergiopedri/uwp-net9-support
Sergio0694 Jan 30, 2025
b4c6df5
update verify nugpkgs numbers for build to work
adam-stephenson Feb 6, 2025
4b7e89a
update verify nugpkgs numbers for build to work
adam-stephenson Feb 6, 2025
3dc6084
Merge branch 'user/sergiopedri/uwp-net9-support' of https://github.co…
adam-stephenson Feb 6, 2025
5167640
merge main
adam-stephenson Feb 6, 2025
83cc658
Merge pull request #3 from adstep/user/adstep/uwp-net9-latest-merge
Sergio0694 Feb 6, 2025
6255866
Remove leftover .csproj stuff on UWP
Sergio0694 Feb 6, 2025
7786b71
Remove unnecessary package reference
Sergio0694 Feb 6, 2025
2f7731e
Simplify ifdefs to clarify changes
Sergio0694 Feb 6, 2025
1478232
Add missing trailing newline
Sergio0694 Feb 6, 2025
fd23847
Update .targets for new pack folder
Sergio0694 Feb 6, 2025
bbc4b81
Fix path of packed .targets file
Sergio0694 Feb 6, 2025
c63fb0c
Fix a typo
Sergio0694 Feb 6, 2025
f07788d
Remove incorrect MSBuild condition
Sergio0694 Feb 6, 2025
229fbc5
Update path to new 'winui+uwp' folder
Sergio0694 Feb 6, 2025
060d3d9
Add 'TestContainer' project capability
Sergio0694 Feb 6, 2025
7b815d4
Merge branch 'main' into user/sergiopedri/uwp-net9-support
Sergio0694 Feb 6, 2025
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 -->
Sergio0694 marked this conversation as resolved.
Show resolved Hide resolved
<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