From 0572de61f4158d354c4b63c28fe21af8b06afa07 Mon Sep 17 00:00:00 2001
From: dmendez <dmendez@genexus.com>
Date: Wed, 20 Jul 2022 20:34:38 -0300
Subject: [PATCH 1/2] Cherry pick branch 'genexuslabs:Issue97157' into beta

---
 dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs b/dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs
index 2c5746c5f..94012386e 100644
--- a/dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs
+++ b/dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs
@@ -1148,13 +1148,15 @@ private void AddStyleSheetFile(string styleSheet, string urlBuildNumber, bool is
 			if (!context.StyleSheetAdded(styleSheet))
 			{
 				context.AddStyleSheetFile(styleSheet);
+				string sUncachedURL = context.GetCompleteURL(styleSheet) + urlBuildNumber;
+				string sLayerName = styleSheet.Replace("/", "_");
 				if (!context.HtmlHeaderClosed && context.isEnabled)
 				{
 					string sRelAtt = (isDeferred ? "rel=\"preload\" as=\"style\" " : "rel=\"stylesheet\"");
 					if (isGxThemeHidden)
-						context.WriteHtmlTextNl("<link id=\"gxtheme_css_reference\" " + sRelAtt + " type=\"text/css\" href=\"" + context.GetCompleteURL(styleSheet) + urlBuildNumber + "\" " + GXUtil.HtmlEndTag(HTMLElement.LINK));
+						context.WriteHtmlTextNl("<link id=\"gxtheme_css_reference\" " + sRelAtt + " type=\"text/css\" href=\"" + sUncachedURL + "\" " + GXUtil.HtmlEndTag(HTMLElement.LINK));
 					else
-						context.WriteHtmlTextNl("<link " + sRelAtt + " type=\"text/css\" href=\"" + context.GetCompleteURL(styleSheet) + urlBuildNumber + "\"" + GXUtil.HtmlEndTag(HTMLElement.LINK));
+						context.WriteHtmlTextNl("<style data-gx-href=\""+ sUncachedURL + "\"> @import url(\"" + sUncachedURL + "\") layer(" + sLayerName + ") </style>");
 				}
 				else
 				{

From 14ecb18ae4340a82fb5ccf1e827f553442c5b830 Mon Sep 17 00:00:00 2001
From: dmendez <dmendez@genexus.com>
Date: Wed, 7 Sep 2022 18:07:24 -0300
Subject: [PATCH 2/2] missing cherrypick issue97157 csslayersupport

---
 dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs b/dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs
index 94012386e..cdadf55fd 100644
--- a/dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs
+++ b/dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs
@@ -1149,7 +1149,7 @@ private void AddStyleSheetFile(string styleSheet, string urlBuildNumber, bool is
 			{
 				context.AddStyleSheetFile(styleSheet);
 				string sUncachedURL = context.GetCompleteURL(styleSheet) + urlBuildNumber;
-				string sLayerName = styleSheet.Replace("/", "_");
+				string sLayerName = styleSheet.Replace("/", "_").Replace(".","_");
 				if (!context.HtmlHeaderClosed && context.isEnabled)
 				{
 					string sRelAtt = (isDeferred ? "rel=\"preload\" as=\"style\" " : "rel=\"stylesheet\"");