DN8-P7, Added compression (#99)

* Added compression * Repair app names * Repair app names #2 * NuGet updates
MarkStega · Aug 9, 2023 · e7acbbb · e7acbbb
1 parent aba7478
commit e7acbbb
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 21 deletions.
diff --git a/.github/workflows/GithubActionsRelease.yml b/.github/workflows/GithubActionsRelease.yml
@@ -94,7 +94,7 @@ jobs:
 
     - name: Publish tagged DS image
       run: |
-        dotnet publish ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.unifiedVersion }} -p:ContainerRegistry=${{env.containerRegistry}} -p:ContainerRepository=${{env.appNameUI}} -p:ContainerImageName=${{env.appNameDS}} -p:ContainerImageTag=${{ env.unifiedVersion }} --no-self-contained
+        dotnet publish ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.unifiedVersion }} -p:ContainerRegistry=${{env.containerRegistry}} -p:ContainerRepository=${{env.appNameDS}} -p:ContainerImageName=${{env.appNameDS}} -p:ContainerImageTag=${{ env.unifiedVersion }} --no-self-contained
 
 ############################################################################################################
 # Build and deploy blazor UI image

diff --git a/.github/workflows/GithubActionsWIP.yml b/.github/workflows/GithubActionsWIP.yml
@@ -91,6 +91,9 @@ jobs:
       run: |
         dotnet publish ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj --os linux --arch x64 --configuration Azure -p:PublishProfile=DefaultContainer -p:Version=${{ env.unifiedVersion }} -p:ContainerRegistry=${{env.containerRegistry}} -p:ContainerRepository=${{env.appNameDS}} -p:ContainerImageTag=${{ env.unifiedVersion }} --no-self-contained
 
+    # - name: Display package output for brotli & gzip compressed files
+    #   run: find /home/runner/work -type f \( -iname "*.br" -o -iname "*.gz" \) | sort
+
 ############################################################################################################
 # Build and deploy blazor UI image
 ############################################################################################################

diff --git a/ApplicationConfigurationServer/ApplicationConfigurationServer.csproj b/ApplicationConfigurationServer/ApplicationConfigurationServer.csproj
@@ -2,7 +2,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Material.Blazor" Version="4.0.0-preview.20" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-preview.6.23329.11" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-preview.7.23375.9" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/DataTier/DataTier.csproj b/DataTier/DataTier.csproj
@@ -15,7 +15,7 @@
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-		<PackageReference Include="Google.Protobuf" Version="3.23.4" />
+		<PackageReference Include="Google.Protobuf" Version="3.24.0" />
 		<PackageReference Include="Grpc.Net.Client" Version="2.55.0" />
 	</ItemGroup>
 

diff --git a/ICEBG.Blazor/ICEBG.Blazor.csproj b/ICEBG.Blazor/ICEBG.Blazor.csproj
@@ -13,9 +13,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="Blazor.Extensions.Logging" Version="2.0.4" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-preview.6.23329.11" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-preview.6.23329.11" PrivateAssets="all" />
-		<PackageReference Include="System.Net.Http.Json" Version="8.0.0-preview.6.23329.7" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-preview.7.23375.9" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-preview.7.23375.9" PrivateAssets="all" />
+		<PackageReference Include="System.Net.Http.Json" Version="8.0.0-preview.7.23375.6" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/ICEBG.Client/ICEBG.Client.csproj b/ICEBG.Client/ICEBG.Client.csproj
@@ -14,12 +14,10 @@
 	<ItemGroup>
 		<PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
 		<PackageReference Include="GoogleAnalytics.Blazor" Version="1.0.3" />
-		<!--<PackageReference Include="Grpc.Net.Client" Version="2.55.0" />
-		<PackageReference Include="Grpc.Net.Client.Web" Version="2.55.0" />-->
-		<PackageReference Include="libphonenumber-csharp" Version="8.13.17" />
+		<PackageReference Include="libphonenumber-csharp" Version="8.13.18" />
 		<PackageReference Include="Material.Blazor" Version="4.0.0-preview.20" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-preview.6.23329.11" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-preview.6.23329.11" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-preview.7.23375.9" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-preview.7.23375.9" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -147,8 +145,8 @@
 
 	</Target>
 
-	<!--Compression directives (Note that the patterns are relative to wwwroot)-->
-	<!--<PropertyGroup>
+	<!--Compression directives (Note that the patterns are relative to wwwroot)--><!--
+	<PropertyGroup>
 		<CompressionIncludePatterns>$(CompressionIncludePatterns);**/*.css;**/*.js</CompressionIncludePatterns>
 		<BuildCompressionFormats>gzip;brotli</BuildCompressionFormats>
 		<PublishCompressionFormats>gzip;brotli</PublishCompressionFormats>

diff --git a/ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj b/ICEBG.Web.DataServices/ICEBG.Web.DataServices.csproj
@@ -15,9 +15,9 @@
 		<PackageReference Include="Grpc.AspNetCore" Version="2.55.0" />
 		<PackageReference Include="Grpc.AspNetCore.Server.Reflection" Version="2.55.0" />
 		<PackageReference Include="Grpc.AspNetCore.Web" Version="2.55.0" />
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
 		<PackageReference Include="NLog.Extensions.AzureBlobStorage" Version="4.2.0" />
-		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.2" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/ICEBG.Web.UserInterface/ICEBG.Web.UserInterface.csproj b/ICEBG.Web.UserInterface/ICEBG.Web.UserInterface.csproj
@@ -21,16 +21,16 @@
 		<PackageReference Include="Grpc.AspNetCore" Version="2.55.0" />
 		<PackageReference Include="Grpc.AspNetCore.Web" Version="2.55.0" />
 		<PackageReference Include="HttpSecurity.AspNet" Version="1.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-preview.6.23329.11" />
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-preview.7.23375.9" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
 		<PackageReference Include="NLog.Extensions.AzureBlobStorage" Version="4.2.0" />
-		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.2" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.3" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\ApplicationConfigurationServer\ApplicationConfigurationServer.csproj" />
 		<ProjectReference Include="..\ApplicationConfiguration\ApplicationConfiguration.csproj" />
-		<ProjectReference Include="..\ICEBG.Blazor\ICEBG.Blazor.csproj" />
+		<!--<ProjectReference Include="..\ICEBG.Blazor\ICEBG.Blazor.csproj" />-->
 		<ProjectReference Include="..\ICEBG.Client\ICEBG.Client.csproj" />
 	</ItemGroup>
 
@@ -39,4 +39,11 @@
 		<Copy SourceFiles="$(ProjectDir)nlog.$(ConfigurationName).config" DestinationFiles="$(ProjectDir)nlog.config" />
 	</Target>
 
+	<!--Compression directives (Note that the patterns are relative to wwwroot)-->
+	<PropertyGroup>
+		<CompressionIncludePatterns>$(CompressionIncludePatterns);**/*.css;**/*.js</CompressionIncludePatterns>
+		<BuildCompressionFormats>gzip;brotli</BuildCompressionFormats>
+		<PublishCompressionFormats>gzip;brotli</PublishCompressionFormats>
+	</PropertyGroup>
+
 </Project>
diff --git a/ICEBG.Web.UserInterface/Pages/host.cshtml b/ICEBG.Web.UserInterface/Pages/host.cshtml
@@ -30,10 +30,11 @@
     {
         <component type="typeof(HeadOutlet)" render-mode="Server" />
     }
-    else
+@*     else
     {
         <link rel="manifest" href="_content/ICEBG.Client/pwa/manifest.json" />
     }
+ *@
 </head>
 
 <body>

diff --git a/ICEBG.Web.UserInterface/Properties/PublishProfiles/FolderProfile.pubxml b/ICEBG.Web.UserInterface/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>DevServer</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>C:\Solutions\OHI\ICEBG-P12.5\.artifacts\publish\ICEBG.Web.UserInterface\devserver\</PublishUrl>
+    <PublishUrl>C:\Solutions\OHI\ICEBG\.artifacts\publish\ICEBG.Web.UserInterface\devserver\</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />

diff --git a/SuperClean.cmd b/SuperClean.cmd
@@ -2,5 +2,6 @@
 c:
 cd \Solutions\ohi\icebg
 for /d /r . %%d in (bin,obj,node_modules,.vs) do @if exist "%%d" rd /s /q "%%d"
+rd .artifacts /s /q
 pause