diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index cf3d78d7..785d7a22 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -40,6 +40,7 @@ jobs:
$xml = [xml](Get-Content $properties)
$versionPrefix = $xml.SelectSingleNode('Project/PropertyGroup/VersionPrefix')
+ $publishedVersion = $versionPrefix.InnerText
if (-Not [string]::IsNullOrEmpty(${env:NEXT_VERSION})) {
$version = [System.Version]::new(${env:NEXT_VERSION})
@@ -47,13 +48,16 @@ jobs:
$assemblyVersion = [System.Version]::new($version.Major, ($version.Major -eq 0 ? $version.Minor : 0), 0, 0)
$assemblyVersionProperty.InnerText = $assemblyVersion.ToString()
} else {
- $version = [System.Version]::new($versionPrefix.InnerText)
+ $version = [System.Version]::new($publishedVersion)
$version = [System.Version]::new($version.Major, $version.Minor, $version.Build + 1)
}
$updatedVersion = $version.ToString()
$versionPrefix.InnerText = $updatedVersion
+ $packageValidationBaselineVersion = $xml.SelectSingleNode('Project/PropertyGroup/PackageValidationBaselineVersion')
+ $packageValidationBaselineVersion.InnerText = $publishedVersion
+
$settings = New-Object System.Xml.XmlWriterSettings
$settings.Encoding = New-Object System.Text.UTF8Encoding($false)
$settings.Indent = $true
diff --git a/.gitignore b/.gitignore
index aced40db..96dd0624 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ bin
Bin
coverage
coverage.*
+MSBuild_Logs/
obj
packages
TestResults
diff --git a/Directory.Build.props b/Directory.Build.props
index 106ea745..e571c90c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,69 +1,25 @@
-
<_Parameter1>false
<_Parameter1_IsLiteral>true
- $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
- All
$(MSBuildThisFileDirectory)Logging.XUnit.snk
- martin_costello
- SHA256
$(MSBuildThisFileDirectory)Logging.XUnit.ruleset
- https://github.com/martincostello/xunit-logging
- true
- Martin Costello (c) $([System.DateTime]::Now.ToString(yyyy))
- true
- true
- true
- true
- false
- true
- enable
- latest
true
- en-US
direct
- enable
- package-icon.png
- Apache-2.0
- https://github.com/martincostello/xunit-logging
- package-readme.md
- See $(PackageProjectUrl)/releases for details.
- false
xunit;logging
- true
- true
- git
- $(PackageProjectUrl).git
- true
- 00240000048000009400000006020000002400005253413100040000010001004b0b2efbada897147aa03d2076278890aefe2f8023562336d206ec8a719b06e89461c31b43abec615918d509158629f93385930c030494509e418bf396d69ce7dbe0b5b2db1a81543ab42777cb98210677fed69dbeb3237492a7ad69e87a1911ed20eb2d7c300238dc6f6403e3d04a1351c5cb369de4e022b18fbec70f7d21ed
- snupkg
- true
true
0.5.0.0
+ 0.5.0
0.5.2
-
- beta.$(GITHUB_RUN_NUMBER)
- pr.$(GITHUB_REF_NAME.Replace('/merge', '')).$(GITHUB_RUN_NUMBER)
- $(GITHUB_REF.Replace('refs/tags/v', ''))
-
- $(VersionPrefix).$(GITHUB_RUN_NUMBER)
-
true
$(NoWarn);419;1570;1573;1574;1584;1591;SA0001;SA1602
-
-
-
-
-
-
true
cobertura,json
@@ -71,7 +27,6 @@
93
-
@@ -81,7 +36,4 @@
-
-
-
diff --git a/Directory.Build.targets b/Directory.Build.targets
deleted file mode 100644
index d3d7c164..00000000
--- a/Directory.Build.targets
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
- $(BUILD_SOURCEBRANCHNAME)
- $(GITHUB_REF_NAME)
- $(GITHUB_SHA)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $([System.IO.Path]::Combine($(ArtifactsPath), 'coverage', 'coverage'))
- true
- HTML
- $(ReportGeneratorReportTypes);MarkdownSummaryGitHub
- $([System.IO.Path]::Combine($(ArtifactsPath), 'coverage'))
-
-
-
-
- <_ReportSummaryContent><details><summary>:chart_with_upwards_trend: <b>$(AssemblyName) Code Coverage report</b></summary>
- <_ReportSummaryContent>$(_ReportSummaryContent)$([System.Environment]::NewLine)
- <_ReportSummaryContent>$(_ReportSummaryContent)$([System.Environment]::NewLine)
- <_ReportSummaryContent>$(_ReportSummaryContent)$([System.IO.File]::ReadAllText('$([System.IO.Path]::Combine($(ReportGeneratorTargetDirectory), 'SummaryGithub.md'))'))
- <_ReportSummaryContent>$(_ReportSummaryContent)$([System.Environment]::NewLine)
- <_ReportSummaryContent>$(_ReportSummaryContent)$([System.Environment]::NewLine)
- <_ReportSummaryContent>$(_ReportSummaryContent)</details>
-
-
-
-
-
- <_PackageNamesPath>$(ArtifactsPath)\package-names.txt
-
-
-
-
-
- <_PackageNames Include="$(PackageId)" />
-
-
-
-
-
- <_UniquePackageNames>@(_UniquePackageNames->'%(Identity)', ',')
-
-
-
-
-
-
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 56d28016..1dad6d24 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,5 +1,6 @@
+
@@ -19,9 +20,4 @@
-
-
-
-
-
diff --git a/Logging.XUnit.sln b/Logging.XUnit.sln
index 1564adb4..cb5285f3 100644
--- a/Logging.XUnit.sln
+++ b/Logging.XUnit.sln
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
build.ps1 = build.ps1
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
Directory.Build.props = Directory.Build.props
- Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props
global.json = global.json
LICENSE = LICENSE
diff --git a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj
index 136a101f..0529c3d7 100644
--- a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj
+++ b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj
@@ -8,15 +8,10 @@
true
Library
MartinCostello.Logging.XUnit.v3
- 0.5.0
MartinCostello.Logging.XUnit
- $(Description)
net8.0;net472
xunit v3 Logging Extensions
-
- true
-
diff --git a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj
index f282c84f..a03cdac4 100644
--- a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj
+++ b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj
@@ -7,15 +7,10 @@
true
Library
MartinCostello.Logging.XUnit
- 0.5.0
MartinCostello.Logging.XUnit
- $(Description)
netstandard2.0;net8.0
xunit Logging Extensions
-
- true
-
diff --git a/tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj b/tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj
index f52f0ea5..95a94cee 100644
--- a/tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj
+++ b/tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj
@@ -1,12 +1,8 @@
Tests for MartinCostello.Logging.XUnit.
- false
- true
- $(NoWarn);CA1062;CA1707;CA1711;CA1861;CA2007;CA2234;SA1600;SA1602
- true
+ $(NoWarn);CA2234;SA1602
MartinCostello.Logging.XUnit
- $(Description)
net9.0
@@ -19,9 +15,12 @@
+
+
+
diff --git a/tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj b/tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj
index 0253a79e..73e6a5c4 100644
--- a/tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj
+++ b/tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj
@@ -2,13 +2,9 @@
$(DefineConstants);XUNIT_V3
Tests for MartinCostello.Logging.XUnit.v3.
- false
- true
- $(NoWarn);CA1062;CA1707;CA1711;CA1861;CA2007;CA2234;SA1600;SA1602
+ $(NoWarn);CA2234;SA1602
Exe
- true
MartinCostello.Logging.XUnit
- $(Description)
net9.0
@@ -21,9 +17,12 @@
+
+
+