From 38c299bda3a519d9bce875f2fa5557b427a194fb Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 16 Sep 2024 17:01:48 +0200 Subject: [PATCH 1/9] Add UWP .NET 9 support for MSTest extensions --- .../TestFramework.Extensions/MSTest.TestFramework.nuspec | 7 +++++++ .../TestFramework.Extensions.csproj | 6 +++++- .../build/winui/MSTest.TestFramework.targets | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec index 3c7f9c9f87..ffe21f0391 100644 --- a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec +++ b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec @@ -70,6 +70,13 @@ + + + + + + + diff --git a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj index 5dcc9df4a5..a8bf591bb6 100644 --- a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj +++ b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj @@ -5,7 +5,7 @@ - netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(WinUiMinimum) + netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(WinUiMinimum);net8.0-windows10.0.26100.0 $(SupportedNetFrameworks);netstandard2.0 true @@ -28,6 +28,7 @@ - .NET 6.0 - .NET 6.0 Windows.18362+ - UWP 10.0.16299 + - UWP 10.0.26100 with .NET 9 @@ -49,6 +50,9 @@ $(DefineConstants);NETFX_CORE;WINDOWS_UWP + + $(DefineConstants);WINDOWS_UWP + diff --git a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets index 0e39a79e7e..1b7c592c71 100644 --- a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets +++ b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets @@ -3,6 +3,9 @@ <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net6.0/winui/ + + <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net8.0-windows10.0.26100.0/uwp/ + <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory) From 6a38f82b9e4180f298c9afaad596cff53acef1c9 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 16 Sep 2024 17:42:23 +0200 Subject: [PATCH 2/9] Copy public API list to new TFM folder --- .../PublicAPI.Shipped.txt | 14 ++++++++++++++ .../PublicAPI.Unshipped.txt | 1 + 2 files changed, 15 insertions(+) create mode 100644 src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Shipped.txt create mode 100644 src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Unshipped.txt diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Shipped.txt b/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Shipped.txt new file mode 100644 index 0000000000..f9d5205b2e --- /dev/null +++ b/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Shipped.txt @@ -0,0 +1,14 @@ +#nullable enable +Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute +Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path) -> void +Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path, string? outputDirectory) -> void +Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.OutputDirectory.get -> string? +Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.Path.get -> string? +virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string? +virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string? +virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestDeploymentDir.get -> string? +virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestDir.get -> string? +virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestLogsDir.get -> string? +virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string? +virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string? +virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string? \ No newline at end of file diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Unshipped.txt b/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Unshipped.txt new file mode 100644 index 0000000000..815c92006a --- /dev/null +++ b/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ +#nullable enable \ No newline at end of file From 6366254d6cbc73039218f38d09e4d655719fc608 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 16 Sep 2024 18:18:53 +0200 Subject: [PATCH 3/9] Fix API surface for new UWP target --- .../PublicAPI.Shipped.txt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Shipped.txt b/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Shipped.txt index f9d5205b2e..f78acd369f 100644 --- a/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Shipped.txt +++ b/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Shipped.txt @@ -1,14 +1,4 @@ #nullable enable -Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute -Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path) -> void -Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.DeploymentItemAttribute(string? path, string? outputDirectory) -> void -Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.OutputDirectory.get -> string? -Microsoft.VisualStudio.TestTools.UnitTesting.DeploymentItemAttribute.Path.get -> string? -virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.DeploymentDirectory.get -> string? -virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.ResultsDirectory.get -> string? -virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestDeploymentDir.get -> string? -virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestDir.get -> string? -virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestLogsDir.get -> string? -virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestResultsDirectory.get -> string? -virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunDirectory.get -> string? -virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext.TestRunResultsDirectory.get -> string? \ No newline at end of file +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![]! \ No newline at end of file From e6678a1ab0b73f8533188cd093b4584956924c3a Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Mon, 16 Sep 2024 19:40:52 +0200 Subject: [PATCH 4/9] Remove 'net8.0-windows10.0.26100.0' TFM --- .../TestFramework.Extensions/MSTest.TestFramework.nuspec | 9 ++------- .../build/winui/MSTest.TestFramework.targets | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec index ffe21f0391..12fd581b76 100644 --- a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec +++ b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec @@ -69,13 +69,8 @@ - - - - - - - + + diff --git a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets index 1b7c592c71..5f2305106d 100644 --- a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets +++ b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets @@ -4,7 +4,7 @@ <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net6.0/winui/ - <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net8.0-windows10.0.26100.0/uwp/ + <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net8.0/uwp/ <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory) From 7f8f4e4bec0ce88087a0998b828e4b93694ac8aa Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sat, 19 Oct 2024 12:41:36 -0700 Subject: [PATCH 5/9] Define 'UwpNet9Minimum' internally --- Directory.Build.props | 1 + .../TestFramework.Extensions/TestFramework.Extensions.csproj | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 291e3b4f05..712f3d5369 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -27,6 +27,7 @@ net462 uap10.0.16299 + net8.0-windows10.0.26100.0 net6.0-windows10.0.18362.0 net8.0 diff --git a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj index a8bf591bb6..9dc548fd01 100644 --- a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj +++ b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj @@ -5,7 +5,7 @@ - netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(WinUiMinimum);net8.0-windows10.0.26100.0 + netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(UwpNet9Minimum);$(WinUiMinimum) $(SupportedNetFrameworks);netstandard2.0 true @@ -50,7 +50,7 @@ $(DefineConstants);NETFX_CORE;WINDOWS_UWP - + $(DefineConstants);WINDOWS_UWP From 29abbe2dd87a0df26c3561419d5cf8061834ec5b Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sun, 24 Nov 2024 23:37:27 -0800 Subject: [PATCH 6/9] Update UWP settings for .NET 9 GA --- Directory.Build.props | 2 +- .../TestFramework.Extensions/MSTest.TestFramework.nuspec | 6 ++++-- .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../TestFramework.Extensions.csproj | 6 +++++- .../build/winui/MSTest.TestFramework.targets | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) rename src/TestFramework/TestFramework.Extensions/PublicAPI/{net8.0-windows10.0.26100.0 => net9.0-windows10.0.17763.0}/PublicAPI.Shipped.txt (100%) rename src/TestFramework/TestFramework.Extensions/PublicAPI/{net8.0-windows10.0.26100.0 => net9.0-windows10.0.17763.0}/PublicAPI.Unshipped.txt (100%) diff --git a/Directory.Build.props b/Directory.Build.props index 712f3d5369..79f1125afb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -27,7 +27,7 @@ net462 uap10.0.16299 - net8.0-windows10.0.26100.0 + net9.0-windows10.0.17763.0 net6.0-windows10.0.18362.0 net8.0 diff --git a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec index 12fd581b76..526bfd3dd0 100644 --- a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec +++ b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec @@ -69,8 +69,10 @@ - - + + + + diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Shipped.txt b/src/TestFramework/TestFramework.Extensions/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Shipped.txt similarity index 100% rename from src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Shipped.txt rename to src/TestFramework/TestFramework.Extensions/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Shipped.txt diff --git a/src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Unshipped.txt b/src/TestFramework/TestFramework.Extensions/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/TestFramework/TestFramework.Extensions/PublicAPI/net8.0-windows10.0.26100.0/PublicAPI.Unshipped.txt rename to src/TestFramework/TestFramework.Extensions/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Unshipped.txt diff --git a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj index 9dc548fd01..53089a5024 100644 --- a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj +++ b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj @@ -28,7 +28,7 @@ - .NET 6.0 - .NET 6.0 Windows.18362+ - UWP 10.0.16299 - - UWP 10.0.26100 with .NET 9 + - UWP 10.0.17763 with .NET 9 @@ -52,6 +52,10 @@ $(DefineConstants);WINDOWS_UWP + 10.0.17763.0 + 10.0.17763.0 + 10.0.17763.0 + win-x86;win-x64;win-arm64 diff --git a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets index 5f2305106d..8940adcb9e 100644 --- a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets +++ b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets @@ -4,7 +4,7 @@ <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net6.0/winui/ - <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net8.0/uwp/ + <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net9.0/uwp/ <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory) From eeccd73e92f995128274a06b959aa94b9d903fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Fri, 29 Nov 2024 23:03:15 +0100 Subject: [PATCH 7/9] WIP handling modern uwp --- Directory.Build.props | 10 +++++--- eng/verify-nupkgs.ps1 | 4 +-- .../DynamicDataOperations.cs | 4 +-- .../MSTest.TestAdapter.csproj | 25 ++++++++++++------- .../MSTest.TestAdapter.nuspec | 18 +++++++++++-- src/Adapter/MSTest.TestAdapter/PACKAGE.md | 1 + .../PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../build/net/MSTest.TestAdapter.targets | 13 ++++++---- .../AssemblyResolver.cs | 2 +- .../MSTestAdapter.PlatformServices.csproj | 10 ++++---- .../PublicAPI.Shipped.txt | 4 +++ .../PublicAPI.Unshipped.txt | 1 + .../Services/FileOperations.cs | 20 +++++++-------- .../Services/TestSourceHost.cs | 10 ++++---- ...STest.Internal.TestFx.Documentation.nuspec | 2 +- src/Package/MSTest.Sdk/PACKAGE.md | 1 + src/Package/MSTest/MSTest.csproj | 1 + src/Package/MSTest/PACKAGE.md | 1 + .../MSTest.TestFramework.nuspec | 11 ++++++-- .../TestFramework.Extensions/PACKAGE.md | 1 + .../TestFramework.Extensions.csproj | 22 +++++++--------- .../winui+uwp/MSTest.TestFramework.targets | 23 +++++++++++++++++ 23 files changed, 123 insertions(+), 61 deletions(-) rename src/Adapter/MSTest.TestAdapter/PublicAPI/{uap10.0.16299 => uwp}/PublicAPI.Shipped.txt (100%) rename src/Adapter/MSTest.TestAdapter/PublicAPI/{uap10.0.16299 => uwp}/PublicAPI.Unshipped.txt (100%) create mode 100644 src/Adapter/MSTestAdapter.PlatformServices/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Shipped.txt create mode 100644 src/Adapter/MSTestAdapter.PlatformServices/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Unshipped.txt create mode 100644 src/TestFramework/TestFramework.Extensions/build/winui+uwp/MSTest.TestFramework.targets diff --git a/Directory.Build.props b/Directory.Build.props index 79f1125afb..f9fbe947c4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -26,13 +26,15 @@ net462 + net9.0 + + uap10.0.16299 - net9.0-windows10.0.17763.0 + net9.0-windows10.0.17763.0 net6.0-windows10.0.18362.0 - net8.0 - netcoreapp3.1;net6.0;net7.0;net8.0 - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 + netcoreapp3.1;net6.0;net7.0;net8.0;net9.0 diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1 index d119680355..b53082e743 100644 --- a/eng/verify-nupkgs.ps1 +++ b/eng/verify-nupkgs.ps1 @@ -21,8 +21,8 @@ function Confirm-NugetPackages { $expectedNumOfFiles = @{ "MSTest.Sdk" = 15; "MSTest.Internal.TestFx.Documentation" = 10; - "MSTest.TestFramework" = 130; - "MSTest.TestAdapter" = 76; + "MSTest.TestFramework" = 150; + "MSTest.TestAdapter" = 84; "MSTest" = 6; "MSTest.Analyzers" = 10; } diff --git a/src/Adapter/MSTest.TestAdapter/DynamicDataOperations.cs b/src/Adapter/MSTest.TestAdapter/DynamicDataOperations.cs index a666067292..2bd1846fdd 100644 --- a/src/Adapter/MSTest.TestAdapter/DynamicDataOperations.cs +++ b/src/Adapter/MSTest.TestAdapter/DynamicDataOperations.cs @@ -3,7 +3,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -#if NET471_OR_GREATER || NETCOREAPP +#if NET471_OR_GREATER || (NET && !WINDOWS_UWP) using System.Collections; using System.Runtime.CompilerServices; #endif @@ -129,7 +129,7 @@ private static bool TryGetData(object dataSource, [NotNullWhen(true)] out IEnume return true; } -#if NETCOREAPP || NET471_OR_GREATER +#if NET471_OR_GREATER || (NET && !WINDOWS_UWP) if (dataSource is IEnumerable enumerable) { List objects = new(); diff --git a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj index fb25147250..f932870568 100644 --- a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj +++ b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj @@ -5,7 +5,7 @@ - netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(WinUiMinimum) + netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(ModernUwpMinimum);$(WinUiMinimum) $(SupportedNetFrameworks);netstandard2.0 true @@ -33,6 +33,7 @@ - .NET 6.0 - .NET 6.0 Windows.18362+ - UWP 10.0.16299 + - UWP 10.0.17763 with .NET 9 $(NoWarn);NU5127;NU5128 @@ -46,6 +47,11 @@ true + + + $(DefineConstants);WINDOWS_UWP + + @@ -53,16 +59,17 @@ - + - - - - + + + + True True @@ -85,16 +92,16 @@ - + PreserveNewest PreserveNewest - + PreserveNewest - + PreserveNewest diff --git a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.nuspec b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.nuspec index dcb1207828..2164c734c3 100644 --- a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.nuspec +++ b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.nuspec @@ -32,6 +32,10 @@ + + + + PACKAGE.md @@ -50,7 +54,7 @@ - + @@ -67,7 +71,7 @@ - + @@ -88,6 +92,16 @@ + + + + + + + + + + diff --git a/src/Adapter/MSTest.TestAdapter/PACKAGE.md b/src/Adapter/MSTest.TestAdapter/PACKAGE.md index 49347b92da..ed63b63c2d 100644 --- a/src/Adapter/MSTest.TestAdapter/PACKAGE.md +++ b/src/Adapter/MSTest.TestAdapter/PACKAGE.md @@ -11,3 +11,4 @@ Supported platforms: - .NET 6.0+ - .NET 6.0 Windows.18362+ - UWP 10.0.16299 +- UWP 10.0.17763 with .NET 9 \ No newline at end of file diff --git a/src/Adapter/MSTest.TestAdapter/PublicAPI/uap10.0.16299/PublicAPI.Shipped.txt b/src/Adapter/MSTest.TestAdapter/PublicAPI/uwp/PublicAPI.Shipped.txt similarity index 100% rename from src/Adapter/MSTest.TestAdapter/PublicAPI/uap10.0.16299/PublicAPI.Shipped.txt rename to src/Adapter/MSTest.TestAdapter/PublicAPI/uwp/PublicAPI.Shipped.txt diff --git a/src/Adapter/MSTest.TestAdapter/PublicAPI/uap10.0.16299/PublicAPI.Unshipped.txt b/src/Adapter/MSTest.TestAdapter/PublicAPI/uwp/PublicAPI.Unshipped.txt similarity index 100% rename from src/Adapter/MSTest.TestAdapter/PublicAPI/uap10.0.16299/PublicAPI.Unshipped.txt rename to src/Adapter/MSTest.TestAdapter/PublicAPI/uwp/PublicAPI.Unshipped.txt diff --git a/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets index f3ef87d399..576bc3007c 100644 --- a/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets +++ b/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets @@ -9,10 +9,13 @@ - <__TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory)../net6.0/winui/ + <_TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory)../net6.0/winui/ - - <__TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory) + + <_TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory)../net9.0/uwp/ + + + <_TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory) @@ -21,7 +24,7 @@ PreserveNewest False - + Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll PreserveNewest False @@ -48,7 +51,7 @@ - $(__TestAdapterPlatformServicesRoot)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll + $(_TestAdapterPlatformServicesRoot)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll diff --git a/src/Adapter/MSTestAdapter.PlatformServices/AssemblyResolver.cs b/src/Adapter/MSTestAdapter.PlatformServices/AssemblyResolver.cs index 59ae87d210..2a397652d4 100644 --- a/src/Adapter/MSTestAdapter.PlatformServices/AssemblyResolver.cs +++ b/src/Adapter/MSTestAdapter.PlatformServices/AssemblyResolver.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -#if NETFRAMEWORK || NET +#if NETFRAMEWORK || (NET && !WINDOWS_UWP) using System.Diagnostics; using System.Reflection; #if NETFRAMEWORK diff --git a/src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj b/src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj index 7752d8d63a..a015059625 100644 --- a/src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj +++ b/src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj @@ -5,7 +5,7 @@ - netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(WinUiMinimum) + netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(ModernUwpMinimum);$(WinUiMinimum) $(SupportedNetFrameworks);netstandard2.0 true @@ -17,8 +17,8 @@ - - $(DefineConstants);NETFX_CORE;WINDOWS_UWP + + $(DefineConstants);WINDOWS_UWP @@ -47,7 +47,7 @@ - + @@ -61,7 +61,7 @@ - + True True diff --git a/src/Adapter/MSTestAdapter.PlatformServices/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Shipped.txt b/src/Adapter/MSTestAdapter.PlatformServices/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Shipped.txt new file mode 100644 index 0000000000..0f2adb28da --- /dev/null +++ b/src/Adapter/MSTestAdapter.PlatformServices/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Shipped.txt @@ -0,0 +1,4 @@ +#nullable enable +Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TraceListenerManager.Close(Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.ITraceListener! traceListener) -> void +Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TraceListenerWrapper.Close() -> void +Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TraceListenerWrapper.Dispose() -> void \ No newline at end of file diff --git a/src/Adapter/MSTestAdapter.PlatformServices/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Unshipped.txt b/src/Adapter/MSTestAdapter.PlatformServices/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Unshipped.txt new file mode 100644 index 0000000000..815c92006a --- /dev/null +++ b/src/Adapter/MSTestAdapter.PlatformServices/PublicAPI/net9.0-windows10.0.17763.0/PublicAPI.Unshipped.txt @@ -0,0 +1 @@ +#nullable enable \ No newline at end of file diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/FileOperations.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/FileOperations.cs index 82064d7c5b..e1c08642e2 100644 --- a/src/Adapter/MSTestAdapter.PlatformServices/Services/FileOperations.cs +++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/FileOperations.cs @@ -82,13 +82,13 @@ public Assembly LoadAssembly(string assemblyName, bool isReflectionOnly) /// The assembly. /// Path to the .DLL of the assembly. public string? GetAssemblyPath(Assembly assembly) -#if NETSTANDARD || NETCOREAPP || NETFRAMEWORK +#if WINDOWS_UWP + => null; // TODO: what are the options here? +#else // This method will never be called in source generator mode, we are providing a different provider for file operations. #pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file => assembly.Location; #pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file -#elif WINDOWS_UWP - => null; // TODO: what are the options here? #endif /// @@ -99,13 +99,7 @@ public Assembly LoadAssembly(string assemblyName, bool isReflectionOnly) /// This is currently not implemented. public bool DoesFileExist(string assemblyFileName) { -#if NETSTANDARD || (NETCOREAPP && !WIN_UI) - // For projectK these assemblies can be created on the fly which means the file might not exist on disk. - // Depend on Assembly Load failures instead of this validation. - return true; -#elif NETFRAMEWORK - return (SafeInvoke(() => File.Exists(assemblyFileName)) as bool?) ?? false; -#elif WINDOWS_UWP +#if WINDOWS_UWP bool fileExists = false; try @@ -121,6 +115,12 @@ public bool DoesFileExist(string assemblyFileName) } return fileExists; +#elif NETSTANDARD || (NETCOREAPP && !WIN_UI) + // For projectK these assemblies can be created on the fly which means the file might not exist on disk. + // Depend on Assembly Load failures instead of this validation. + return true; +#elif NETFRAMEWORK + return (SafeInvoke(() => File.Exists(assemblyFileName)) as bool?) ?? false; #elif WIN_UI string path = GetFullFilePath(assemblyFileName); return File.Exists(path); diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/TestSourceHost.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/TestSourceHost.cs index 482c4f9b94..2adae07e6e 100644 --- a/src/Adapter/MSTestAdapter.PlatformServices/Services/TestSourceHost.cs +++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/TestSourceHost.cs @@ -11,7 +11,7 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel; #endif using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter; -#if NETFRAMEWORK || NET +#if NETFRAMEWORK || (NET && !WINDOWS_UWP) using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities; #endif #if !WINDOWS_UWP @@ -32,7 +32,7 @@ public class TestSourceHost : ITestSourceHost private string? _currentDirectory; #endif -#if NETFRAMEWORK || NET +#if NETFRAMEWORK || (NET && !WINDOWS_UWP) /// /// Assembly resolver used in the current app-domain. /// @@ -104,7 +104,7 @@ internal TestSourceHost(string sourceFileName, IRunSettings? runSettings, IFrame /// public void SetupHost() { -#if NET +#if NET && !WINDOWS_UWP List resolutionPaths = GetResolutionPaths(_sourceFileName, false); if (EqtTrace.IsInfoEnabled) @@ -209,7 +209,7 @@ public void SetupHost() /// public void Dispose() { -#if NETFRAMEWORK || NET +#if NETFRAMEWORK || (NET && !WINDOWS_UWP) if (_parentDomainAssemblyResolver != null) { _parentDomainAssemblyResolver.Dispose(); @@ -347,7 +347,7 @@ internal virtual string GetTargetFrameworkVersionString(string sourceFileName) => new DeploymentUtility().GetConfigFile(sourceFileName); #endif -#if NETFRAMEWORK || NET +#if NETFRAMEWORK || (NET && !WINDOWS_UWP) /// /// Gets the probing paths to load the test assembly dependencies. /// diff --git a/src/Package/MSTest.Internal.TestFx.Documentation/MSTest.Internal.TestFx.Documentation.nuspec b/src/Package/MSTest.Internal.TestFx.Documentation/MSTest.Internal.TestFx.Documentation.nuspec index dce6465353..11bd925e83 100644 --- a/src/Package/MSTest.Internal.TestFx.Documentation/MSTest.Internal.TestFx.Documentation.nuspec +++ b/src/Package/MSTest.Internal.TestFx.Documentation/MSTest.Internal.TestFx.Documentation.nuspec @@ -13,6 +13,6 @@ - + diff --git a/src/Package/MSTest.Sdk/PACKAGE.md b/src/Package/MSTest.Sdk/PACKAGE.md index 7a64c625b3..f09f7b9069 100644 --- a/src/Package/MSTest.Sdk/PACKAGE.md +++ b/src/Package/MSTest.Sdk/PACKAGE.md @@ -11,3 +11,4 @@ Supported platforms: - .NET 6.0+ - .NET 6.0 Windows.18362+ - UWP 10.0.16299 +- UWP 10.0.17763 with .NET 9 \ No newline at end of file diff --git a/src/Package/MSTest/MSTest.csproj b/src/Package/MSTest/MSTest.csproj index 05b34847f1..b4f98f8314 100644 --- a/src/Package/MSTest/MSTest.csproj +++ b/src/Package/MSTest/MSTest.csproj @@ -22,6 +22,7 @@ - .NET 6.0+ - .NET 6.0 Windows.18362+ - UWP 10.0.16299 + - UWP 10.0.17763 with .NET 9 $(NoWarn);NU5128 diff --git a/src/Package/MSTest/PACKAGE.md b/src/Package/MSTest/PACKAGE.md index 0f50ed5df5..1f6f48512f 100644 --- a/src/Package/MSTest/PACKAGE.md +++ b/src/Package/MSTest/PACKAGE.md @@ -11,3 +11,4 @@ Supported platforms: - .NET 6.0+ - .NET 6.0 Windows.18362+ - UWP 10.0.16299 +- UWP 10.0.17763 with .NET 9 \ No newline at end of file diff --git a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec index 526bfd3dd0..bddef61f37 100644 --- a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec +++ b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec @@ -10,6 +10,7 @@ + PACKAGE.md @@ -71,8 +72,14 @@ - - + + + + + + + + diff --git a/src/TestFramework/TestFramework.Extensions/PACKAGE.md b/src/TestFramework/TestFramework.Extensions/PACKAGE.md index eab7d07745..015957e8d2 100644 --- a/src/TestFramework/TestFramework.Extensions/PACKAGE.md +++ b/src/TestFramework/TestFramework.Extensions/PACKAGE.md @@ -11,3 +11,4 @@ Supported platforms: - .NET 6.0+ - .NET 6.0 Windows.18362+ - UWP 10.0.16299 +- UWP 10.0.17763 with .NET 9 \ No newline at end of file diff --git a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj index 53089a5024..61c680eb19 100644 --- a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj +++ b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj @@ -5,7 +5,7 @@ - netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(UwpNet9Minimum);$(WinUiMinimum) + netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks);$(UwpMinimum);$(ModernUwpMinimum);$(WinUiMinimum) $(SupportedNetFrameworks);netstandard2.0 true @@ -13,7 +13,7 @@ true MSTest.TestFramework.nuspec - MSTest.TestFramework.Linux.nuspec + MSTest.TestFramework.NonWindows.nuspec $(OutputPath) MSTest.TestFramework MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework @@ -28,7 +28,7 @@ - .NET 6.0 - .NET 6.0 Windows.18362+ - UWP 10.0.16299 - - UWP 10.0.17763 with .NET 9 + - UWP 10.0.17763 with .NET 9 @@ -47,19 +47,12 @@ win10-x86;win10-x64;win10-arm64 - - $(DefineConstants);NETFX_CORE;WINDOWS_UWP - - + $(DefineConstants);WINDOWS_UWP - 10.0.17763.0 - 10.0.17763.0 - 10.0.17763.0 - win-x86;win-x64;win-arm64 - + @@ -72,7 +65,7 @@ - + @@ -90,6 +83,9 @@ + + PreserveNewest + PreserveNewest diff --git a/src/TestFramework/TestFramework.Extensions/build/winui+uwp/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/winui+uwp/MSTest.TestFramework.targets new file mode 100644 index 0000000000..ac0e82b0c7 --- /dev/null +++ b/src/TestFramework/TestFramework.Extensions/build/winui+uwp/MSTest.TestFramework.targets @@ -0,0 +1,23 @@ + + + + <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net6.0/winui/ + + + + <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net9.0/uwp/ + + + + <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory) + + + + + $(_TestFrameworkExtensionsRoot)Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + PreserveNewest + False + + + + From be2a1a0902361fc274de357714535358d4061101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Fri, 29 Nov 2024 23:04:02 +0100 Subject: [PATCH 8/9] Add sample test app --- samples/public/BlankUwpNet9App/App.xaml | 5 + samples/public/BlankUwpNet9App/App.xaml.cs | 103 ++++++++++++++++++ .../Assets/LockScreenLogo.scale-200.png | Bin 0 -> 1430 bytes .../Assets/SplashScreen.scale-200.png | Bin 0 -> 7700 bytes .../Assets/Square150x150Logo.scale-200.png | Bin 0 -> 2937 bytes .../Assets/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes .../BlankUwpNet9App/Assets/StoreLogo.png | Bin 0 -> 1451 bytes .../Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes .../BlankUwpNet9App/BlankUwpNet9App.csproj | 36 ++++++ .../BlankUwpNet9App/BlankUwpNet9App.sln | 40 +++++++ samples/public/BlankUwpNet9App/MainPage.xaml | 14 +++ .../public/BlankUwpNet9App/MainPage.xaml.cs | 30 +++++ .../BlankUwpNet9App/Package.appxmanifest | 49 +++++++++ .../PublishProfiles/win-arm64.pubxml | 14 +++ .../Properties/PublishProfiles/win-x64.pubxml | 14 +++ .../Properties/PublishProfiles/win-x86.pubxml | 14 +++ .../Properties/launchSettings.json | 7 ++ samples/public/BlankUwpNet9App/UnitTests.cs | 28 +++++ 19 files changed, 354 insertions(+) create mode 100644 samples/public/BlankUwpNet9App/App.xaml create mode 100644 samples/public/BlankUwpNet9App/App.xaml.cs create mode 100644 samples/public/BlankUwpNet9App/Assets/LockScreenLogo.scale-200.png create mode 100644 samples/public/BlankUwpNet9App/Assets/SplashScreen.scale-200.png create mode 100644 samples/public/BlankUwpNet9App/Assets/Square150x150Logo.scale-200.png create mode 100644 samples/public/BlankUwpNet9App/Assets/Square44x44Logo.scale-200.png create mode 100644 samples/public/BlankUwpNet9App/Assets/Square44x44Logo.targetsize-24_altform-unplated.png create mode 100644 samples/public/BlankUwpNet9App/Assets/StoreLogo.png create mode 100644 samples/public/BlankUwpNet9App/Assets/Wide310x150Logo.scale-200.png create mode 100644 samples/public/BlankUwpNet9App/BlankUwpNet9App.csproj create mode 100644 samples/public/BlankUwpNet9App/BlankUwpNet9App.sln create mode 100644 samples/public/BlankUwpNet9App/MainPage.xaml create mode 100644 samples/public/BlankUwpNet9App/MainPage.xaml.cs create mode 100644 samples/public/BlankUwpNet9App/Package.appxmanifest create mode 100644 samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-arm64.pubxml create mode 100644 samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-x64.pubxml create mode 100644 samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-x86.pubxml create mode 100644 samples/public/BlankUwpNet9App/Properties/launchSettings.json create mode 100644 samples/public/BlankUwpNet9App/UnitTests.cs diff --git a/samples/public/BlankUwpNet9App/App.xaml b/samples/public/BlankUwpNet9App/App.xaml new file mode 100644 index 0000000000..dfc0b61956 --- /dev/null +++ b/samples/public/BlankUwpNet9App/App.xaml @@ -0,0 +1,5 @@ + diff --git a/samples/public/BlankUwpNet9App/App.xaml.cs b/samples/public/BlankUwpNet9App/App.xaml.cs new file mode 100644 index 0000000000..3e553d11ec --- /dev/null +++ b/samples/public/BlankUwpNet9App/App.xaml.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; + +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +namespace BlankUwpNet9App +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + sealed partial class App : Application + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + InitializeComponent(); + + Suspending += OnSuspending; + } + + /// + protected override void OnLaunched(LaunchActivatedEventArgs e) + { + Frame rootFrame = Window.Current.Content as Frame; + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active. + if (rootFrame == null) + { + // Create a Frame to act as the navigation context and navigate to the first page + rootFrame = new Frame(); + rootFrame.NavigationFailed += OnNavigationFailed; + + if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) + { + // TODO: Load state from previously suspended application + } + + // Place the frame in the current Window + Window.Current.Content = rootFrame; + } + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI(); + + //if (e.PrelaunchActivated == false) + //{ + // if (rootFrame.Content == null) + // { + // // When the navigation stack isn't restored navigate to the first page, configuring + // // the new page by passing required information as a navigation parameter. + // rootFrame.Navigate(typeof(MainPage), e.Arguments); + // } + + // Ensure the current window is active + Window.Current.Activate(); + //} + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments); + } + + /// + /// Invoked when Navigation to a certain page fails. + /// + /// The Frame which failed navigation. + /// Details about the navigation failure. + void OnNavigationFailed(object sender, NavigationFailedEventArgs e) + { + throw new Exception($"Failed to load page '{e.SourcePageType.FullName}'."); + } + + /// + /// Invoked when application execution is being suspended. Application state is saved + /// without knowing whether the application will be terminated or resumed with the contents + /// of memory still intact. + /// + /// The source of the suspend request. + /// Details about the suspend request. + private void OnSuspending(object sender, SuspendingEventArgs e) + { + SuspendingDeferral deferral = e.SuspendingOperation.GetDeferral(); + + // TODO: Save application state and stop any background activity + deferral.Complete(); + } + } +} diff --git a/samples/public/BlankUwpNet9App/Assets/LockScreenLogo.scale-200.png b/samples/public/BlankUwpNet9App/Assets/LockScreenLogo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3 GIT binary patch literal 1430 zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@! zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o zH-bvQi|wt~L7q$~a-gDFP!{&TQfc3fX*6=uHv* zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M zIf%q9@;fyT?0UP>tcw-bLkz;s2LlKl2qeP0w zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ ztnxttBz#NI_a@fk7SU`WtrpsfZsNs9^0(2a z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2Lflg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7 zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH z&(f2wz_Y0??Tf|g;?|1Znw6}6U43Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV yGvCsSX*m literal 0 HcmV?d00001 diff --git a/samples/public/BlankUwpNet9App/Assets/SplashScreen.scale-200.png b/samples/public/BlankUwpNet9App/Assets/SplashScreen.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9 GIT binary patch literal 7700 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 literal 0 HcmV?d00001 diff --git a/samples/public/BlankUwpNet9App/Assets/Square150x150Logo.scale-200.png b/samples/public/BlankUwpNet9App/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186 GIT binary patch literal 2937 zcma)84OCO-8BSud5)jwMLRVKgX(S?$n?Ld|vrsm<$CF7)&zTbyy1FE5bU`Q17MRv`9ue$;R(@8kR;#vJ*IM0>cJIAOte!d7oRgdH zd%ySjdB6L9=gX^A6)VzH7p2l@v~3zJAMw|DFy#^)F@@F*`mqUn=Il>l)8_+ab;nOW{%+iPx z+s{Eu|&pIs)Z7{La9~?xKfyl z#43?gjEL15d4WbOZo#SiP%>DB^+BcnJ=7dHEe;r#G=tuw|ka z%q@}##Uh7;tc%L_64m(kHtw74ty%BJMb)_1)#S0j`)F8_1jF7vScpsnH=0V19bO8y zR`0SjIdCUo&=>JwMQF8KHA<{ODHTiQh}0^@5QRmCA?gOH6_H3K^-_sNB^RrdNuK-R zOO*vOrKCVvDwgUck`kF(E7j{I#iiN;b*ZdCt4m@HPA`EuEqGGf4%!K<;(=I=&Vyrw z%TwcWtxa}8mCZ%Cyf&ActJ6_$ox5z6-D!0-dvnRx6t7y3d+h6QYpKWO;8OdnvERo7 zuEf>ih5`wqY)~o@OeVt-wM?Q!>QzdGRj!bz6fzYrfw$hZfAKzr2-M+D+R>}~oT574c;_3zquHcElqKIsryILt3g8n3jcMb+j?i?-L3FpZJ z2WRVBRdDPc+G5aaYg#5hpE+6nQ|(VSoxT3|biF;BUq#==-27Xi=gihDPYP$7?=9cP zYKE$jeQ|3~_L0VG-(F~2ZPyD0=k{J4Q~h(t__{-mz_w8{JDY9{`1ouzz!Vr5!ECdE z6U~O1k8c}24V7~zzXWTV-Pe4)y}wQJS&q%H5`Fo_f_JvIU489aCX$;P`u#!I-=^4ijC2{&9!O&h>mi?9oYD=GC#%)6{GzN6nQYw+Fal50!#x^asjBBR50i`+mho*ttoqV)ubM2KD9S~k7+FR4>{29?6 z{!l6kDdyTN0YJ9LgkPWeXm|gyi@zM3?0@{&pXT12w|78&W-q!RRF)&iLCEZVH<|fR zN0fr2^t8H(>L?>K#>^+jWROLral(Qy-xoBq1U7A&DV||wClb)Otd9?(gZ|8znMF}D zf<1haWz^s0qgecz;RFGt0C-B4g`jNGHsFU+;{<%t65v^sjk^h$lmWn#B0#_)9ij&d z-~lc`A)YYExi^7sBuPM^Y|wA2g*5?`K?#7tzELQYNxGo$UB$4J8RJp1k(8Jj+~hMT zlN~>M@KTTh^--8y3PK_NZ@AC!{PT=CziBzGd+wTJ^@icH!Bd}%)g8V)%K?|c&WTUk zy}qv1C%(fjRoZ4ozC3{O%@5?)XzH35zHns$pgU*Q?fj4v?fp1Qbm+j;3l;9jam9Da zXVcKjPlQ73x78QPu|Ffm6x?`~e3oD=gl=4kYK?={kD5j~QCXU)`HSdduNNENzA*2$ zOm3PzF!lN5e*06-f1Uot67wY#{o-S1!KZ7E=!~7ynnk9_iJR#kFoNbAOT#^2Gd17F zMmvU6>lndZQGd|ax9kUoXXO+$N?|j@6qpsF&_j7YXvwo_C{JpmLw5&#e6k>atv%es z5)7r*Wvv_JkUpT}M!_o!nVlEk1Zbl=a*2hQ*<|%*K1Glj^FcF`6kTzGQ3lz~2tCc@ z&x|tj;aH&1&9HwcJBcT`;{?a+pnej;M1HO(6Z{#J!cZA04hnFl;NXA+&`=7bjW_^o zfC40u3LMG?NdPtwGl>Tq6u}*QG)}-y;)lu-_>ee3kibW(69n0$0Zy!}9rQz%*v1iO zT9_H>99yIrSPYVy6^);rR}7Yo=J_T@hi+qhTZXnVWyf;JDYm5#eYLTxr*?kiNn!+Y zQ+LUkBafNJ#rH#C(?d5^;gw9o#%daEI{mA*LHPIHPU`#|H$hD zwm>0&+kahQ)E#%~k>&5@&#Vg82H?s%71=)(soi@174pi9--2{w{1$}Sz4zGn3Du&x bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP literal 0 HcmV?d00001 diff --git a/samples/public/BlankUwpNet9App/Assets/Square44x44Logo.scale-200.png b/samples/public/BlankUwpNet9App/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b GIT binary patch literal 1647 zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8# zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa> zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=EAnG8N7fqynWG8L3p!4801a;8{+nliO(qd(jNJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK zt3$GicGPc?GmDjy7K2P@La;eu4!$zWCZ`ym{Z$b zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHqXG7yxWB=w55RGOM)$xMb(>kSNR z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^kLVdlGV6LpK$KIrlJqc zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP zL{N80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b! ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_ literal 0 HcmV?d00001 diff --git a/samples/public/BlankUwpNet9App/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/samples/public/BlankUwpNet9App/Assets/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd GIT binary patch literal 1255 zcmaJ>TWs4@7*5+{G#S+&C!qC#> zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U zyQHecc_L%Gh!7GMt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+ z*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w z&bSErwp+37 zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o# zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=& zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s Mu9UqpbNZeC0BbUo^Z)<= literal 0 HcmV?d00001 diff --git a/samples/public/BlankUwpNet9App/Assets/StoreLogo.png b/samples/public/BlankUwpNet9App/Assets/StoreLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826 GIT binary patch literal 1451 zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv z5nzWi(LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#xG zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q zX}S;+LBh8Tea~TSkHzvX6$rYb)+n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?wFM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8 zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-* zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36 zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640 bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x literal 0 HcmV?d00001 diff --git a/samples/public/BlankUwpNet9App/Assets/Wide310x150Logo.scale-200.png b/samples/public/BlankUwpNet9App/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5 GIT binary patch literal 3204 zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0 z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uArExJ73~P zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*BbFsS(^?B zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$ zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@ zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@JCu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt zsy5Pyu=()`7HRMG3IB7F1@`_ z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM z1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~

MY- zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQBuUA za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3 z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3 z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94 zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE#Na|%OY0$uO>!&hP+1ywfD_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N z$SQMX^AK6(fA + + WinExe + net9.0-windows10.0.26100.0 + 10.0.17763.0 + 10.0.26100.57 + x86;x64;arm64 + win-x86;win-x64;win-arm64 + win-$(Platform).pubxml + en-US + true + true + true + true + $(VisualStudioVersion) + + + 1.0.20241009.2 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/public/BlankUwpNet9App/BlankUwpNet9App.sln b/samples/public/BlankUwpNet9App/BlankUwpNet9App.sln new file mode 100644 index 0000000000..51579fbc9e --- /dev/null +++ b/samples/public/BlankUwpNet9App/BlankUwpNet9App.sln @@ -0,0 +1,40 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35521.163 d17.12 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlankUwpNet9App", "BlankUwpNet9App.csproj", "{D9E66319-BE72-4384-93FC-CA0C1B79C7FC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|arm64 = Debug|arm64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|arm64 = Release|arm64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|arm64.ActiveCfg = Debug|arm64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|arm64.Build.0 = Debug|arm64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|arm64.Deploy.0 = Debug|arm64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|x64.ActiveCfg = Debug|x64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|x64.Build.0 = Debug|x64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|x64.Deploy.0 = Debug|x64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|x86.ActiveCfg = Debug|x86 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|x86.Build.0 = Debug|x86 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|x86.Deploy.0 = Debug|x86 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Release|arm64.ActiveCfg = Release|arm64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Release|arm64.Build.0 = Release|arm64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|arm64.Deploy.0 = Release|arm64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Release|x64.ActiveCfg = Release|x64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Release|x64.Build.0 = Release|x64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|x64.Deploy.0 = Release|x64 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Release|x86.ActiveCfg = Release|x86 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Release|x86.Build.0 = Release|x86 + {D9E66319-BE72-4384-93FC-CA0C1B79C7FC}.Debug|x86.Deploy.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/samples/public/BlankUwpNet9App/MainPage.xaml b/samples/public/BlankUwpNet9App/MainPage.xaml new file mode 100644 index 0000000000..16d586339d --- /dev/null +++ b/samples/public/BlankUwpNet9App/MainPage.xaml @@ -0,0 +1,14 @@ + + + + + + diff --git a/samples/public/BlankUwpNet9App/MainPage.xaml.cs b/samples/public/BlankUwpNet9App/MainPage.xaml.cs new file mode 100644 index 0000000000..969d14d689 --- /dev/null +++ b/samples/public/BlankUwpNet9App/MainPage.xaml.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409 + +namespace BlankUwpNet9App +{ + ///

+ /// An empty page that can be used on its own or navigated to within a Frame. + /// + public sealed partial class MainPage : Page + { + public MainPage() + { + InitializeComponent(); + } + } +} diff --git a/samples/public/BlankUwpNet9App/Package.appxmanifest b/samples/public/BlankUwpNet9App/Package.appxmanifest new file mode 100644 index 0000000000..c0e8a4176c --- /dev/null +++ b/samples/public/BlankUwpNet9App/Package.appxmanifest @@ -0,0 +1,49 @@ + + + + + + + + + + BlankUwpNet9App + sergiopedri + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-arm64.pubxml b/samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-arm64.pubxml new file mode 100644 index 0000000000..eeb8cf16ff --- /dev/null +++ b/samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-arm64.pubxml @@ -0,0 +1,14 @@ + + + + + FileSystem + ARM64 + win-arm64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + true + + \ No newline at end of file diff --git a/samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-x64.pubxml b/samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-x64.pubxml new file mode 100644 index 0000000000..cda40ef369 --- /dev/null +++ b/samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-x64.pubxml @@ -0,0 +1,14 @@ + + + + + FileSystem + x64 + win-x64 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + true + + \ No newline at end of file diff --git a/samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-x86.pubxml b/samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-x86.pubxml new file mode 100644 index 0000000000..3293f82cb0 --- /dev/null +++ b/samples/public/BlankUwpNet9App/Properties/PublishProfiles/win-x86.pubxml @@ -0,0 +1,14 @@ + + + + + FileSystem + x86 + win-x86 + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ + true + true + + \ No newline at end of file diff --git a/samples/public/BlankUwpNet9App/Properties/launchSettings.json b/samples/public/BlankUwpNet9App/Properties/launchSettings.json new file mode 100644 index 0000000000..8c4e9787e3 --- /dev/null +++ b/samples/public/BlankUwpNet9App/Properties/launchSettings.json @@ -0,0 +1,7 @@ +{ + "profiles": { + "BlankUwpNet9App": { + "commandName": "MsixPackage" + } + } +} \ No newline at end of file diff --git a/samples/public/BlankUwpNet9App/UnitTests.cs b/samples/public/BlankUwpNet9App/UnitTests.cs new file mode 100644 index 0000000000..53b992a36c --- /dev/null +++ b/samples/public/BlankUwpNet9App/UnitTests.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; + +using Windows.UI.Xaml.Controls; + +namespace App1 +{ + [TestClass] + public class UnitTest1 + { + [TestMethod] + public void TestMethod1() + { + Assert.AreEqual(0, 0); + } + + // Use the UITestMethod attribute for tests that need to run on the UI thread. + [UITestMethod] + public void TestMethod2() + { + var grid = new Grid(); + Assert.AreEqual(0, grid.MinWidth); + } + } +} From 08743d41087e22fe1bd2d080463088234e271d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Fri, 29 Nov 2024 23:04:39 +0100 Subject: [PATCH 9/9] UseUwpTools --- .../MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets | 4 ++-- .../build/winui+uwp/MSTest.TestFramework.targets | 4 ++-- .../build/winui/MSTest.TestFramework.targets | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets index 576bc3007c..bd4f29e08c 100644 --- a/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets +++ b/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets @@ -11,10 +11,10 @@ <_TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory)../net6.0/winui/ - + <_TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory)../net9.0/uwp/ - + <_TestAdapterPlatformServicesRoot>$(MSBuildThisFileDirectory) diff --git a/src/TestFramework/TestFramework.Extensions/build/winui+uwp/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/winui+uwp/MSTest.TestFramework.targets index ac0e82b0c7..4fa711c2c7 100644 --- a/src/TestFramework/TestFramework.Extensions/build/winui+uwp/MSTest.TestFramework.targets +++ b/src/TestFramework/TestFramework.Extensions/build/winui+uwp/MSTest.TestFramework.targets @@ -4,11 +4,11 @@ <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net6.0/winui/ - + <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net9.0/uwp/ - + <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory) diff --git a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets index 8940adcb9e..1f1b086a30 100644 --- a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets +++ b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets @@ -3,7 +3,7 @@ <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net6.0/winui/ - + <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net9.0/uwp/