Skip to content

Commit

Permalink
Simplify project files
Browse files Browse the repository at this point in the history
Move properties back to Directory.Build.props.
  • Loading branch information
martincostello committed Dec 20, 2024
1 parent 64a0647 commit 4361023
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 25 deletions.
11 changes: 11 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,16 @@
</PropertyGroup>
<ItemGroup>
<Using Include="System.Globalization" />
<Using Include="Xunit" />
<Using Include="Xunit.Sdk" />
</ItemGroup>
<ItemGroup Condition=" $(DefineConstants.Contains('XUNIT_V3')) ">
<Using Include="Xunit.v3" />
</ItemGroup>
<ItemGroup Condition=" !$(DefineConstants.Contains('XUNIT_V3')) ">
<Using Include="Xunit.Abstractions" />
</ItemGroup>
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
<Using Include="Shouldly" />
</ItemGroup>
</Project>
9 changes: 1 addition & 8 deletions src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@
<EnablePackageValidation>true</EnablePackageValidation>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
<IsTestProject>false</IsTestProject>
<OutputType>Library</OutputType>
<PackageId>MartinCostello.Logging.XUnit.v3</PackageId>
<!--
<PackageValidationBaselineVersion>0.4.0</PackageValidationBaselineVersion>
-->
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
<Summary>$(Description)</Summary>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
<TestProject>false</TestProject>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<Title>xunit v3 Logging Extensions</Title>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
Expand All @@ -34,9 +32,4 @@
</AssemblyAttribute>
<InternalsVisibleTo Include="MartinCostello.Logging.XUnit.v3.Tests" PublicKey="$(StrongNamePublicKey)" />
</ItemGroup>
<ItemGroup>
<Using Include="Xunit" />
<Using Include="Xunit.Sdk" />
<Using Include="Xunit.v3" />
</ItemGroup>
</Project>
5 changes: 0 additions & 5 deletions src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,4 @@
</AssemblyAttribute>
<InternalsVisibleTo Include="MartinCostello.Logging.XUnit.Tests" PublicKey="$(StrongNamePublicKey)" />
</ItemGroup>
<ItemGroup>
<Using Include="Xunit" />
<Using Include="Xunit.Abstractions" />
<Using Include="Xunit.Sdk" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,4 @@
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
</ItemGroup>
<ItemGroup>
<Using Include="Shouldly" />
<Using Include="Xunit" />
<Using Include="Xunit.Abstractions" />
<Using Include="Xunit.Sdk" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,4 @@
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit.v3" />
</ItemGroup>
<ItemGroup>
<Using Include="Shouldly" />
<Using Include="Xunit" />
<Using Include="Xunit.Sdk" />
<Using Include="Xunit.v3" />
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions tests/SampleApp/SampleApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@
<NoWarn>$(NoWarn);CA1801;CA1822;CA1861;SA1600;SA1601</NoWarn>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Using Remove="Xunit" />
<Using Remove="Xunit.Abstractions" />
<Using Remove="Xunit.Sdk" />
</ItemGroup>
</Project>

0 comments on commit 4361023

Please sign in to comment.