From dd601c37a1065fa4cae614547b7e399ad474a865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joanna=20Boro=C5=84?= Date: Thu, 16 Feb 2023 13:52:58 +0100 Subject: [PATCH 1/6] Remove Analytics references --- .../Controls/BaseError.cs | 15 ------- .../Definitions/Constants.cs | 6 --- .../HttpRequest/CheckErrorManagerUserAgent.cs | 44 ------------------- .../StartAnalytics/DisableRequestTracking.cs | 41 ----------------- .../Unic.ErrorManager.Core.csproj | 6 --- src/Unic.ErrorManager.Core/packages.config | 1 - .../01_modules/Unic.ErrorManager.config | 29 ------------ .../Web/Error Manager/service/noaccess.aspx | 1 - .../Web/Error Manager/service/nolayout.aspx | 1 - .../Web/Error Manager/service/nolicense.aspx | 1 - .../Web/Error Manager/service/notfound.aspx | 1 - 11 files changed, 146 deletions(-) delete mode 100644 src/Unic.ErrorManager.Core/Pipelines/HttpRequest/CheckErrorManagerUserAgent.cs delete mode 100644 src/Unic.ErrorManager.Core/Pipelines/StartAnalytics/DisableRequestTracking.cs diff --git a/src/Unic.ErrorManager.Core/Controls/BaseError.cs b/src/Unic.ErrorManager.Core/Controls/BaseError.cs index 111ab72..31cab26 100644 --- a/src/Unic.ErrorManager.Core/Controls/BaseError.cs +++ b/src/Unic.ErrorManager.Core/Controls/BaseError.cs @@ -20,8 +20,6 @@ namespace Unic.ErrorManager.Core.Controls using System.Net.Security; using System.Security.Cryptography.X509Certificates; using System.Text; - - using Sitecore.Analytics; using Sitecore.Configuration; using Sitecore.Data.Items; using Sitecore.Data.Managers; @@ -142,9 +140,6 @@ protected override void OnLoad(EventArgs e) url.Append(url.ToString().IndexOf("?") == -1 ? "?" : "&"); url.Append("rawUrl=" + this.Server.UrlEncode(WebUtil.GetRawUrl())); - // add the tracking disable parameter - url.Append(string.Format("&{0}={1}", Definitions.Constants.DisableTrackingParameterName, Settings.GetSetting(Definitions.Constants.DisableTrackingParameterValueSetting, string.Empty))); - // change display mode to normal url.Append(string.Format("&{0}={1}", Definitions.Constants.DisplayModeParameterName, Definitions.Constants.DisplayModeParameterValueSetting)); } @@ -228,16 +223,6 @@ protected override void OnLoad(EventArgs e) { string body = new StreamReader(response.GetResponseStream()).ReadToEnd(); - // Insert image with request to the static page if Analytics is enabled. - // This is a hotfix for a Sitecore bug, see Sitecore issue #378950 - if (Settings.GetBoolSetting("Xdb.Enabled", false) && site.Tracking().EnableTracking) - { - body = body.Replace("", - string.Format("", - Settings.GetSetting(this.SettingsKey + ".Static"), - base.Request.QueryString)); - } - this.Response.Write(body); } else diff --git a/src/Unic.ErrorManager.Core/Definitions/Constants.cs b/src/Unic.ErrorManager.Core/Definitions/Constants.cs index b1e218f..61be2ca 100644 --- a/src/Unic.ErrorManager.Core/Definitions/Constants.cs +++ b/src/Unic.ErrorManager.Core/Definitions/Constants.cs @@ -2,12 +2,6 @@ { public static class Constants { - public static string DisableTrackingParameterName = "em_dt"; - - public static string DisableTrackingParameterValueSetting = "ErrorManager.DisableTrackingParameterValue"; - - public static string DisableTrackingSetting = "ErrorManager.DisableTracking"; - public static string DisplayModeParameterName = "sc_mode"; public static string DisplayModeParameterValueSetting = "normal"; diff --git a/src/Unic.ErrorManager.Core/Pipelines/HttpRequest/CheckErrorManagerUserAgent.cs b/src/Unic.ErrorManager.Core/Pipelines/HttpRequest/CheckErrorManagerUserAgent.cs deleted file mode 100644 index e04290a..0000000 --- a/src/Unic.ErrorManager.Core/Pipelines/HttpRequest/CheckErrorManagerUserAgent.cs +++ /dev/null @@ -1,44 +0,0 @@ -namespace Unic.ErrorManager.Core.Pipelines.HttpRequest -{ - using System; - using System.Web; - using Sitecore; - using Sitecore.Analytics.Pipelines.ExcludeRobots; - using Sitecore.Configuration; - using Sitecore.Diagnostics; - using Constants = Definitions.Constants; - - [UsedImplicitly] - public class CheckErrorManagerUserAgent : ExcludeRobotsProcessor - { - public override void Process(ExcludeRobotsArgs args) - { - Assert.ArgumentNotNull(args, nameof(args)); - - if (!this.ShouldExecute()) return; - - var context = this.GetHttpContext(); - var request = context?.Request; - args.IsInExcludeList = this.CheckUserAgent(request); - } - - protected virtual bool ShouldExecute() - { - return Settings.GetBoolSetting(Constants.EnableAgentHeaderCheckSetting, true); - } - - protected virtual bool CheckUserAgent(HttpRequestBase request) - { - var userAgent = request?.UserAgent; - if (userAgent == null) return false; - - var userAgentSetting = Settings.GetSetting(Constants.UserAgentSetting); - return string.Equals(userAgent, userAgentSetting, StringComparison.InvariantCultureIgnoreCase); - } - - protected virtual HttpContextWrapper GetHttpContext() - { - return new HttpContextWrapper(HttpContext.Current); - } - } -} \ No newline at end of file diff --git a/src/Unic.ErrorManager.Core/Pipelines/StartAnalytics/DisableRequestTracking.cs b/src/Unic.ErrorManager.Core/Pipelines/StartAnalytics/DisableRequestTracking.cs deleted file mode 100644 index e3c25ec..0000000 --- a/src/Unic.ErrorManager.Core/Pipelines/StartAnalytics/DisableRequestTracking.cs +++ /dev/null @@ -1,41 +0,0 @@ -namespace Unic.ErrorManager.Core.Pipelines.StartAnalytics -{ - using System; - using Sitecore.Configuration; - using Sitecore.Diagnostics; - using Sitecore.Pipelines; - using Sitecore.Web; - using Definitions; - - /// - /// Disables the xDB tracker for requests from the error manager to the error pages due to session locks - /// - public class DisableRequestTracking - { - public virtual void Process(PipelineArgs args) - { - Assert.ArgumentNotNull(args, nameof(args)); - - if (!this.ShouldExecute()) return; - - if (this.ShouldDisableTracking()) - { - args.AbortPipeline(); - } - } - - protected virtual bool ShouldExecute() - { - return Settings.GetBoolSetting(Constants.DisableTrackingSetting, true); - } - - protected virtual bool ShouldDisableTracking() - { - var disableTrackingParameterValueQuery = WebUtil.GetQueryString(Constants.DisableTrackingParameterName); - if (string.IsNullOrWhiteSpace(disableTrackingParameterValueQuery)) return false; - - var disableTrackingParameterValue = Settings.GetSetting(Constants.DisableTrackingParameterValueSetting); - return string.Equals(disableTrackingParameterValueQuery, disableTrackingParameterValue, StringComparison.InvariantCultureIgnoreCase); - } - } -} diff --git a/src/Unic.ErrorManager.Core/Unic.ErrorManager.Core.csproj b/src/Unic.ErrorManager.Core/Unic.ErrorManager.Core.csproj index 558dcaa..e88bd7c 100644 --- a/src/Unic.ErrorManager.Core/Unic.ErrorManager.Core.csproj +++ b/src/Unic.ErrorManager.Core/Unic.ErrorManager.Core.csproj @@ -47,10 +47,6 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll True - - ..\..\packages\Sitecore.Analytics.NoReferences.8.1.151207\lib\NET45\Sitecore.Analytics.dll - True - ..\..\packages\Sitecore.Kernel.NoReferences.8.1.151207\lib\NET45\Sitecore.Kernel.dll True @@ -65,9 +61,7 @@ - - diff --git a/src/Unic.ErrorManager.Core/packages.config b/src/Unic.ErrorManager.Core/packages.config index 1d1f777..1027384 100644 --- a/src/Unic.ErrorManager.Core/packages.config +++ b/src/Unic.ErrorManager.Core/packages.config @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/src/Unic.ErrorManager.Website/App_Config/Include/01_modules/Unic.ErrorManager.config b/src/Unic.ErrorManager.Website/App_Config/Include/01_modules/Unic.ErrorManager.config index cb34153..6bf0ea4 100644 --- a/src/Unic.ErrorManager.Website/App_Config/Include/01_modules/Unic.ErrorManager.config +++ b/src/Unic.ErrorManager.Website/App_Config/Include/01_modules/Unic.ErrorManager.config @@ -72,13 +72,6 @@ --> - - - - @@ -135,28 +128,6 @@ - - - - - - - - - - - diff --git a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/noaccess.aspx b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/noaccess.aspx index 1c33741..46f6cdd 100644 --- a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/noaccess.aspx +++ b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/noaccess.aspx @@ -1,6 +1,5 @@ <%@ OutputCache Location="None" VaryByParam="none" %> <%@ register TagPrefix="sc" Namespace="Sitecore.Web.UI.HtmlControls" Assembly="Sitecore.Kernel" %> -<%@ Register TagPrefix="sc" Namespace="Sitecore.Web.UI.WebControls" Assembly="Sitecore.Analytics" %> <%@ Page language="c#" Codebehind="noaccess.aspx.cs" EnableViewState="false" EnableViewStateMac="false" AutoEventWireup="True" Inherits="SitecoreClient.Page.NoAccess" %> <% Response.StatusCode = 200; %> diff --git a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolayout.aspx b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolayout.aspx index 18a15e7..698877e 100644 --- a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolayout.aspx +++ b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolayout.aspx @@ -1,6 +1,5 @@ <%@ OutputCache Location="None" VaryByParam="none" %> <%@ register TagPrefix="sc" Namespace="Sitecore.Web.UI.HtmlControls" Assembly="Sitecore.Kernel" %> -<%@ Register TagPrefix="sc" Namespace="Sitecore.Web.UI.WebControls" Assembly="Sitecore.Analytics" %> <%@ Page language="c#" Codebehind="nolayout.aspx.cs" EnableViewState="false" EnableViewStateMac="false" AutoEventWireup="True" Inherits="SitecoreClient.Page.NoLayout" %> <% Response.StatusCode = 200; %> diff --git a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolicense.aspx b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolicense.aspx index b749191..b34a6e9 100644 --- a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolicense.aspx +++ b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolicense.aspx @@ -1,6 +1,5 @@ <%@ OutputCache Location="None" VaryByParam="none" %> <%@ register TagPrefix="sc" Namespace="Sitecore.Web.UI.HtmlControls" Assembly="Sitecore.Kernel" %> -<%@ Register TagPrefix="sc" Namespace="Sitecore.Web.UI.WebControls" Assembly="Sitecore.Analytics" %> <%@ Page language="c#" Codebehind="nolicense.aspx.cs" EnableViewState="false" EnableViewStateMac="false" AutoEventWireup="True" Inherits="SitecoreClient.Page.NoLicense" %> <% Response.StatusCode = 200; %> diff --git a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/notfound.aspx b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/notfound.aspx index bf2cc2c..772b0f3 100644 --- a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/notfound.aspx +++ b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/notfound.aspx @@ -1,6 +1,5 @@ <%@ OutputCache Location="None" VaryByParam="none" %> <%@ register TagPrefix="sc" Namespace="Sitecore.Web.UI.HtmlControls" Assembly="Sitecore.Kernel" %> -<%@ Register TagPrefix="sc" Namespace="Sitecore.Web.UI.WebControls" Assembly="Sitecore.Analytics" %> <%@ Page language="c#" Codebehind="notfound.aspx.cs" EnableViewState="false" EnableViewStateMac="false" AutoEventWireup="True" Inherits="SitecoreClient.Page.NotFound" %> <% Response.StatusCode = 200; %> From 646634cb78adca8bba24a6680129fae0f7b6b463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joanna=20Boro=C5=84?= Date: Thu, 16 Feb 2023 14:28:10 +0100 Subject: [PATCH 2/6] Update Appveyor configuration --- CHANGELOG.md | 12 +++++ GitVersion.yaml | 4 ++ GitVersionConfig.yaml | 11 ----- NuGet.config | 4 +- README.md | 1 + appveyor.yml | 49 +++++++++++++++++++ .../Unic.ErrorManager.Core.nuspec | 5 +- .../Unic.ErrorManager.Website.nuspec | 7 ++- 8 files changed, 74 insertions(+), 19 deletions(-) create mode 100644 GitVersion.yaml delete mode 100644 GitVersionConfig.yaml create mode 100644 appveyor.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index ceca716..80674cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# 8.1.4 + +- Fix potential SSRF vulnerability + +# 8.1.3 + +- Fix unwanted white space on not found pages due to img element not being hidden + +# 8.1.2 + +- More logging on server error + # 8.1.1 - Fix issue #16 where the HttpContext in the CheckErrorManagerUserAgent processor inherits the lifetime scope of the processor, resulting in flagging every visitor as bot and with this, disabling personalization on all components. diff --git a/GitVersion.yaml b/GitVersion.yaml new file mode 100644 index 0000000..ced7a9f --- /dev/null +++ b/GitVersion.yaml @@ -0,0 +1,4 @@ +mode: ContinuousDeployment +branches: + master: + regex: ^master$|^main$ \ No newline at end of file diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml deleted file mode 100644 index f4eba37..0000000 --- a/GitVersionConfig.yaml +++ /dev/null @@ -1,11 +0,0 @@ -mode: ContinuousDeployment -branches: - release[/-]: - tag: release - hotfix[/-]: - tag: hotfix - prevent-increment-of-merged-branch-version: true - master: - increment: Minor - support[/-]: - tag: support \ No newline at end of file diff --git a/NuGet.config b/NuGet.config index c61d546..dfd4d34 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,8 @@ - + + + diff --git a/README.md b/README.md index d0df6d6..b34529b 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ The current version of the Sitecore Error Manager works with the following Sitec ## Contribute Contributions to the module are very welcome! You can fork the project and issue [Pull Requests](https://help.github.com/articles/creating-a-pull-request) to do so. +Please note: you'll have to accept the CLA provided. ## License The Sitecore Error Manager is licensed under the LGPL. Please see [LICENSE.txt](https://github.com/unic/SitecoreErrorManager/blob/master/LICENSE.txt) for more informations. diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..c368293 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,49 @@ +version: '{build}' +image: Visual Studio 2015 + +environment: + RepoName: SitecoreErrorManager + NuGetToken: + secure: jhODVb/iVko3b4Y9p1tOMP9LeDy6OQEYePDIDT6lfAOgNnJixjJpJBAJj/gtkDLc + Artefact_Output_Dir: .\output + GithubEmail: team-unic@unic.com + GithubUsername: team-unic + GithubAccessTokenTeamUnic: + secure: BCEthL/NRFeg5eKK9CgmwbySILxWjMUjpvExHC0oGl1jjAT4kMBAohzh9m/xsVDh + +install: + - choco install gitversion.portable -y + - ps: gitversion /l console /output buildserver + + # Setup GIT + - git config --global user.email %GithubEmail% + - git config --global user.name %GithubUsername% + - git config --global push.default simple + - git config --global core.autocrlf true + - git config --global core.safecrlf false + - git config --global credential.helper store + +configuration: Release + +assembly_info: + patch: false + +before_build: + - nuget restore + - ps: gitversion /l console /output buildserver /updateAssemblyInfo + +build: + verbosity: normal + +after_build: + - cmd: nuget pack .\src\Unic.ErrorManager.Core\Unic.ErrorManager.Core.csproj -version "%GitVersion_NuGetVersionV2%" -prop "target=%CONFIGURATION%" + - cmd: appveyor PushArtifact "Unic.ErrorManager.Core.%GitVersion_NuGetVersionV2%.nupkg" + + - cmd: nuget pack .\src\Unic.ErrorManager.Website\Unic.ErrorManager.Website.csproj -version "%GitVersion_NuGetVersionV2%" -prop "target=%CONFIGURATION%" + - cmd: appveyor PushArtifact "Unic.ErrorManager.%GitVersion_NuGetVersionV2%.nupkg" + +deploy: + - provider: Environment + name: NuGet.org + on: + APPVEYOR_REPO_TAG: true diff --git a/src/Unic.ErrorManager.Core/Unic.ErrorManager.Core.nuspec b/src/Unic.ErrorManager.Core/Unic.ErrorManager.Core.nuspec index 98c39e9..6cc34b4 100644 --- a/src/Unic.ErrorManager.Core/Unic.ErrorManager.Core.nuspec +++ b/src/Unic.ErrorManager.Core/Unic.ErrorManager.Core.nuspec @@ -2,15 +2,14 @@ Unic.ErrorManager.Core - 0.0.0 + $VERSION$ Kevin Brechbühl, Pascal Mathys, Reto Hugi Unic https://github.com/unic/SitecoreErrorManager - https://www.unic.com/img/unic-logo.jpg + https://github.com/unic/unic/raw/master/unic_nuget.png false A module to support SEO friendly, multi-site and multi-language enabled custom error messages for Sitecore. - Copyright 2014 Unic AG Sitecore Unic Error Manager 404 notfound \ No newline at end of file diff --git a/src/Unic.ErrorManager.Website/Unic.ErrorManager.Website.nuspec b/src/Unic.ErrorManager.Website/Unic.ErrorManager.Website.nuspec index f922ad6..3963a2d 100644 --- a/src/Unic.ErrorManager.Website/Unic.ErrorManager.Website.nuspec +++ b/src/Unic.ErrorManager.Website/Unic.ErrorManager.Website.nuspec @@ -2,18 +2,17 @@ Unic.ErrorManager - 0.0.0 + $VERSION$ Kevin Brechbühl, Pascal Mathys, Reto Hugi Unic https://github.com/unic/SitecoreErrorManager - https://www.unic.com/img/unic-logo.jpg + https://github.com/unic/unic/raw/master/unic_nuget.png false A module to support SEO friendly, multi-site and multi-language enabled custom error messages for Sitecore. - Copyright 2014 Unic AG Sitecore Unic Error Manager 404 notfound - + \ No newline at end of file From f2889d400c4303d3cf91576475aaa9db3c3bf0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joanna=20Boro=C5=84?= Date: Thu, 16 Feb 2023 15:33:15 +0100 Subject: [PATCH 3/6] Update GitVersion configuration --- CHANGELOG.md | 12 ------------ GitVersion.yaml | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80674cf..ceca716 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,3 @@ -# 8.1.4 - -- Fix potential SSRF vulnerability - -# 8.1.3 - -- Fix unwanted white space on not found pages due to img element not being hidden - -# 8.1.2 - -- More logging on server error - # 8.1.1 - Fix issue #16 where the HttpContext in the CheckErrorManagerUserAgent processor inherits the lifetime scope of the processor, resulting in flagging every visitor as bot and with this, disabling personalization on all components. diff --git a/GitVersion.yaml b/GitVersion.yaml index ced7a9f..50a3b8f 100644 --- a/GitVersion.yaml +++ b/GitVersion.yaml @@ -1,4 +1,4 @@ mode: ContinuousDeployment branches: master: - regex: ^master$|^main$ \ No newline at end of file + regex: ^master$|^main$|^fork.* \ No newline at end of file From 4f828e67d1011937426099b4949443913ab30e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joanna=20Boro=C5=84?= Date: Fri, 17 Feb 2023 11:21:58 +0100 Subject: [PATCH 4/6] Add GitVersion.yml --- GitVersion.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 GitVersion.yml diff --git a/GitVersion.yml b/GitVersion.yml new file mode 100644 index 0000000..699478d --- /dev/null +++ b/GitVersion.yml @@ -0,0 +1,10 @@ +mode: ContinuousDeployment +branches: + master: + regex: ^master$|^main$ + xm: + regex: ^fork/xm$ + mode: ContinuousDelivery + increment: None + tag: "xm" + source-branches: [] \ No newline at end of file From 8efa53c7a7f67ea547b0e2b6f33344d2afb8610a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joanna=20Boro=C5=84?= Date: Tue, 30 May 2023 17:53:24 +0200 Subject: [PATCH 5/6] Remove sc:VisitorIdentification tag --- .../sitecore modules/Web/Error Manager/service/noaccess.aspx | 1 - .../sitecore modules/Web/Error Manager/service/nolayout.aspx | 1 - .../sitecore modules/Web/Error Manager/service/nolicense.aspx | 1 - .../sitecore modules/Web/Error Manager/service/notfound.aspx | 1 - 4 files changed, 4 deletions(-) diff --git a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/noaccess.aspx b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/noaccess.aspx index 46f6cdd..d75d7ad 100644 --- a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/noaccess.aspx +++ b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/noaccess.aspx @@ -70,6 +70,5 @@ - diff --git a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolayout.aspx b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolayout.aspx index 698877e..fadec86 100644 --- a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolayout.aspx +++ b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolayout.aspx @@ -74,6 +74,5 @@ - diff --git a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolicense.aspx b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolicense.aspx index b34a6e9..db5867e 100644 --- a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolicense.aspx +++ b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/nolicense.aspx @@ -65,6 +65,5 @@ - diff --git a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/notfound.aspx b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/notfound.aspx index 772b0f3..c5bec5d 100644 --- a/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/notfound.aspx +++ b/src/Unic.ErrorManager.Website/sitecore modules/Web/Error Manager/service/notfound.aspx @@ -75,6 +75,5 @@ - From 075c64ddce6c90835f464e2c92eb52f99b60fc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joanna=20Boro=C5=84?= Date: Tue, 27 Jun 2023 14:09:17 +0200 Subject: [PATCH 6/6] Update GtiVersion to increment prerelease tag --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 699478d..334e91d 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -4,7 +4,7 @@ branches: regex: ^master$|^main$ xm: regex: ^fork/xm$ - mode: ContinuousDelivery + mode: ContinuousDeployment increment: None tag: "xm" source-branches: [] \ No newline at end of file