From ed74871a268d16652159971bfc66a4d7651a5382 Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Thu, 16 Sep 2021 13:06:56 +0000 Subject: [PATCH] 1.4.21 --- CHANGELOG.md | 3 + Directory.Build.props | 56 ++++++++++-------- Generate-ReleaseNotes.cmd | 7 +++ GitHubReleaseNotes.txt | 3 - PackageReleaseNotes.template | 6 ++ PackageReleaseNotes.txt | 4 ++ WireMock.Net Solution.sln | 8 ++- .../WireMock.Net.Client.csproj | 2 +- .../WireMock.Net.Console.NET5.csproj | 3 +- .../WireMock.Net.Console.NETCoreApp.csproj | 2 +- .../WireMock.Net.Console.NETCoreApp2.csproj | 2 +- .../WireMock.Net.Console.NETCoreApp3.csproj | 2 +- ...WireMock.Net.Console.Net452.Classic.csproj | 2 +- ...eMock.Net.Console.Proxy.NETCoreApp2.csproj | 2 +- ...reMock.Net.Console.Proxy.NETCoreApp.csproj | 2 +- .../WireMock.Net.StandAlone.NETCoreApp.csproj | 3 +- .../WireMock.Net.StandAlone.Net452.csproj | 2 +- .../WireMock.Net-Logo.ico | Bin .../WireMock.Net-Logo.png | Bin 19 files changed, 66 insertions(+), 43 deletions(-) create mode 100644 Generate-ReleaseNotes.cmd delete mode 100644 GitHubReleaseNotes.txt create mode 100644 PackageReleaseNotes.template create mode 100644 PackageReleaseNotes.txt rename WireMock.Net-Logo.ico => resources/WireMock.Net-Logo.ico (100%) rename WireMock.Net-Logo.png => resources/WireMock.Net-Logo.png (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5db660239..ff9a18b2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.4.21 (16 September 2021) +- [#631](https://github.com/WireMock-Net/WireMock.Net/pull/631) - Add WireMock.org RestClient [feature] contributed by [StefH](https://github.com/StefH) + # 1.4.20 (06 August 2021) - [#628](https://github.com/WireMock-Net/WireMock.Net/pull/628) - Fix issue with FluentBuilder [bug] contributed by [StefH](https://github.com/StefH) - [#626](https://github.com/WireMock-Net/WireMock.Net/issues/626) - version 1.4.19 throws a lot of analyzer errors related to the BaseBuilder.cs [bug] diff --git a/Directory.Build.props b/Directory.Build.props index 42632d86a..f8f98a164 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,30 +1,36 @@ - - $(MsBuildAllProjects);$(MsBuildThisFileFullPath) - + + $(MsBuildAllProjects);$(MsBuildThisFileFullPath) + - - 1.4.21-preview-04 - See CHANGELOG.md - https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png - https://github.com/WireMock-Net/WireMock.Net - Apache-2.0 - git - https://github.com/WireMock-Net/WireMock.Net - ../../WireMock.Net-Logo.ico - + + 1.4.21 + See CHANGELOG.md + WireMock.Net-Logo.png + https://github.com/WireMock-Net/WireMock.Net + Apache-2.0 + $([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../../PackageReleaseNotes.txt")) + git + https://github.com/WireMock-Net/WireMock.Net + ../../resources/WireMock.Net-Logo.ico + - - true - + + true + - - - - - - $(Prerelease)-1$(BUILD_BUILDID) - - - + + + + + + + + + + + $(Prerelease)-1$(BUILD_BUILDID) + + + diff --git a/Generate-ReleaseNotes.cmd b/Generate-ReleaseNotes.cmd new file mode 100644 index 000000000..84b0ec0f7 --- /dev/null +++ b/Generate-ReleaseNotes.cmd @@ -0,0 +1,7 @@ +rem https://github.com/StefH/GitHubReleaseNotes + +SET version=1.4.21 + +GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% + +GitHubReleaseNotes --output PackageReleaseNotes.txt --skip-empty-releases --exclude-labels question invalid doc duplicate --template PackageReleaseNotes.template --version %version% \ No newline at end of file diff --git a/GitHubReleaseNotes.txt b/GitHubReleaseNotes.txt deleted file mode 100644 index d4344ae31..000000000 --- a/GitHubReleaseNotes.txt +++ /dev/null @@ -1,3 +0,0 @@ -https://github.com/StefH/GitHubReleaseNotes - -GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version 1.4.20 \ No newline at end of file diff --git a/PackageReleaseNotes.template b/PackageReleaseNotes.template new file mode 100644 index 000000000..bc34c0ebc --- /dev/null +++ b/PackageReleaseNotes.template @@ -0,0 +1,6 @@ +# {{releaseInfos.0.FriendlyName}} ({{formatDate releaseInfos.0.When "dd MMMM yyyy"}}) +{{#each releaseInfos.0.issueInfos}} +- #{{Number}} {{Title}}{{#if Labels}} [{{join Labels ", "}}]{{/if}} +{{/each}} + +The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md \ No newline at end of file diff --git a/PackageReleaseNotes.txt b/PackageReleaseNotes.txt new file mode 100644 index 000000000..118ed3797 --- /dev/null +++ b/PackageReleaseNotes.txt @@ -0,0 +1,4 @@ +# 1.4.21 (16 September 2021) +- #631 Add WireMock.org RestClient [feature] + +The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md \ No newline at end of file diff --git a/WireMock.Net Solution.sln b/WireMock.Net Solution.sln index 51551bd2f..193b21e23 100644 --- a/WireMock.Net Solution.sln +++ b/WireMock.Net Solution.sln @@ -26,8 +26,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution build-info.md = build-info.md CHANGELOG.md = CHANGELOG.md Directory.Build.props = Directory.Build.props - GitHubReleaseNotes.txt = GitHubReleaseNotes.txt + Generate-ReleaseNotes.cmd = Generate-ReleaseNotes.cmd nuget.config = nuget.config + PackageReleaseNotes.template = PackageReleaseNotes.template + PackageReleaseNotes.txt = PackageReleaseNotes.txt README.md = README.md EndProjectSection EndProject @@ -92,9 +94,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Azure Pipelines", "Azure Pi azure-pipelines-nuget.yml = azure-pipelines-nuget.yml EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Org.RestClient", "src\WireMock.Org.RestClient\WireMock.Org.RestClient.csproj", "{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Org.RestClient", "src\WireMock.Org.RestClient\WireMock.Org.RestClient.csproj", "{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Org.Abstractions", "src\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj", "{3BA5109E-5F30-4CC2-B699-02EC82560AA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Org.Abstractions", "src\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj", "{3BA5109E-5F30-4CC2-B699-02EC82560AA6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/examples/WireMock.Net.Client/WireMock.Net.Client.csproj b/examples/WireMock.Net.Client/WireMock.Net.Client.csproj index 3bd296358..3482a8ff5 100644 --- a/examples/WireMock.Net.Client/WireMock.Net.Client.csproj +++ b/examples/WireMock.Net.Client/WireMock.Net.Client.csproj @@ -3,7 +3,7 @@ Exe netcoreapp2.1 - ../../WireMock.Net-Logo.ico + ../../resources/WireMock.Net-Logo.ico diff --git a/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj b/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj index 49ab5d444..e49a3c86f 100644 --- a/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj +++ b/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj @@ -1,9 +1,8 @@ - + Exe net5.0 - ../../WireMock.Net-Logo.ico diff --git a/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj b/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj index 33d3b17d4..a3fbb4a4e 100644 --- a/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj +++ b/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj @@ -3,7 +3,7 @@ Exe netcoreapp1.1 - ../../WireMock.Net-Logo.ico + ../../resources/WireMock.Net-Logo.ico diff --git a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj index 751e36cbe..6ec928e47 100644 --- a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj +++ b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj @@ -3,7 +3,7 @@ Exe netcoreapp2.1 - ../../WireMock.Net-Logo.ico + ../../resources/WireMock.Net-Logo.ico diff --git a/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj b/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj index 73d88223e..78e8dd124 100644 --- a/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj +++ b/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - ../../WireMock.Net-Logo.ico + ../../resources/WireMock.Net-Logo.ico diff --git a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj index 522d1c638..3a39c4e75 100644 --- a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj +++ b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj @@ -33,7 +33,7 @@ 4 - ..\..\WireMock.Net-Logo.ico + ..\..\resources\WireMock.Net-Logo.ico diff --git a/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj b/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj index a5fc676e4..f8e8f777b 100644 --- a/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj +++ b/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj @@ -3,7 +3,7 @@ Exe netcoreapp2.1;netcoreapp3.1;net5.0 - ../../WireMock.Net-Logo.ico + ../../resources/WireMock.Net-Logo.ico diff --git a/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj b/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj index 1526ba1fb..acdce24f4 100644 --- a/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj +++ b/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj @@ -3,7 +3,7 @@ Exe net5.0 - ../../WireMock.Net-Logo.ico + ../../resources/WireMock.Net-Logo.ico diff --git a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj index 86ed8162f..8775a91f9 100644 --- a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj +++ b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj @@ -1,9 +1,8 @@ - + Exe netcoreapp3.1 - ../../WireMock.Net-Logo.ico WireMock.Net.StandAlone.NETCoreApp.Program diff --git a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj index 00a185883..790e218c7 100644 --- a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj +++ b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj @@ -33,7 +33,7 @@ 4 - ..\..\WireMock.Net-Logo.ico + ..\..\resources\WireMock.Net-Logo.ico WireMock.Net.StandAlone.Net452.Program diff --git a/WireMock.Net-Logo.ico b/resources/WireMock.Net-Logo.ico similarity index 100% rename from WireMock.Net-Logo.ico rename to resources/WireMock.Net-Logo.ico diff --git a/WireMock.Net-Logo.png b/resources/WireMock.Net-Logo.png similarity index 100% rename from WireMock.Net-Logo.png rename to resources/WireMock.Net-Logo.png