Merge pull request #2191 from Cratis:fix/grain-discovery

Fix/grain-discovery

Author: einari

.vscode/launch.json

@@ -71,7 +71,7 @@
             "preLaunchTask": "build",
             "program": "${workspaceFolder}/Source/Tools/AssemblyFixer/bin/Debug/net9.0/AssemblyFixer.dll",
             "args": [
-                "${workspaceFolder}/Source/Clients/DotNET/bin/Debug/net9.0/Cratis.Chronicle.dll",
+                "${workspaceFolder}/Source/Clients/DotNET.InProcess/bin/Release/net9.0/Cratis.Chronicle.InProcess.dll",
                 "Cratis.Chronicle.Orleans;Cratis.Chronicle.Grains;Cratis.Chronicle.Grains.Interfaces"
             ],
             "cwd": "${workspaceFolder}/Source/Tools/AssemblyFixer",

Directory.Packages.props

@@ -21,12 +21,12 @@
         <!-- Cratis -->
         <PackageVersion Include="Cratis.Fundamentals" Version="7.2.1" />
         <PackageVersion Include="Cratis.Metrics.Roslyn" Version="7.2.1" />
-        <PackageVersion Include="Cratis.Applications" Version="17.18.3" />
-        <PackageVersion Include="Cratis.Applications.MongoDB" Version="17.18.2" />
-        <PackageVersion Include="Cratis.Applications.Orleans" Version="17.18.3" />
-        <PackageVersion Include="Cratis.Applications.Orleans.MongoDB" Version="17.18.2" />
-        <PackageVersion Include="Cratis.Applications.ProxyGenerator.Build" Version="17.18.3" />
-        <PackageVersion Include="Cratis.Applications.Swagger" Version="17.18.3" />
+        <PackageVersion Include="Cratis.Applications" Version="17.20.5" />
+        <PackageVersion Include="Cratis.Applications.MongoDB" Version="17.20.5" />
+        <PackageVersion Include="Cratis.Applications.Orleans" Version="17.20.5" />
+        <PackageVersion Include="Cratis.Applications.Orleans.MongoDB" Version="17.20.5" />
+        <PackageVersion Include="Cratis.Applications.ProxyGenerator.Build" Version="17.20.5" />
+        <PackageVersion Include="Cratis.Applications.Swagger" Version="17.20.5" />
         <!-- Orleans -->
         <PackageVersion Include="Microsoft.Orleans.Core.Abstractions" Version="9.2.1" />
         <PackageVersion Include="Microsoft.Orleans.Clustering.AzureStorage" Version="9.2.1" />
@@ -41,7 +41,7 @@
         <PackageVersion Include="Microsoft.Orleans.Sdk" Version="9.2.1" />
         <PackageVersion Include="Microsoft.Orleans.BroadcastChannel" Version="9.2.1" />
         <PackageVersion Include="Microsoft.Orleans.TestingHost" Version="9.2.1" />
-        <PackageVersion Include="OrleansTestKit" Version="8.2.2" />
+        <PackageVersion Include="OrleansTestKit" Version="9.0.0" />
         <PackageVersion Include="OrleansDashboard" Version="8.2.0" />
         <PackageVersion Include="Orleans.Providers.MongoDB" Version="9.2.0" />
         <!-- Open Telemetry -->
@@ -61,13 +61,13 @@
         <PackageVersion Include="Microsoft.Orleans.Analyzers" Version="9.2.1" />
         <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" NoWarn="NU5104" />
         <PackageVersion Include="Roslynator.Analyzers" Version="4.14.1" />
-        <PackageVersion Include="Meziantou.Analyzer" Version="2.0.235" />
+        <PackageVersion Include="Meziantou.Analyzer" Version="2.0.238" />
         <!-- Not categorized -->
         <PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
         <PackageVersion Include="castle.core" Version="5.2.1" />
         <PackageVersion Include="docfx.console" Version="2.59.4" />
         <PackageVersion Include="humanizer" Version="2.14.1" />
-        <PackageVersion Include="ILRepack.Lib.MSBuild.Task" Version="2.0.44">
+        <PackageVersion Include="ILRepack.Lib.MSBuild.Task" Version="2.0.43">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageVersion>

Source/Tools/AssemblyFixer/AssemblyFixer.csproj

@@ -1,9 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
-      <PackageReference Include="Mono.Cecil" />
+        <PackageReference Include="Mono.Cecil" />
+        <PackageReference Include="Microsoft.Orleans.Sdk" />
     </ItemGroup>
 </Project>

Source/Tools/AssemblyFixer/Program.cs

@@ -4,6 +4,8 @@
 using Cratis.Collections;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using Mono.Cecil.Rocks;
+using Orleans.Serialization.Configuration;
 
 Console.WriteLine("\nAssembly fixer\n");
 
@@ -74,6 +76,24 @@
     assembly.CustomAttributes.Remove(attribute);
 });
 
+var attrCtor = assembly.MainModule.ImportReference(typeof(TypeManifestProviderAttribute).GetConstructor([typeof(Type)]));
+var systemTypeRef = assembly.MainModule.ImportReference(typeof(Type));
+
+var typeManifestProviderBaseTypes = assembly.MainModule.GetAllTypes().Where(type => type.BaseType?.Name == "TypeManifestProviderBase").ToArray();
+var typeManifestProviderAttributes = typeManifestProviderBaseTypes.Select(type =>
+{
+    var ca = new CustomAttribute(attrCtor);
+    ca.ConstructorArguments.Add(new CustomAttributeArgument(systemTypeRef, type));
+
+    return ca;
+});
+
+foreach (var attribute in typeManifestProviderAttributes)
+{
+    Console.WriteLine($"Adding TypeManifestProviderAttribute for '{attribute.ConstructorArguments[0].Value}'");
+    assembly.CustomAttributes.Add(attribute);
+}
+
 if (referencesToRemove.Length > 0)
 {
     Console.WriteLine("Removing references");
@@ -101,3 +121,5 @@
 var assemblyPdbPath = Path.ChangeExtension(assemblyPath, ".pdb");
 File.Copy(tempAssemblyPath, assemblyPath, true);
 File.Copy(tempPdbPath, assemblyPdbPath, true);
+
+// Orleans.Serialization.Configuration.TypeManifestProviderAttribute