dotnet · pavelsavara · Mar 3, 2023 · Mar 2, 2023 · Mar 2, 2023 · Mar 2, 2023
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <EnableAggressiveTrimming>true</EnableAggressiveTrimming>
     <PublishTrimmed>true</PublishTrimmed>
+    <WasmEnableWebcil>true</WasmEnableWebcil>
     <!-- add OpenGL emulation -->
     <EmccExtraLDFlags> -s USE_CLOSURE_COMPILER=1 -s LEGACY_GL_EMULATION=1 -lGL -lSDL -lidbfs.js</EmccExtraLDFlags>
     <!-- just to prove we don't do JS eval() -->

@@ -12,7 +12,7 @@
   <link rel="preload" href="./mono-config.json" as="fetch" crossorigin="anonymous">
   <link rel="prefetch" href="./dotnet.wasm" as="fetch" crossorigin="anonymous">
   <link rel="prefetch" href="./icudt.dat" as="fetch" crossorigin="anonymous">
-  <link rel="prefetch" href="./managed/System.Private.CoreLib.dll" as="fetch" crossorigin="anonymous">
+  <link rel="prefetch" href="./managed/System.Private.CoreLib.webcil" as="fetch" crossorigin="anonymous">
 </head>
 
 <body>

@@ -74,7 +74,7 @@ export function get_preferred_icu_asset(): string | null {
     return OTHERS;
 }
 
-export function shouldLoadIcuAsset(asset : AssetEntryInternal, preferredIcuAsset: string | null) : boolean{
+export function shouldLoadIcuAsset(asset: AssetEntryInternal, preferredIcuAsset: string | null): boolean {
     return !(asset.behavior == "icu" && asset.name != preferredIcuAsset);
 }
 
@@ -293,6 +293,14 @@ async function start_asset_download_sources(asset: AssetEntryInternal): Promise<
             return response;
         }
         catch (err) {
+            if (!response) {
+                response = {
+                    ok: false,
+                    url: attemptUrl,
+                    status: 0,
+                    statusText: "" + err,
+                } as any;
+            }
             continue; //next source
         }
     }

@@ -132,6 +132,10 @@ type MonoConfig = {
      * initial number of workers to add to the emscripten pthread pool
      */
     pthreadPoolSize?: number;
+    /**
+     * hash of assets
+     */
+    assetsHash?: string;
 };
 interface ResourceRequest {
     name: string;

@@ -119,6 +119,10 @@ export type MonoConfig = {
      * initial number of workers to add to the emscripten pthread pool
      */
     pthreadPoolSize?: number,
+    /**
+     * hash of assets
+     */
+    assetsHash?: string,
 };
 
 export type MonoConfigInternal = MonoConfig & {

diff --git a/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj b/src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj
@@ -5,7 +5,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Nullable>enable</Nullable>
-    <NoWarn>$(NoWarn),CA1050</NoWarn>
+    <NoWarn>$(NoWarn),CA1050,CA1850</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="Templates\*.*" />

@@ -5,7 +5,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Nullable>enable</Nullable>
-    <NoWarn>$(NoWarn),CA1050</NoWarn>
+    <NoWarn>$(NoWarn),CA1050,CA1850</NoWarn>
 
     <!-- Ignore nullable warnings on net4* -->
     <NoWarn Condition="$(TargetFramework.StartsWith('net4'))">$(NoWarn),CS8604,CS8602</NoWarn>

diff --git a/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj b/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj
@@ -5,7 +5,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Nullable>enable</Nullable>
-    <NoWarn>$(NoWarn),CA1050</NoWarn>
+    <NoWarn>$(NoWarn),CA1050,CA1850</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="Templates\*.*" />

diff --git a/src/tasks/Common/Utils.cs b/src/tasks/Common/Utils.cs
@@ -3,9 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Reflection.PortableExecutable;
+using System.Reflection.Metadata;
 using System.Security.Cryptography;
 using System.Text;
 using Microsoft.Build.Framework;
@@ -237,6 +240,32 @@ public static string ComputeHash(string filepath)
         return Convert.ToBase64String(hash);
     }
 
+    public static string ComputeIntegrity(string filepath)
+    {
+        using var stream = File.OpenRead(filepath);
+        using HashAlgorithm hashAlgorithm = SHA256.Create();
+
+        byte[] hash = hashAlgorithm.ComputeHash(stream);
+        return "sha256-" + Convert.ToBase64String(hash);
+    }
+
+    public static string ComputeIntegrity(byte[] bytes)
+    {
+        using HashAlgorithm hashAlgorithm = SHA256.Create();
+
+        byte[] hash = hashAlgorithm.ComputeHash(bytes);
+        return "sha256-" + Convert.ToBase64String(hash);
+    }
+
+    public static string ComputeTextIntegrity(string str)
+    {
+        using HashAlgorithm hashAlgorithm = SHA256.Create();
+
+        var bytes = Encoding.UTF8.GetBytes(str);
+        byte[] hash = hashAlgorithm.ComputeHash(bytes);
+        return "sha256-" + Convert.ToBase64String(hash);
+    }
+
 #if NETCOREAPP
     public static void DirectoryCopy(string sourceDir, string destDir, Func<string, bool>? predicate=null)
     {
@@ -258,4 +287,44 @@ public static void DirectoryCopy(string sourceDir, string destDir, Func<string,
         }
     }
 #endif
+
+    public static bool IsManagedAssembly(string filePath)
+    {
+        if (!File.Exists(filePath))
+            return false;
+
+        // Try to read CLI metadata from the PE file.
+        using FileStream fileStream = File.OpenRead(filePath);
+        using PEReader peReader = new(fileStream, PEStreamOptions.Default);
+        return IsManagedAssembly(peReader);
+    }
+
+    public static bool IsManagedAssembly(byte[] bytes)
+    {
+        using var peReader = new PEReader(ImmutableArray.Create(bytes));
+        return IsManagedAssembly(peReader);
+    }
+
+    private static bool IsManagedAssembly(PEReader peReader)
+    {
+        try
+        {
+            if (!peReader.HasMetadata)
+            {
+                return false; // File does not have CLI metadata.
+            }
+
+            // Check that file has an assembly manifest.
+            MetadataReader reader = peReader.GetMetadataReader();
+            return reader.IsAssembly;
+        }
+        catch (BadImageFormatException)
+        {
+            return false;
+        }
+        catch (FileNotFoundException)
+        {
+            return false;
+        }
+    }
 }
diff --git a/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj b/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj
@@ -3,7 +3,7 @@
     <TargetFrameworks>$(TargetFrameworkForNETCoreTasks);$(TargetFrameworkForNETFrameworkTasks)</TargetFrameworks>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Nullable>enable</Nullable>
-    <NoWarn>$(NoWarn),CA1050</NoWarn>
+    <NoWarn>$(NoWarn),CA1050,CA1850</NoWarn>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkForNETCoreTasks)'">
     <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />

diff --git a/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj b/src/tasks/TestExclusionListTasks/TestExclusionListTasks.csproj
@@ -5,7 +5,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <Nullable>enable</Nullable>
-    <NoWarn>$(NoWarn),CA1050</NoWarn>
+    <NoWarn>$(NoWarn),CA1050,CA1850</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

@@ -6,7 +6,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
-using System.Reflection.PortableExecutable;
 using System.Text;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
@@ -128,7 +127,7 @@ private List<string> FilterOutUnmanagedBinaries(string[] assemblies)
 
             try
             {
-                if (!IsManagedAssembly(asmPath))
+                if (!Utils.IsManagedAssembly(asmPath))
                 {
                     Log.LogMessage(MessageImportance.Low, $"Skipping unmanaged {asmPath}.");
                     continue;
@@ -145,15 +144,4 @@ private List<string> FilterOutUnmanagedBinaries(string[] assemblies)
 
         return managedAssemblies;
     }
-
-    private static bool IsManagedAssembly(string filePath)
-    {
-        if (!File.Exists(filePath))
-            return false;
-
-        using FileStream fileStream = File.OpenRead(filePath);
-        using PEReader reader = new(fileStream, PEStreamOptions.Default);
-        return reader.HasMetadata;
-    }
-
 }