diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/Flag/index.jsx b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/Flag/index.jsx index 3895cf6569b..68a2d0ebee5 100644 --- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/Flag/index.jsx +++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/Flag/index.jsx @@ -42,11 +42,11 @@ function Flag({ culture = "", onClick, title }) { useEffect(() => { try { - setFlagUrl(require(`./img/flags/${culture}.png`).default); + setFlagUrl(require(`./img/flags/${culture}.png`)); setIsFallback(false); } catch { try { - setFlagUrl(require("./img/flags/none.png").default); + setFlagUrl(require("./img/flags/none.png")); setIsFallback(true); } catch { setFlagUrl(undefined); diff --git a/gitversion.yml b/gitversion.yml index 4b9e7fb6ba2..183afba12c8 100644 --- a/gitversion.yml +++ b/gitversion.yml @@ -29,6 +29,7 @@ branches: increment: Patch prevent-increment: of-merged-branch: true + when-current-commit-tagged: true track-merge-target: false tracks-release-branches: false is-release-branch: true