Remove UAP/UWP support

xunit · Jun 28, 2023 · aeba1bb · aeba1bb
1 parent 5308021
commit aeba1bb
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 62 deletions.
diff --git a/BUILDING.md b/BUILDING.md
@@ -9,7 +9,6 @@ You will need the following software installed:
 * .NET Framework 4.7.2 or later (part of the Windows OS)
 * [Visual Studio 2022 or later](https://visualstudio.microsoft.com/vs/)
   * ".NET desktop development" workload
-  * "Universal Windows Platform development" workload
   * Additional components:
     * .NET Framework development tools for 3.5
     * .NET Framework targeting packs for 4.5.2, 4.6, 4.6.1, 4.6.2, 4.7, 4.7.1, 4.7.2, 4.8, 4.8.1

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ xUnit.net is a free, open source, community-focused unit testing tool for the .N
 
 For project documentation, please visit the [xUnit.net project home](https://xunit.net/).
 
-* _New to xUnit.net? Get started with [.NET Framework](https://xunit.net/docs/getting-started/netfx/visual-studio), [.NET Core](https://xunit.net/docs/getting-started/netcore/cmdline), and [devices](https://xunit.net/docs/getting-started/uwp/devices-runner)._
+* _New to xUnit.net? Get started with [.NET Framework](https://xunit.net/docs/getting-started/netfx/visual-studio) and [.NET Core](https://xunit.net/docs/getting-started/netcore/cmdline)._
 * _Need some help building the source? See [BUILDING.md](https://github.com/xunit/xunit/tree/v2/BUILDING.md)._
 * _Want to contribute to the project? See [CONTRIBUTING.md](https://github.com/xunit/.github/tree/main/CONTRIBUTING.md)._
 * _Want to contribute to the assertion library? See the [suggested contribution workflow](https://github.com/xunit/assert.xunit/tree/main/README.md#suggested-contribution-workflow) in the assertion library project, as it is slightly more complex due to code being spread across two GitHub repositories._

diff --git a/global.json b/global.json
@@ -1,5 +1 @@
-{
-  "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "3.0.44"
-  }
-}
+{ }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -19,8 +19,6 @@
     <PackageId>$(MSBuildProjectName)</PackageId>
     <RootNamespace>Xunit</RootNamespace>
     <SignAssembly>true</SignAssembly>
-    <TargetPlatformMinVersion Condition=" '$(TargetFramework)' == 'uap10.0' ">10.0.16299.0</TargetPlatformMinVersion>
-    <TargetPlatformVersion Condition=" '$(TargetFramework)' == 'uap10.0' ">10.0.19041.0</TargetPlatformVersion>
     <WarningsAsErrors>true</WarningsAsErrors>
   </PropertyGroup>
 

diff --git a/src/common/AssemblyResolution/AssemblyHelper_NetStandard.cs b/src/common/AssemblyResolution/AssemblyHelper_NetStandard.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD1_1 || NETSTANDARD1_5 || WINDOWS_UAP
+#if NETSTANDARD1_1 || NETSTANDARD1_5
 
 using System;
 using Xunit.Abstractions;

diff --git a/src/common/XunitWorkerThread.cs b/src/common/XunitWorkerThread.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD1_1 || NETSTANDARD1_5 || WINDOWS_UAP
+#if NETSTANDARD1_1 || NETSTANDARD1_5
 
 using System;
 using System.Threading;

diff --git a/src/xunit.runner.utility.nuspec b/src/xunit.runner.utility.nuspec
@@ -10,7 +10,7 @@
     <licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
     <icon>_content/logo-128-transparent.png</icon>
     <readme>_content/README.md</readme>
-    <description>Includes the version-independent runner for xUnit.net to run both v1.9.2 and v2.0+ tests (xunit.runner.utility.*.dll). Supports .NET 3.5, .NET 4.5.2 or later, .NET Standard 1.1, .NET Standard 1.5, UWP, and .NET Core 1.0 or later.</description>
+    <description>Includes the version-independent runner for xUnit.net to run both v1.9.2 and v2.0+ tests (xunit.runner.utility.*.dll). Supports .NET 3.5, .NET 4.5.2 or later, .NET Standard 1.1, .NET Standard 1.5, and .NET Core 1.0 or later.</description>
     <copyright>Copyright (C) .NET Foundation</copyright>
     <repository type="git" url="https://github.com/xunit/xunit" commit="$GitCommitId$" />
     <dependencies>
@@ -34,9 +34,6 @@
         <dependency id="System.Runtime.Loader" version="4.0.0" />
         <dependency id="xunit.abstractions" version="2.0.3" />
       </group>
-      <group targetFramework="uap10.0">
-        <dependency id="xunit.abstractions" version="2.0.3" />
-      </group>
     </dependencies>
   </metadata>
   <files>
@@ -57,9 +54,5 @@
 
     <file src="xunit.runner.utility\bin\$Configuration$\netcoreapp1.0\xunit.runner.utility.netcoreapp10.dll" target="lib\netcoreapp1.0\" />
     <file src="xunit.runner.utility\bin\$Configuration$\netcoreapp1.0\xunit.runner.utility.netcoreapp10.xml" target="lib\netcoreapp1.0\" />
-
-    <file src="xunit.runner.utility\bin\$Configuration$\uap10.0\xunit.runner.utility.uwp10.dll" target="lib\uap10.0\" />
-    <file src="xunit.runner.utility\bin\$Configuration$\uap10.0\xunit.runner.utility.uwp10.xml" target="lib\uap10.0\" />
-    <file src="xunit.runner.utility\bin\$Configuration$\uap10.0\xunit.runner.utility.uwp10.pri" target="lib\uap10.0\" />
   </files>
 </package>
diff --git a/src/xunit.runner.utility/Properties/AssemblyInfo.cs b/src/xunit.runner.utility/Properties/AssemblyInfo.cs
@@ -13,8 +13,6 @@
 [assembly: AssemblyTitle("xUnit.net Runner Utility (.NET Standard 2.0)")]
 #elif NETCOREAPP1_0
 [assembly: AssemblyTitle("xUnit.net Runner Utility (.NET Core 1.0)")]
-#elif WINDOWS_UAP
-[assembly: AssemblyTitle("xUnit.net Runner Utility (Universal Windows 10.0)")]
 #else
 #error Unknown target platform
 #endif

diff --git a/src/xunit.runner.utility/Resources/xunit.runner.utility.uwp10.rd.xml b/src/xunit.runner.utility/Resources/xunit.runner.utility.uwp10.rd.xml
diff --git a/src/xunit.runner.utility/Utility/DiaSession.cs b/src/xunit.runner.utility/Utility/DiaSession.cs
@@ -56,15 +56,7 @@ public DiaNavigationData GetNavigationData(string typeName, string methodName, s
                         typeName = typeName.Substring(0, idx);
 
                     if (!wrappedSessions.ContainsKey(owningAssemblyFilename))
-                    {
-#if WINDOWS_UAP
-                        // Use overload with search path since pdb isn't next to the exe
-                        wrappedSessions[owningAssemblyFilename] = (IDisposable)Activator.CreateInstance(typeDiaSession, owningAssemblyFilename,
-                            Windows.ApplicationModel.Package.Current.InstalledLocation.Path);
-#else
                         wrappedSessions[owningAssemblyFilename] = (IDisposable)Activator.CreateInstance(typeDiaSession, owningAssemblyFilename);
-#endif
-                    }
 
                     var data = methodGetNavigationData.Invoke(wrappedSessions[owningAssemblyFilename], new[] { typeName, methodName });
                     if (data == null)

diff --git a/src/xunit.runner.utility/Utility/DiaSessionWrapperHelper_DotNet.cs b/src/xunit.runner.utility/Utility/DiaSessionWrapperHelper_DotNet.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD1_5 || NETCOREAPP || WINDOWS_UAP
+#if NETSTANDARD1_5 || NETCOREAPP
 
 using System;
 using System.Collections.Generic;
@@ -60,13 +60,7 @@ public void Normalize(ref string typeName, ref string methodName, ref string ass
                     {
                         // DiaSession only ever wants you to ask for the declaring type
                         typeName = method.DeclaringType.FullName;
-
-#if WINDOWS_UAP
-                        assemblyPath = Path.Combine(Windows.ApplicationModel.Package.Current.InstalledLocation.Path, assemblyPath);
-#else
                         assemblyPath = method.DeclaringType.GetAssembly().Location;
-#endif
-
                         var stateMachineType = method.GetCustomAttribute<AsyncStateMachineAttribute>()?.StateMachineType;
 
                         if (stateMachineType != null)

diff --git a/src/xunit.runner.utility/Utility/DiaSessionWrapper_DotNet.cs b/src/xunit.runner.utility/Utility/DiaSessionWrapper_DotNet.cs
@@ -1,10 +1,10 @@
-#if NETSTANDARD1_5 || NETCOREAPP || WINDOWS_UAP
+#if NETSTANDARD1_5 || NETCOREAPP
 
 using System;
 
 namespace Xunit
 {
-    // This class wraps DiaSession, and uses DiaSessionWrapperHelper  discover when a test is an async test 
+    // This class wraps DiaSession, and uses DiaSessionWrapperHelper  discover when a test is an async test
     // (since that requires special handling by DIA).
     class DiaSessionWrapper : IDisposable
     {

diff --git a/src/xunit.runner.utility/xunit.runner.utility.csproj b/src/xunit.runner.utility/xunit.runner.utility.csproj
@@ -1,16 +1,14 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <AssemblyName Condition=" '$(TargetFramework)' == 'net35' ">xunit.runner.utility.net35</AssemblyName>
     <AssemblyName Condition=" '$(TargetFramework)' == 'net452' ">xunit.runner.utility.net452</AssemblyName>
     <AssemblyName Condition=" '$(TargetFramework)' == 'netstandard1.1' ">xunit.runner.utility.netstandard11</AssemblyName>
     <AssemblyName Condition=" '$(TargetFramework)' == 'netstandard1.5' ">xunit.runner.utility.netstandard15</AssemblyName>
     <AssemblyName Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">xunit.runner.utility.netcoreapp10</AssemblyName>
-    <AssemblyName Condition=" '$(TargetFramework)' == 'uap10.0' ">xunit.runner.utility.uwp10</AssemblyName>
-    <DefineConstants Condition=" '$(TargetFramework)' == 'uap10.0' ">$(DefineConstants);WINDOWS_UAP</DefineConstants>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <RootNamespace>Xunit</RootNamespace>
-    <TargetFrameworks>net35;net452;netstandard1.1;netstandard1.5;netcoreapp1.0;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net35;net452;netstandard1.1;netstandard1.5;netcoreapp1.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -60,8 +58,4 @@
     <PackageReference Include="System.Runtime.Loader" Version="4.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <EmbeddedResource Include="Resources\xunit.runner.utility.uwp10.rd.xml" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
 
-  <Import Condition=" '$(MSBuildProjectName)' != 'test.utility' and '$(MSBuildProjectName)' != 'test.harness.uwp' " Project="..\src\xunit.core\build\xunit.core.props" />
+  <Import Condition=" '$(MSBuildProjectName)' != 'test.utility' " Project="..\src\xunit.core\build\xunit.core.props" />
 
   <Import Condition=" '$(_Xunit_ImportPropsFile)' != '' " Project="$(_Xunit_ImportPropsFile)" />
 
@@ -26,13 +26,8 @@
     </Content>
   </ItemGroup>
 
-  <!-- Need this Choose/When for legacy projects (UWP) in the IDE -->
-  <Choose>
-    <When Condition=" '$(MSBuildProjectName)' != 'test.utility' AND '$(MSBuildProjectName)' != 'test.xunit1' and '$(MSBuildProjectName)' != 'test.harness.uwp'  ">
-      <ItemGroup>
-        <ProjectReference Include="$(MSBuildThisFileDirectory)test.utility\test.utility.csproj" />
-      </ItemGroup>
-    </When>
-  </Choose>
+  <ItemGroup Condition=" '$(MSBuildProjectName)' != 'test.utility' AND '$(MSBuildProjectName)' != 'test.xunit1' ">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)test.utility\test.utility.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
 
-  <Import Condition=" '$(MSBuildProjectName)' != 'test.utility' and '$(MSBuildProjectName)' != 'test.harness.uwp'  " Project="..\src\xunit.core\build\xunit.core.targets" />
+  <Import Condition=" '$(MSBuildProjectName)' != 'test.utility' " Project="..\src\xunit.core\build\xunit.core.targets" />
 
   <Import Condition=" '$(_Xunit_ImportTargetsFile)' != '' " Project="$(_Xunit_ImportTargetsFile)" />