Skip to content

Commit 5bb45ae

Browse files
martincostellomartincostello
authored
Use BuildKit (#870)
Use MartinCostello.BuildKit and remove lots of custom MSBuild properties and targets.
1 parent 66bb270 commit 5bb45ae

File tree

10 files changed

+16
-138
lines changed

10 files changed

+16
-138
lines changed

‎.github/workflows/bump-version.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,24 @@ jobs:
4040
4141
$xml = [xml](Get-Content $properties)
4242
$versionPrefix = $xml.SelectSingleNode('Project/PropertyGroup/VersionPrefix')
43+
$publishedVersion = $versionPrefix.InnerText
4344
4445
if (-Not [string]::IsNullOrEmpty(${env:NEXT_VERSION})) {
4546
$version = [System.Version]::new(${env:NEXT_VERSION})
4647
$assemblyVersionProperty = $xml.SelectSingleNode('Project/PropertyGroup/AssemblyVersion')
4748
$assemblyVersion = [System.Version]::new($version.Major, ($version.Major -eq 0 ? $version.Minor : 0), 0, 0)
4849
$assemblyVersionProperty.InnerText = $assemblyVersion.ToString()
4950
} else {
50-
$version = [System.Version]::new($versionPrefix.InnerText)
51+
$version = [System.Version]::new($publishedVersion)
5152
$version = [System.Version]::new($version.Major, $version.Minor, $version.Build + 1)
5253
}
5354
5455
$updatedVersion = $version.ToString()
5556
$versionPrefix.InnerText = $updatedVersion
5657
58+
$packageValidationBaselineVersion = $xml.SelectSingleNode('Project/PropertyGroup/PackageValidationBaselineVersion')
59+
$packageValidationBaselineVersion.InnerText = $publishedVersion
60+
5761
$settings = New-Object System.Xml.XmlWriterSettings
5862
$settings.Encoding = New-Object System.Text.UTF8Encoding($false)
5963
$settings.Indent = $true

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ bin
1313
Bin
1414
coverage
1515
coverage.*
16+
MSBuild_Logs/
1617
obj
1718
packages
1819
TestResults

‎Directory.Build.props‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,32 @@
11
<Project>
22
<ItemGroup>
3-
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
43
<AssemblyAttribute Include="System.CLSCompliant">
54
<_Parameter1>false</_Parameter1>
65
<_Parameter1_IsLiteral>true</_Parameter1_IsLiteral>
76
</AssemblyAttribute>
87
</ItemGroup>
98
<PropertyGroup>
10-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
11-
<AnalysisMode>All</AnalysisMode>
129
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Logging.XUnit.snk</AssemblyOriginatorKeyFile>
13-
<Authors>martin_costello</Authors>
14-
<ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
1510
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Logging.XUnit.ruleset</CodeAnalysisRuleSet>
16-
<Company>https://github.com/martincostello/xunit-logging</Company>
17-
<ContinuousIntegrationBuild Condition=" '$(CI)' != '' ">true</ContinuousIntegrationBuild>
18-
<Copyright>Martin Costello (c) $([System.DateTime]::Now.ToString(yyyy))</Copyright>
19-
<Deterministic>true</Deterministic>
20-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
21-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
22-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
23-
<GenerateDocumentationFile>false</GenerateDocumentationFile>
24-
<GenerateGitMetadata Condition=" '$(CI)' != '' and '$(GenerateGitMetadata)' == '' ">true</GenerateGitMetadata>
25-
<ImplicitUsings>enable</ImplicitUsings>
26-
<LangVersion>latest</LangVersion>
2711
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
28-
<NeutralLanguage>en-US</NeutralLanguage>
2912
<NuGetAuditMode>direct</NuGetAuditMode>
30-
<Nullable>enable</Nullable>
31-
<PackageIcon>package-icon.png</PackageIcon>
32-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
33-
<PackageProjectUrl>https://github.com/martincostello/xunit-logging</PackageProjectUrl>
34-
<PackageReadmeFile>package-readme.md</PackageReadmeFile>
35-
<PackageReleaseNotes>See $(PackageProjectUrl)/releases for details.</PackageReleaseNotes>
36-
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
3713
<PackageTags>xunit;logging</PackageTags>
38-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
39-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
40-
<RepositoryType>git</RepositoryType>
41-
<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
42-
<SignAssembly>true</SignAssembly>
43-
<StrongNamePublicKey Condition=" '$(SignAssembly)' == 'true'">00240000048000009400000006020000002400005253413100040000010001004b0b2efbada897147aa03d2076278890aefe2f8023562336d206ec8a719b06e89461c31b43abec615918d509158629f93385930c030494509e418bf396d69ce7dbe0b5b2db1a81543ab42777cb98210677fed69dbeb3237492a7ad69e87a1911ed20eb2d7c300238dc6f6403e3d04a1351c5cb369de4e022b18fbec70f7d21ed</StrongNamePublicKey>
44-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
45-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4614
<UseArtifactsOutput>true</UseArtifactsOutput>
4715
<AssemblyVersion>0.5.0.0</AssemblyVersion>
16+
<PackageValidationBaselineVersion>0.5.0</PackageValidationBaselineVersion>
4817
<VersionPrefix>0.5.2</VersionPrefix>
4918
</PropertyGroup>
50-
<PropertyGroup Condition=" '$(GITHUB_ACTIONS)' != '' AND '$(DEPENDABOT_JOB_ID)' == '' ">
51-
<VersionSuffix Condition=" '$(VersionSuffix)' == '' AND '$(GITHUB_HEAD_REF)' == '' ">beta.$(GITHUB_RUN_NUMBER)</VersionSuffix>
52-
<VersionSuffix Condition=" '$(VersionSuffix)' == '' AND '$(GITHUB_HEAD_REF)' != '' ">pr.$(GITHUB_REF_NAME.Replace('/merge', '')).$(GITHUB_RUN_NUMBER)</VersionSuffix>
53-
<VersionPrefix Condition=" $(GITHUB_REF.StartsWith(`refs/tags/v`)) ">$(GITHUB_REF.Replace('refs/tags/v', ''))</VersionPrefix>
54-
<VersionSuffix Condition=" $(GITHUB_REF.StartsWith(`refs/tags/v`)) "></VersionSuffix>
55-
<FileVersion Condition=" '$(GITHUB_RUN_NUMBER)' != '' ">$(VersionPrefix).$(GITHUB_RUN_NUMBER)</FileVersion>
56-
</PropertyGroup>
5719
<PropertyGroup Condition=" '$(EnableReferenceTrimmer)' != 'false' and '$(GenerateDocumentationFile)' != 'true' ">
5820
<GenerateDocumentationFile>true</GenerateDocumentationFile>
5921
<NoWarn>$(NoWarn);419;1570;1573;1574;1584;1591;SA0001;SA1602</NoWarn>
6022
</PropertyGroup>
61-
<ItemGroup Condition=" '$(PackageIcon)' != '' ">
62-
<None Include="$(MSBuildThisFileDirectory)$(PackageIcon)" Pack="True" PackagePath="" />
63-
</ItemGroup>
64-
<ItemGroup Condition=" '$(PackageReadmeFile)' != '' ">
65-
<None Include="$(MSBuildThisFileDirectory)$(PackageReadmeFile)" Pack="True" PackagePath="" />
66-
</ItemGroup>
6723
<PropertyGroup Condition=" '$(BuildingInsideVisualStudio)' != 'true' ">
6824
<CollectCoverage>true</CollectCoverage>
6925
<CoverletOutputFormat>cobertura,json</CoverletOutputFormat>
7026
<Exclude>[SampleApp]*,[xunit.*]*</Exclude>
7127
<Threshold>93</Threshold>
7228
</PropertyGroup>
7329
<ItemGroup>
74-
<Using Include="System.Globalization" />
7530
<Using Include="Xunit" />
7631
<Using Include="Xunit.Sdk" />
7732
</ItemGroup>
@@ -81,7 +36,4 @@
8136
<ItemGroup Condition=" !$(DefineConstants.Contains('XUNIT_V3')) ">
8237
<Using Include="Xunit.Abstractions" />
8338
</ItemGroup>
84-
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
85-
<Using Include="Shouldly" />
86-
</ItemGroup>
8739
</Project>

‎Directory.Build.targets‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎Directory.Packages.props‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project>
22
<ItemGroup>
3+
<GlobalPackageReference Include="MartinCostello.BuildKit" Version="0.1.0" />
34
<GlobalPackageReference Include="ReferenceTrimmer" Version="3.3.11" PrivateAssets="All" />
45
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="All" />
56
</ItemGroup>
@@ -19,9 +20,4 @@
1920
<PackageVersion Include="xunit.v3" Version="2.0.0" />
2021
<PackageVersion Include="xunit.v3.extensibility.core" Version="2.0.0" />
2122
</ItemGroup>
22-
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
23-
<PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
24-
<PackageReference Include="GitHubActionsTestLogger" PrivateAssets="All" NoWarn="RT0003" />
25-
<PackageReference Include="ReportGenerator" PrivateAssets="All" />
26-
</ItemGroup>
2723
</Project>

‎Logging.XUnit.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
build.ps1 = build.ps1
1212
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
1313
Directory.Build.props = Directory.Build.props
14-
Directory.Build.targets = Directory.Build.targets
1514
Directory.Packages.props = Directory.Packages.props
1615
global.json = global.json
1716
LICENSE = LICENSE

‎src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,10 @@
88
<IsPackable>true</IsPackable>
99
<OutputType>Library</OutputType>
1010
<PackageId>MartinCostello.Logging.XUnit.v3</PackageId>
11-
<PackageValidationBaselineVersion>0.5.0</PackageValidationBaselineVersion>
1211
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
13-
<Summary>$(Description)</Summary>
1412
<TargetFrameworks>net8.0;net472</TargetFrameworks>
1513
<Title>xunit v3 Logging Extensions</Title>
1614
</PropertyGroup>
17-
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
18-
<IsAotCompatible>true</IsAotCompatible>
19-
</PropertyGroup>
2015
<ItemGroup>
2116
<Compile Include="..\Shared\**\*.cs" Link="%(Link)" />
2217
</ItemGroup>

‎src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@
77
<IsPackable>true</IsPackable>
88
<OutputType>Library</OutputType>
99
<PackageId>MartinCostello.Logging.XUnit</PackageId>
10-
<PackageValidationBaselineVersion>0.5.0</PackageValidationBaselineVersion>
1110
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
12-
<Summary>$(Description)</Summary>
1311
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
1412
<Title>xunit Logging Extensions</Title>
1513
</PropertyGroup>
16-
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
17-
<IsAotCompatible>true</IsAotCompatible>
18-
</PropertyGroup>
1914
<ItemGroup>
2015
<Compile Include="..\Shared\**\*.cs" Link="%(Link)" />
2116
</ItemGroup>

‎tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Tests for MartinCostello.Logging.XUnit.</Description>
4-
<IsPackable>false</IsPackable>
5-
<IsTestProject>true</IsTestProject>
6-
<NoWarn>$(NoWarn);CA1062;CA1707;CA1711;CA1861;CA2007;CA2234;SA1600;SA1602</NoWarn>
7-
<PreserveCompilationContext>true</PreserveCompilationContext>
4+
<NoWarn>$(NoWarn);CA2234;SA1602</NoWarn>
85
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
9-
<Summary>$(Description)</Summary>
106
<TargetFramework>net9.0</TargetFramework>
117
</PropertyGroup>
128
<ItemGroup>
@@ -19,9 +15,12 @@
1915
</ItemGroup>
2016
<ItemGroup>
2117
<FrameworkReference Include="Microsoft.AspNetCore.App" />
18+
<PackageReference Include="coverlet.msbuild" />
19+
<PackageReference Include="GitHubActionsTestLogger" NoWarn="RT0003" />
2220
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
2321
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2422
<PackageReference Include="NSubstitute" />
23+
<PackageReference Include="ReportGenerator" />
2524
<PackageReference Include="Shouldly" />
2625
<PackageReference Include="xunit" />
2726
<PackageReference Include="xunit.runner.visualstudio" />

‎tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22
<PropertyGroup>
33
<DefineConstants>$(DefineConstants);XUNIT_V3</DefineConstants>
44
<Description>Tests for MartinCostello.Logging.XUnit.v3.</Description>
5-
<IsPackable>false</IsPackable>
6-
<IsTestProject>true</IsTestProject>
7-
<NoWarn>$(NoWarn);CA1062;CA1707;CA1711;CA1861;CA2007;CA2234;SA1600;SA1602</NoWarn>
5+
<NoWarn>$(NoWarn);CA2234;SA1602</NoWarn>
86
<OutputType>Exe</OutputType>
9-
<PreserveCompilationContext>true</PreserveCompilationContext>
107
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
11-
<Summary>$(Description)</Summary>
128
<TargetFramework>net9.0</TargetFramework>
139
</PropertyGroup>
1410
<ItemGroup>
@@ -21,9 +17,12 @@
2117
</ItemGroup>
2218
<ItemGroup>
2319
<FrameworkReference Include="Microsoft.AspNetCore.App" />
20+
<PackageReference Include="coverlet.msbuild" />
21+
<PackageReference Include="GitHubActionsTestLogger" NoWarn="RT0003" />
2422
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
2523
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2624
<PackageReference Include="NSubstitute" />
25+
<PackageReference Include="ReportGenerator" />
2726
<PackageReference Include="Shouldly" />
2827
<PackageReference Include="xunit.runner.visualstudio" />
2928
<PackageReference Include="xunit.v3" />

0 commit comments

Comments
 (0)