Merge pull request #44 from stavroskasidis/feature/recompress-satellites

Feature/recompress satellites
stavroskasidis · Dec 13, 2022 · 0ed9c6d · 0ed9c6d
2 parents 441190b + 1cb4ac7
commit 0ed9c6d
Show file tree

Hide file tree

Showing 16 changed files with 522 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -104,7 +104,13 @@ This work was inspired by the post in https://github.com/dotnet/aspnetcore/issue
 
 ## Release Notes
 
-<details open="open"><summary>2.3.0</summary>
+<details open="open"><summary>2.4.0</summary>
+
+>- Fix for gzip satellite assemblies being compressed from original verion instead of obfuscated one.
+>- Changed target back to .net 6.0.
+</details>
+
+<details><summary>2.3.0</summary>
 
 >- Removed Brotli.NET that depends on native libs and added BrotliCompress tool that uses .net native brotli compression.
   Fixes [#36](https://github.com/stavroskasidis/BlazorWasmAntivirusProtection/issues/36), [#42](https://github.com/stavroskasidis/BlazorWasmAntivirusProtection/issues/42)

diff --git a/sampleapps/BlazorHostedSampleApp/Client/BlazorHostedSampleApp.Client.csproj b/sampleapps/BlazorHostedSampleApp/Client/BlazorHostedSampleApp.Client.csproj
@@ -20,7 +20,8 @@
 		<PackageReference Include="BlazorWasmAntivirusProtection" Version="$(BlazorWasmAntivirusProtectionVersion)" />
 	</ItemGroup>
 
-	<ItemGroup>		
+	<ItemGroup>
+		<ProjectReference Include="..\..\SampleAppsShared.Localization\SampleAppsShared.Localization.csproj" />
 		<ProjectReference Include="..\Shared\BlazorHostedSampleApp.Shared.csproj" />
 	</ItemGroup>
 

diff --git a/sampleapps/BlazorHostedSampleApp/Client/Pages/Index.razor b/sampleapps/BlazorHostedSampleApp/Client/Pages/Index.razor
@@ -1,4 +1,5 @@
 @page "/"
+@using SampleAppsShared.Localization
 
 <PageTitle>Index</PageTitle>
 
@@ -7,3 +8,8 @@
 This page is using the <a target="_blank" href="https://www.nuget.org/packages/BlazorWasmAntivirusProtection">BlazorWasmAntivirusProtection</a> package. More info <a href="https://github.com/stavroskasidis/BlazorWasmAntivirusProtection" target="_blank">here</a>.
 
 <SurveyPrompt Title="How is Blazor working for you?" />
+
+
+<div>
+    Resources Test: @StringResources.TestString
+</div>
diff --git a/sampleapps/BlazorHostedSampleApp/Client/wwwroot/index.html b/sampleapps/BlazorHostedSampleApp/Client/wwwroot/index.html
@@ -30,7 +30,7 @@
         var total = 0;
         var loaded = 0;
         var loading = {};
-        var culture = "en-US";
+        var culture = "el-GR";
         Blazor.start({
             applicationCulture: culture,
             loadBootResource: function (type, name, defaultUri, integrity) {

diff --git a/sampleapps/Directory.Build.props b/sampleapps/Directory.Build.props
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
         <MicrosoftPackagesVersion>7.0.*</MicrosoftPackagesVersion>
-        <BlazorWasmAntivirusProtectionVersion>2.3.0-test</BlazorWasmAntivirusProtectionVersion>
+        <BlazorWasmAntivirusProtectionVersion>2.4.0-test</BlazorWasmAntivirusProtectionVersion>
 
     </PropertyGroup>
 </Project>
diff --git a/sampleapps/SampleAppsShared.Localization/SampleAppsShared.Localization.csproj b/sampleapps/SampleAppsShared.Localization/SampleAppsShared.Localization.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <Compile Update="StringResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>StringResources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="StringResources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>StringResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/sampleapps/SampleAppsShared.Localization/StringResources.Designer.cs b/sampleapps/SampleAppsShared.Localization/StringResources.Designer.cs
diff --git a/sampleapps/SampleAppsShared.Localization/StringResources.el-GR.resx b/sampleapps/SampleAppsShared.Localization/StringResources.el-GR.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="TestString" xml:space="preserve">
+    <value>Δοκιμαστικό string</value>
+  </data>
+</root>