diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c88ffe4..a36a5b22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.2.16 (27 July 2020) +- [#492](https://github.com/WireMock-Net/WireMock.Net/pull/492) - Mark FluentMockServer, FluentMockServerSettings, BlacklistedHeaders and BlacklistedCookies as obsolete [feature] contributed by [StefH](https://github.com/StefH) +- [#489](https://github.com/WireMock-Net/WireMock.Net/issues/489) - Change "blacklist" and "whitelist" terms [feature] + # 1.2.15 (19 July 2020) - [#485](https://github.com/WireMock-Net/WireMock.Net/pull/485) - Add fluent assertions for headers [test] contributed by [akamud](https://github.com/akamud) diff --git a/Directory.Build.props b/Directory.Build.props index 4027511a..9a0e2ab2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ - 1.2.15 + 1.2.16 See CHANGELOG.md https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png https://github.com/WireMock-Net/WireMock.Net diff --git a/GitHubReleaseNotes.txt b/GitHubReleaseNotes.txt index 665b0afd..921f4e95 100644 --- a/GitHubReleaseNotes.txt +++ b/GitHubReleaseNotes.txt @@ -1,3 +1,3 @@ https://github.com/StefH/GitHubReleaseNotes -GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.2.15 \ No newline at end of file +GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.2.16 \ No newline at end of file diff --git a/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs b/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs index 80f321fd..b5fc5842 100644 --- a/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs +++ b/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs @@ -37,13 +37,13 @@ namespace WireMock.Settings string ClientX509Certificate2ThumbprintOrSubjectName { get; set; } /// - /// Defines a list from headers which will excluded from the saved mappings. + /// Defines a list from headers which will be excluded from the saved mappings. /// [Obsolete("Will be renamed to ExcludedHeaders in next version (1.3.x)")] string[] BlackListedHeaders { get; set; } /// - /// Defines a list of cookies which will excluded from the saved mappings. + /// Defines a list of cookies which will be excluded from the saved mappings. /// [Obsolete("Will be renamed to ExcludedCookies in next version (1.3.x)")] string[] BlackListedCookies { get; set; }