From c3b7aeecb417af92a2b7d82d42d8344021c2b127 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Mon, 19 May 2025 04:18:23 +0200 Subject: [PATCH 1/3] add build script for nuget packages --- .gitignore | 1 + scripts/build-and-package.ps1 | 58 +++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 scripts/build-and-package.ps1 diff --git a/.gitignore b/.gitignore index 2005190..6ac846f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ obj /.nuget/NuGet.Config /.nuget/NuGet.exe /.nuget/NuGet.targets +*.cache diff --git a/scripts/build-and-package.ps1 b/scripts/build-and-package.ps1 new file mode 100644 index 0000000..ebeb3bc --- /dev/null +++ b/scripts/build-and-package.ps1 @@ -0,0 +1,58 @@ +# Requires -Version 7 + +param( + [Parameter(Mandatory = $true)] + [string] + $Version +) + +function BuildAll { + param( + [Parameter(Mandatory = $true)] + [string] + $Version, + + [Parameter(Mandatory = $true)] + [string] + $Configuration + ) + + msbuild /p:Configuration=$Configuration XMLUnit.NET.NetFramework.sln + msbuild /p:Configuration=$Configuration src/main/net-constraints-nunit4/NetFramework/XMLUnit.NUnit4.Constraints.NetFramework.csproj + + dotnet build XMLUnit.NET.sln -c $Configuration + dotnet build src/main/net-constraints-nunit4/XMLUnit.NUnit4.Constraints.csproj -c $Configuration +} + +function BuildNugetPackage { + param( + [Parameter(Mandatory = $true)] + [string] + $Version, + + [Parameter(Mandatory = $true)] + [string] + $Spec + ) + + nuget pack $Spec -Symbols -OutputDirectory build\ -Properties "version=$Version" +} + +$env:DOTNET_ROLL_FORWARD = "Major" + +dotnet restore XMLUnit.NET.sln + +BuildAll -Version $Version -Configuration Debug + +dotnet test src/tests/net-core/XMLUnit.Core.Tests.csproj +dotnet test src/tests/net-constraints-nunit3/XMLUnit.NUnit3.Constraints.Test.csproj +dotnet test src/tests/net-placeholders/XMLUnit.Placeholders.Tests.csproj +dotnet test src/tests/net-constraints-nunit4/XMLUnit.NUnit4.Constraints.Test.csproj + +BuildAll -Version $Version -Configuration Release + +BuildNugetPackage -Version $Version -Spec src\main\net-core\XMLUnit.Core.nuspec +BuildNugetPackage -Version $Version -Spec src\main\net-constraints-nunit2\XMLUnit.NUnit2.Constraints.nuspec +BuildNugetPackage -Version $Version -Spec src\main\net-constraints-nunit3\XMLUnit.NUnit3.Constraints.nuspec +BuildNugetPackage -Version $Version -Spec src\main\net-constraints-nunit4\XMLUnit.NUnit4.Constraints.nuspec +BuildNugetPackage -Version $Version -Spec src\main\net-placeholders\XMLUnit.Placeholders.nuspec From 13049f69cab20545c963d2757adc2a123527fc3c Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Mon, 19 May 2025 04:23:08 +0200 Subject: [PATCH 2/3] prepare 2.11.1 release --- RELEASE_NOTES.md | 2 +- src/shared/CommonAssemblyInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 43bde69..d035166 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,6 @@ # Release Notes -## XMLUnit.NET 2.11.1 - /Not Released, yet/ +## XMLUnit.NET 2.11.1 - /Released 2025-05-19/ * placeholders can now also be used inside of the local part of `xsi:type` attributes. PR [#49](https://github.com/xmlunit/xmlunit.net/pull/49) diff --git a/src/shared/CommonAssemblyInfo.cs b/src/shared/CommonAssemblyInfo.cs index e983d88..fda8c82 100644 --- a/src/shared/CommonAssemblyInfo.cs +++ b/src/shared/CommonAssemblyInfo.cs @@ -26,7 +26,7 @@ namespace Org.XmlUnit internal static class XmlUnitVersion { internal const string ApiVersion = "2.11.1"; - internal const string AssemblyVersion = ApiVersion + ".283"; - internal const string Version = ApiVersion + "-alpha"; + internal const string AssemblyVersion = ApiVersion + ".314"; + internal const string Version = ApiVersion; } } From 4fe3a9cdcbe9df3bda9906de40305c35ba2d1c36 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Mon, 19 May 2025 05:00:29 +0200 Subject: [PATCH 3/3] prepare next release cycle --- RELEASE_NOTES.md | 2 ++ appveyor.yml | 2 +- create-dist.sh | 2 +- src/doc/monodoc/core/index.xml | 2 +- src/shared/CommonAssemblyInfo.cs | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d035166..ab843eb 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,7 @@ # Release Notes +## XMLUnit.NET 2.11.2 - /not released, yet/ + ## XMLUnit.NET 2.11.1 - /Released 2025-05-19/ * placeholders can now also be used inside of the local part of `xsi:type` attributes. diff --git a/appveyor.yml b/appveyor.yml index 98d9c27..f7d8979 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.11.1.{build} +version: 2.11.2.{build} image: - Ubuntu2204 diff --git a/create-dist.sh b/create-dist.sh index 840fb55..ff8dde1 100755 --- a/create-dist.sh +++ b/create-dist.sh @@ -22,7 +22,7 @@ if [ $# -lt 1 ]; then fi mkdir -p build/bindist-tmp/xmlunit-$1 -cp README.md LICENSE RELEASE_NOTES.md build/bindist-tmp/xmlunit-$1 +cp README.md LICENSE RELEASE_NOTES.md build/cyclonedx/* build/bindist-tmp/xmlunit-$1 for d in Debug Release; do mkdir -p build/bindist-tmp/xmlunit-$1/NetFramework/$d mkdir -p build/bindist-tmp/xmlunit-$1/netstandard2.0/$d diff --git a/src/doc/monodoc/core/index.xml b/src/doc/monodoc/core/index.xml index 6c3185e..c21a2c8 100644 --- a/src/doc/monodoc/core/index.xml +++ b/src/doc/monodoc/core/index.xml @@ -62,5 +62,5 @@ under the Apache License, Version 2.0. - XMLUnit.NET 2.11.1 + XMLUnit.NET 2.11.2 diff --git a/src/shared/CommonAssemblyInfo.cs b/src/shared/CommonAssemblyInfo.cs index fda8c82..a3f9fe5 100644 --- a/src/shared/CommonAssemblyInfo.cs +++ b/src/shared/CommonAssemblyInfo.cs @@ -25,8 +25,8 @@ namespace Org.XmlUnit { internal static class XmlUnitVersion { - internal const string ApiVersion = "2.11.1"; + internal const string ApiVersion = "2.11.2"; internal const string AssemblyVersion = ApiVersion + ".314"; - internal const string Version = ApiVersion; + internal const string Version = ApiVersion + "-alpha"; } }