Packaging

Author: Youssef1313

src/Microsoft.VisualStudio.Extensibility.Testing.Xunit.Shared/Microsoft.VisualStudio.Extensibility.Testing.Xunit.Shared.projitems

@@ -63,7 +63,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Threading\WpfTestSharedData.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)VisualStudioVersion.cs" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsXUnit3)' != 'true'">
     <Content Include="$(MSBuildThisFileDirectory)build\Microsoft.VisualStudio.Extensibility.Testing.Xunit.props" PackagePath="build" />
     <Content Include="$(MSBuildThisFileDirectory)build\Microsoft.VisualStudio.Extensibility.Testing.Xunit.targets" PackagePath="build" />
   </ItemGroup>

src/Microsoft.VisualStudio.Extensibility.Testing.Xunit.Shared/build/Microsoft.VisualStudio.Extensibility.Testing.Xunit.targets

@@ -6,8 +6,6 @@
     <GenerateTestFrameworkAttribute Condition="'$(GenerateTestFrameworkAttribute)' == ''">true</GenerateTestFrameworkAttribute>
   </PropertyGroup>
 
-  <!-- TODO: In xUnit 3, the attribute has a single parameter Type. -->
-  <!-- The generation should be like [assembly: global::Xunit.TestFrameworkAttribute(typeof(global::Xunit.Harness.IdeTestFramework))] -->
   <ItemGroup Condition="'$(GenerateTestFrameworkAttribute)' == 'true'">
     <AssemblyAttribute Include="Xunit.TestFrameworkAttribute">
       <_Parameter1>Xunit.Harness.IdeTestFramework</_Parameter1>

src/Microsoft.VisualStudio.Extensibility.Testing.Xunit.v3/Microsoft.VisualStudio.Extensibility.Testing.Xunit.v3.csproj

@@ -4,6 +4,7 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <RootNamespace>Xunit</RootNamespace>
+    <IsXUnit3>true</IsXUnit3>
     <DefineConstants>$(DefineConstants);MERGED_PIA;USES_XUNIT_3</DefineConstants>
 
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -45,4 +46,8 @@
 
   <Import Project="..\Microsoft.VisualStudio.Extensibility.Testing.Xunit.Shared\Microsoft.VisualStudio.Extensibility.Testing.Xunit.Shared.projitems" Label="Shared" />
 
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)build\Microsoft.VisualStudio.Extensibility.Testing.Xunit.v3.props" PackagePath="build" />
+    <Content Include="$(MSBuildThisFileDirectory)build\Microsoft.VisualStudio.Extensibility.Testing.Xunit.v3.targets" PackagePath="build" />
+  </ItemGroup>
 </Project>

src/Microsoft.VisualStudio.Extensibility.Testing.Xunit.v3/build/Microsoft.VisualStudio.Extensibility.Testing.Xunit.v3.props

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>

src/Microsoft.VisualStudio.Extensibility.Testing.Xunit.v3/build/Microsoft.VisualStudio.Extensibility.Testing.Xunit.v3.targets

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- This file might be evaluated before GenerateAssemblyInfo is set to its default value, so account for both cases. -->
+  <PropertyGroup Condition="'$(GenerateAssemblyInfo)' == '' OR '$(GenerateAssemblyInfo)' == 'true'">
+    <GenerateTestFrameworkAttribute Condition="'$(GenerateTestFrameworkAttribute)' == ''">true</GenerateTestFrameworkAttribute>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(GenerateTestFrameworkAttribute)' == 'true'">
+    <AssemblyAttribute Include="Xunit.TestFrameworkAttribute">
+      <_Parameter1>Xunit.Harness.IdeTestFramework</_Parameter1>
+      <_Parameter1_TypeName>System.Type</_Parameter1_TypeName>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+</Project>