Merge pull request #786 from unoplatform/dev/jela/extless-compression

fix: Ensure compression is enabled with nodots obfuscation
unoplatform · Oct 12, 2023 · 4ba8661 · 4ba8661
2 parents 4ed8910 + ffda070
commit 4ba8661
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/Uno.Wasm.Bootstrap/ShellTask.cs b/src/Uno.Wasm.Bootstrap/ShellTask.cs
@@ -445,6 +445,13 @@ private void TryCompressDist()
 				Log.LogMessage(MessageImportance.Low, $"Compressing {string.Join(", ", compressibleExtensions)}");
 
 				var filesToCompress = compressibleExtensions
+					.Select(e => {
+						if (_assembliesFileNameObfuscationMode == FileNameObfuscationMode.NoDots)
+						{
+							e = e.Replace(".", "_");
+						}
+						return e;
+					})
 					.SelectMany(e => Directory.GetFiles(_finalPackagePath, "*" + e, SearchOption.AllDirectories))
 					.Where(f => !Path.GetDirectoryName(f).Contains("_compressed_"))
 					.Distinct()

diff --git a/src/Uno.Wasm.StaticLinking.Shared/Validations.props b/src/Uno.Wasm.StaticLinking.Shared/Validations.props
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
 
+	<PropertyGroup>
+		<!-- Used for validating file compression -->
+		<WasmShellCompressionLayoutMode>InPlace</WasmShellCompressionLayoutMode>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="System.Web.Services.Description" Version="4.10.0" />
 	</ItemGroup>
@@ -17,6 +22,17 @@
 		<Error Condition="$(_duplicateValidation.Contains(';'))" Text="Duplicate System.Private.CoreLib.clr detected" />
 
 		<Message Importance="high" Text="Output dist validated" />
+
+		<ItemGroup>
+			<_compressedItems Include="$(WasmShellOutputPackagePath)\**\*.br" />
+		</ItemGroup>
+
+		<PropertyGroup>
+			<_compressedItemsValidation>@(_compressedItems)</_compressedItemsValidation>
+		</PropertyGroup>
+
+		<Error Condition="'$(WasmShellAssembliesFileNameObfuscationMode)'=='NoDots' and !$(_compressedItemsValidation.Contains(';'))"
+			   Text="Compressed files cannot found found with obfuscation mode NoDots enabled" />
 	</Target>
 
 </Project>