Fix for #36. Version bump. Readme update.

stavroskasidis · Nov 20, 2022 · 18673f2 · 18673f2
1 parent 0efc818
commit 18673f2
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -262,3 +262,4 @@ __pycache__/
 
 
 /artifacts/
+*.pubxml
diff --git a/README.md b/README.md
@@ -104,7 +104,12 @@ This work was inspired by the post in https://github.com/dotnet/aspnetcore/issue
 
 ## Release Notes
 
-<details open="open"><summary>2.1.0</summary>
+<details open="open"><summary>2.2.0</summary>
+
+>- Fix when publishing from Visual Studio [#36](https://github.com/stavroskasidis/BlazorWasmAntivirusProtection/issues/36)
+</details>
+
+<details><summary>2.1.0</summary>
 
 >- Fix targeting .net 7.0 correctly
 >- Changed default Xor key to be a bit more complex.

diff --git a/sampleapps/BlazorHostedSampleApp/Client/BlazorHostedSampleApp.Client.csproj b/sampleapps/BlazorHostedSampleApp/Client/BlazorHostedSampleApp.Client.csproj
@@ -18,7 +18,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
-		<PackageReference Include="BlazorWasmAntivirusProtection" Version="2.1.0-beta" />
+		<PackageReference Include="BlazorWasmAntivirusProtection" Version="2.2.0-beta" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/sampleapps/BlazorHostedSampleApp/Server/BlazorHostedSampleApp.Server.csproj b/sampleapps/BlazorHostedSampleApp/Server/BlazorHostedSampleApp.Server.csproj
@@ -8,14 +8,13 @@
 			$(RestoreAdditionalProjectSources);
 			$(MSBuildThisFileDirectory)../../../artifacts/nuget
 		</RestoreAdditionalProjectSources>
-
 		<!--<DisableRenamingDlls>true</DisableRenamingDlls>-->
 		<!--<RenameDllsTo>blazor</RenameDllsTo>-->
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.0" />
-		<PackageReference Include="BlazorWasmAntivirusProtection" Version="2.1.0-beta" />
+		<PackageReference Include="BlazorWasmAntivirusProtection" Version="2.2.0-beta" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/sampleapps/BlazorHostedSampleLazyLoading/Client/BlazorHostedSampleLazyLoading.Client.csproj b/sampleapps/BlazorHostedSampleLazyLoading/Client/BlazorHostedSampleLazyLoading.Client.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
-	<PackageReference Include="BlazorWasmAntivirusProtection" Version="2.1.0-beta" />
+	<PackageReference Include="BlazorWasmAntivirusProtection" Version="2.2.0-beta" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sampleapps/BlazorHostedSampleLazyLoading/Server/BlazorHostedSampleLazyLoading.Server.csproj b/sampleapps/BlazorHostedSampleLazyLoading/Server/BlazorHostedSampleLazyLoading.Server.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.0" />
-	  <PackageReference Include="BlazorWasmAntivirusProtection" Version="2.1.0-beta" />
+	  <PackageReference Include="BlazorWasmAntivirusProtection" Version="2.2.0-beta" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sampleapps/BlazorHostedSamplePwa/Client/BlazorHostedSamplePwa.Client.csproj b/sampleapps/BlazorHostedSamplePwa/Client/BlazorHostedSamplePwa.Client.csproj
@@ -14,7 +14,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
-		<PackageReference Include="BlazorWasmAntivirusProtection" Version="2.1.0-beta" />
+		<PackageReference Include="BlazorWasmAntivirusProtection" Version="2.2.0-beta" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/sampleapps/BlazorHostedSamplePwa/Server/BlazorHostedSamplePwa.Server.csproj b/sampleapps/BlazorHostedSamplePwa/Server/BlazorHostedSamplePwa.Server.csproj
@@ -12,7 +12,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.0" />
-		<PackageReference Include="BlazorWasmAntivirusProtection" Version="2.1.0-beta" />
+		<PackageReference Include="BlazorWasmAntivirusProtection" Version="2.2.0-beta" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/BlazorWasmAntivirusProtection.Tasks/BlazorWasmAntivirusProtection.Tasks.csproj b/src/BlazorWasmAntivirusProtection.Tasks/BlazorWasmAntivirusProtection.Tasks.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>8.0</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Brotli.NET" Version="2.1.1" />
         <PackageReference Include="Microsoft.Build.Framework" Version="16.10.0" />
         <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.10.0" />
         <PackageReference Include="System.Text.Json" Version="7.0.0" />

diff --git a/src/BlazorWasmAntivirusProtection.Tasks/RenameDlls.cs b/src/BlazorWasmAntivirusProtection.Tasks/RenameDlls.cs
@@ -1,5 +1,6 @@
 namespace BlazorWasmAntivirusProtection.Tasks
 {
+    using Brotli;
     using Microsoft.Build.Framework;
     using Microsoft.Build.Utilities;
     using System;
@@ -118,8 +119,12 @@ private void BrotliCompress(string bootJsonPath, string bootJsonBrPath)
                 var compressionLevel = Enum.TryParse<CompressionLevel>(CompressionLevel, out var level) ? level : System.IO.Compression.CompressionLevel.Optimal;
                 using var fileStream = File.OpenRead(bootJsonPath);
                 using var stream = File.Create(bootJsonBrPath);
-                using var destination = new BrotliStream(stream, compressionLevel);
-                fileStream.CopyTo(destination);
+                fileStream.CompressToBrotli(stream, compressionLevel switch
+                {
+                    System.IO.Compression.CompressionLevel.Optimal => 11,
+                    System.IO.Compression.CompressionLevel.Fastest => 5,
+                    System.IO.Compression.CompressionLevel.NoCompression=> 0,
+                });
             }
             catch (Exception ex)
             {

diff --git a/src/BlazorWasmAntivirusProtection/BlazorWasmAntivirusProtection.csproj b/src/BlazorWasmAntivirusProtection/BlazorWasmAntivirusProtection.csproj
@@ -11,7 +11,7 @@
 		<PackageProjectUrl>https://github.com/stavroskasidis/BlazorWasmAntivirusProtection</PackageProjectUrl>
 		<Description>This package attempts to guard against false positives from antiviruses that flag Blazor Wasm as malware</Description>
 		<VersionSuffix>$(VersionSuffix)</VersionSuffix>
-		<Version>2.1.0</Version>
+		<Version>2.2.0</Version>
 		<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     </PropertyGroup>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -262,3 +262,4 @@ __pycache__/


		/artifacts/
		*.pubxml