Replace ModuleInit.Fody with ModuleInitializer

GeertvanHorrik · GeertvanHorrik · commit 8269e9162b5c · 2025-11-25T11:10:04.000+01:00
diff --git a/src/Orc.Controls.Example/FodyWeavers.xml b/src/Orc.Controls.Example/FodyWeavers.xml
@@ -1,6 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Weavers VerifyAssembly="true" VerifyIgnoreCodes="0x80131869" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ModuleInit />
   <Catel />
   <LoadAssembliesOnStartup />
 </Weavers>
diff --git a/src/Orc.Controls.Example/ModuleInitializer.cs b/src/Orc.Controls.Example/ModuleInitializer.cs
@@ -1,4 +1,5 @@
-﻿using Catel.IoC;
+using System.Runtime.CompilerServices;
+using Catel.IoC;
 using Orc.Controls.Example.Watchers;
 
 /// <summary>
@@ -9,6 +10,7 @@ public static class ModuleInitializer
     /// <summary>
     /// Initializes the module.
     /// </summary>
+    [ModuleInitializer]
     public static void Initialize()
     {
         var serviceLocator = ServiceLocator.Default;
diff --git a/src/Orc.Controls.Example/Orc.Controls.Example.csproj b/src/Orc.Controls.Example/Orc.Controls.Example.csproj
@@ -20,7 +20,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LoadAssembliesOnStartup.Fody" Version="4.7.0" PrivateAssets="all" />
-    <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="Orchestra.Core" Version="7.2.3" />
   </ItemGroup>
 
diff --git a/src/Orc.Controls.Settings/FodyWeavers.xml b/src/Orc.Controls.Settings/FodyWeavers.xml
@@ -5,7 +5,6 @@
       <!-- Add excluded assemblies here -->
     </ExcludeAssemblies>
   </LoadAssembliesOnStartup>
-  <ModuleInit />
   <MethodTimer />
   <Obsolete />
   <Catel />
diff --git a/src/Orc.Controls.Settings/ModuleInitializer.cs b/src/Orc.Controls.Settings/ModuleInitializer.cs
@@ -1,4 +1,5 @@
-﻿using Catel.IoC;
+using System.Runtime.CompilerServices;
+using Catel.IoC;
 using Catel.Services;
 
 /// <summary>
@@ -9,6 +10,7 @@ public static class ModuleInitializer
     /// <summary>
     /// Initializes the module.
     /// </summary>
+    [ModuleInitializer]
     public static void Initialize()
     {
         var serviceLocator = ServiceLocator.Default;
diff --git a/src/Orc.Controls.Settings/Orc.Controls.Settings.csproj b/src/Orc.Controls.Settings/Orc.Controls.Settings.csproj
@@ -30,7 +30,6 @@
     </PackageReference>
     <PackageReference Include="LoadAssembliesOnStartup.Fody" Version="4.7.0" PrivateAssets="all" />
     <PackageReference Include="MethodTimer.Fody" Version="3.2.3" PrivateAssets="all" />
-    <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.1" PrivateAssets="all" />
     <PackageReference Include="Orc.Automation" Version="5.1.0-alpha0533" />
     <PackageReference Include="Orc.FileSystem" Version="5.1.0-alpha0848" />
diff --git a/src/Orc.Controls.Tests/FodyWeavers.xml b/src/Orc.Controls.Tests/FodyWeavers.xml
@@ -1,5 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Weavers VerifyAssembly="true" VerifyIgnoreCodes="0x80131869" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ModuleInit />
   <Catel />
 </Weavers>
diff --git a/src/Orc.Controls.Tests/ModuleInitializer.cs b/src/Orc.Controls.Tests/ModuleInitializer.cs
@@ -1,11 +1,13 @@
-﻿/// <summary>
+using System.Runtime.CompilerServices;
+/// <summary>
 /// Used by the ModuleInit. All code inside the Initialize method is ran as soon as the assembly is loaded.
 /// </summary>
 public static class ModuleInitializer
 {
     /// <summary>
     /// Initializes the module.
     /// </summary>
+    [ModuleInitializer]
     public static void Initialize()
     {
 
diff --git a/src/Orc.Controls.Tests/Orc.Controls.Tests.csproj b/src/Orc.Controls.Tests/Orc.Controls.Tests.csproj
@@ -18,7 +18,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.4.0" PrivateAssets="all" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0">
diff --git a/src/Orc.Controls/FodyWeavers.xml b/src/Orc.Controls/FodyWeavers.xml
@@ -5,7 +5,6 @@
       <!-- Add excluded assemblies here -->
     </ExcludeAssemblies>
   </LoadAssembliesOnStartup>
-  <ModuleInit />
   <MethodTimer />
   <Obsolete />
   <Catel />
diff --git a/src/Orc.Controls/ModuleInitializer.cs b/src/Orc.Controls/ModuleInitializer.cs
@@ -1,4 +1,5 @@
-﻿using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Linq;
 using Catel.IoC;
 using Catel.Logging;
 using Catel.MVVM;
@@ -15,6 +16,7 @@ public static class ModuleInitializer
     /// <summary>
     /// Initializes the module.
     /// </summary>
+    [ModuleInitializer]
     public static void Initialize()
     {
         var serviceLocator = ServiceLocator.Default;
diff --git a/src/Orc.Controls/Orc.Controls.csproj b/src/Orc.Controls/Orc.Controls.csproj
@@ -30,7 +30,6 @@
     </PackageReference>
     <PackageReference Include="LoadAssembliesOnStartup.Fody" Version="4.7.0" PrivateAssets="all" />
     <PackageReference Include="MethodTimer.Fody" Version="3.2.3" PrivateAssets="all" />
-    <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.1" PrivateAssets="all" />
     <PackageReference Include="Orc.Automation" Version="5.1.0-alpha0533" />
     <PackageReference Include="Orc.FileSystem" Version="5.1.0-alpha0848" />

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`		`-/// <summary>`
	`1`	`+using System.Runtime.CompilerServices;`
	`2`	`+/// <summary>`
`2`	`3`	`/// Used by the ModuleInit. All code inside the Initialize method is ran as soon as the assembly is loaded.`
`3`	`4`	`/// </summary>`
`4`	`5`	`public static class ModuleInitializer`
`5`	`6`	`{`
`6`	`7`	`/// <summary>`
`7`	`8`	`/// Initializes the module.`
`8`	`9`	`/// </summary>`
	`10`	`+ [ModuleInitializer]`
`9`	`11`	`public static void Initialize()`
`10`	`12`	`{`
`11`	`13`