Merge pull request #770 from unoplatform/dev/jela/runtime-update10

Runtime update
unoplatform · Sep 8, 2023 · feb2f32 · feb2f32
2 parents 63afd8a + fb7fc42
commit feb2f32
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 21 deletions.
diff --git a/src/Uno.Wasm.Bootstrap/Constants.cs b/src/Uno.Wasm.Bootstrap/Constants.cs
@@ -7,7 +7,7 @@ namespace Uno.Wasm.Bootstrap
 	internal class Constants
 	{
 		public const string DefaultDotnetRuntimeSdkUrl = "https://unowasmbootstrap.azureedge.net/runtime/"
-			+ "dotnet-runtime-wasm-linux-40dbdf8-2ec0bc7f0bb-6016800435-Release.zip";
+			+ "dotnet-runtime-wasm-linux-d3ee003-49b266d7eb2-6123022990-Release.zip";
 
 		/// <summary>
 		/// Min version of the emscripten SDK. Must be aligned with dotnet/runtime SDK build in <see cref="NetCoreWasmSDKUri"/>.

diff --git a/src/Uno.Wasm.Bootstrap/Externals/Mono.Profiler.Aot/ProfileBase.cs b/src/Uno.Wasm.Bootstrap/Externals/Mono.Profiler.Aot/ProfileBase.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+// source https://github.com/mono/mono/commits/a44926a5be1c648deec836e9cdda3c93e25f9a51
 namespace Mono.Profiler.Aot {
     public abstract class ProfileBase {
 

diff --git a/src/Uno.Wasm.Bootstrap/Externals/Mono.Profiler.Aot/ProfileData.cs b/src/Uno.Wasm.Bootstrap/Externals/Mono.Profiler.Aot/ProfileData.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+// source https://github.com/mono/mono/commits/a44926a5be1c648deec836e9cdda3c93e25f9a51
 using System;
 
 namespace Mono.Profiler.Aot
@@ -24,4 +25,4 @@ public ProfileData (ModuleRecord[] modules, TypeRecord[] types, MethodRecord[] m
         public TypeRecord[] Types { get; set; }
         public MethodRecord[] Methods { get; set; }
     }
-}
+}
diff --git a/src/Uno.Wasm.Bootstrap/Externals/Mono.Profiler.Aot/ProfileReader.cs b/src/Uno.Wasm.Bootstrap/Externals/Mono.Profiler.Aot/ProfileReader.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+// source https://github.com/mono/mono/commits/a44926a5be1c648deec836e9cdda3c93e25f9a51
 using System;
 using System.IO;
 using System.Collections.Generic;
@@ -146,4 +147,4 @@ public ProfileData ReadAllData(Stream stream)
         }
     }
 
-}
+}
diff --git a/src/Uno.Wasm.Bootstrap/Externals/Mono.Profiler.Aot/ProfileWriter.cs b/src/Uno.Wasm.Bootstrap/Externals/Mono.Profiler.Aot/ProfileWriter.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+// source https://github.com/mono/mono/commits/a44926a5be1c648deec836e9cdda3c93e25f9a51
 using System;
 using System.IO;
 using System.Collections.Generic;
@@ -28,8 +29,8 @@ private void WriteInt32 (int intValue)
 
         private void WriteString (string str)
         {
-            WriteInt32 (str.Length);
             var buf = Encoding.UTF8.GetBytes (str);
+            WriteInt32 (buf.Length);
             s_stream!.Write (buf, 0, buf.Length);
         }
 

diff --git a/src/Uno.Wasm.Bootstrap/Externals/Mono.Profiler.Aot/Records.cs b/src/Uno.Wasm.Bootstrap/Externals/Mono.Profiler.Aot/Records.cs
@@ -1,5 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+// source https://github.com/mono/mono/commits/a44926a5be1c648deec836e9cdda3c93e25f9a51
+
 using System;
 using System.Text;
 using System.Text.Json;

diff --git a/src/Uno.Wasm.Bootstrap/ShellTask.AOTProfile.cs b/src/Uno.Wasm.Bootstrap/ShellTask.AOTProfile.cs
@@ -65,31 +65,34 @@ public partial class ShellTask_v0
 				var excludedAssemblies = MixedModeExcludedAssembly?.ToDictionary(i => i.ItemSpec, i => i.ItemSpec)
 					?? new Dictionary<string, string>();
 
-				// LoadIntoBufferAsync uses exception filtering
-				excludedMethodsList.AddRange(DefaultAOTProfileExcludedMethods);
+				if (excludedMethodsList.Any() || excludedAssemblies.Any())
+				{
+					// LoadIntoBufferAsync uses exception filtering
+					excludedMethodsList.AddRange(DefaultAOTProfileExcludedMethods);
 
-				TryDumpProfileMethods(profile, "AOTProfileDump.Original.txt");
+					TryDumpProfileMethods(profile, "AOTProfileDump.Original.txt");
 
-				var excludedMethods = excludedMethodsList.Select(e => new Regex(e)).ToList();
+					var excludedMethods = excludedMethodsList.Select(e => new Regex(e)).ToList();
 
-				var q = from m in profile.Methods
-						where !excludedMethods.Any(e => e.Match(m.Type.FullName + '.' + m.Name).Success)
-							&& !excludedAssemblies.ContainsKey(m.Type.Module.Name)
-						select m;
+					var q = from m in profile.Methods
+							where !excludedMethods.Any(e => e.Match(m.Type.FullName + '.' + m.Name).Success)
+								&& !excludedAssemblies.ContainsKey(m.Type.Module.Name)
+							select m;
 
-				profile.Methods = q.ToArray();
+					profile.Methods = q.ToArray();
 
-				TryDumpProfileMethods(profile, "AOTProfileDump.Filtered.txt");
+					TryDumpProfileMethods(profile, "AOTProfileDump.Filtered.txt");
 
-				var writer = new Mono.Profiler.Aot.ProfileWriter();
+					var writer = new Mono.Profiler.Aot.ProfileWriter();
 
-				var outputFile = Path.Combine(IntermediateOutputPath, "aot-filtered.profile");
-				using (var outStream = File.Create(outputFile))
-				{
-					writer.WriteAllData(outStream, profile);
-				}
+					var outputFile = Path.Combine(IntermediateOutputPath, "aot-filtered.profile");
+					using (var outStream = File.Create(outputFile))
+					{
+						writer.WriteAllData(outStream, profile);
+					}
 
-				return outputFile;
+					return outputFile;
+				}
 			}
 
 			return profilePath;