Skip to content

Commit 3d791b4

Browse files
committed
Fix assembly attribute for F# projects
1 parent 6b38a2b commit 3d791b4

7 files changed

Lines changed: 30 additions & 16 deletions

Meziantou.Xunit.v3.ParallelTestFramework.Tests/Meziantou.Xunit.v3.ParallelTestFramework.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ImportGroup>
26-
<Import Project="../Meziantou.Xunit.v3.ParallelTestFramework/build/Meziantou.Xunit.v3.ParallelTestFramework.props" />
26+
<Import Project="../Meziantou.Xunit.v3.ParallelTestFramework/build/Meziantou.Xunit.v3.ParallelTestFramework.targets" />
2727
</ImportGroup>
2828

2929
<ItemGroup>

Meziantou.Xunit.v3.ParallelTestFramework/Meziantou.Xunit.v3.ParallelTestFramework.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<IsPackable>True</IsPackable>
99
<PackageReadmeFile>README.md</PackageReadmeFile>
1010
<RootNamespace>Meziantou.Xunit.v3</RootNamespace>
11-
<Version>1.0.1</Version>
11+
<Version>1.0.2</Version>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
namespace global
2+
3+
[<assembly: Xunit.TestFramework(typeof<Meziantou.Xunit.v3.ParallelTestFramework>)>]
4+
do ()

Meziantou.Xunit.v3.ParallelTestFramework/build/Meziantou.Xunit.v3.ParallelTestFramework.props

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
<PropertyGroup>
3+
<IncludeMeziantouXunitParallelTestFramework Condition="'$(IncludeMeziantouXunitParallelTestFramework)' == ''">true</IncludeMeziantouXunitParallelTestFramework>
4+
</PropertyGroup>
5+
6+
<Choose>
7+
<When Condition="'$(Language)'=='F#'">
8+
<ItemGroup Condition="$(IncludeMeziantouXunitParallelTestFramework) == 'true'">
9+
<Compile Include="$(MSBuildThisFileDirectory)Assembly.fs" Visible="false" />
10+
</ItemGroup>
11+
</When>
12+
<Otherwise>
13+
<ItemGroup>
14+
<AssemblyAttribute Include="Xunit.TestFramework" Condition="$(IncludeMeziantouXunitParallelTestFramework) == 'true'">
15+
<_Parameter1>Meziantou.Xunit.v3.ParallelTestFramework</_Parameter1>
16+
<_Parameter1_TypeName>System.Type</_Parameter1_TypeName>
17+
</AssemblyAttribute>
18+
</ItemGroup>
19+
</Otherwise>
20+
</Choose>
21+
</Project>

Meziantou.Xunit.v3.ParallelTestFramework/buildMultiTargeting/Meziantou.Xunit.v3.ParallelTestFramework.props

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)/../build/$(MSBuildThisFile)" />
3+
</Project>

0 commit comments

Comments
 (0)