Skip to content

Commit 81305a0

Browse files
committed
Apply new formatting
1 parent 28f36a9 commit 81305a0

File tree

4 files changed

+18
-22
lines changed

4 files changed

+18
-22
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<!-- Disable nullability warnings on older frameworks because there is no nullability info for BCL -->
15-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net462'">
15+
<PropertyGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))">
1616
<Nullable>annotations</Nullable>
1717
</PropertyGroup>
1818

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net9.0</TargetFramework>
5-
64
<!-- Prevent these tests from running by default, since they are intended to fail by design -->
75
<IsTestProject>false</IsTestProject>
86
</PropertyGroup>
9-
107
<ItemGroup>
118
<PackageReference Include="CSharpier.MsBuild" Version="1.0.2" PrivateAssets="all" />
129
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
1310
<PackageReference Include="xunit" Version="2.9.3" />
1411
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0" PrivateAssets="all" />
1512
</ItemGroup>
16-
1713
<ItemGroup>
1814
<ProjectReference Include="..\GitHubActionsTestLogger\GitHubActionsTestLogger.csproj" />
1915
</ItemGroup>
20-
21-
</Project>
16+
</Project>
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net9.0</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
86
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
97
</ItemGroup>
10-
118
<ItemGroup>
129
<PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="all" />
1310
<PackageReference Include="CSharpier.MsBuild" Version="1.0.2" PrivateAssets="all" />
@@ -16,9 +13,7 @@
1613
<PackageReference Include="xunit" Version="2.9.3" />
1714
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0" PrivateAssets="all" />
1815
</ItemGroup>
19-
2016
<ItemGroup>
2117
<ProjectReference Include="..\GitHubActionsTestLogger\GitHubActionsTestLogger.csproj" />
2218
</ItemGroup>
23-
24-
</Project>
19+
</Project>
Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFrameworks>netstandard2.0;net9.0</TargetFrameworks>
54
<IsPackable>true</IsPackable>
6-
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
7-
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
5+
<IsTrimmable
6+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))"
7+
>true</IsTrimmable
8+
>
9+
<IsAotCompatible
10+
Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))"
11+
>true</IsAotCompatible
12+
>
813
</PropertyGroup>
9-
1014
<PropertyGroup>
1115
<Authors>$(Company)</Authors>
1216
<Description>Custom test logger that reports test results in a structured format that GitHub Actions understands</Description>
@@ -17,17 +21,19 @@
1721
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1822
<DevelopmentDependency>true</DevelopmentDependency>
1923
</PropertyGroup>
20-
2124
<ItemGroup>
2225
<None Include="../favicon.png" Pack="true" PackagePath="" Visible="false" />
2326
</ItemGroup>
24-
2527
<ItemGroup>
2628
<PackageReference Include="CSharpier.MsBuild" Version="1.0.2" PrivateAssets="all" />
2729
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.14.0" />
2830
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
2931
<PackageReference Include="PolyShim" Version="1.15.0" PrivateAssets="all" />
30-
<PackageReference Include="RazorBlade" Version="0.9.0" ExcludeAssets="compile;runtime" PrivateAssets="all" />
32+
<PackageReference
33+
Include="RazorBlade"
34+
Version="0.9.0"
35+
ExcludeAssets="compile;runtime"
36+
PrivateAssets="all"
37+
/>
3138
</ItemGroup>
32-
33-
</Project>
39+
</Project>

0 commit comments

Comments
 (0)