Merge pull request #119 from sunnamed434/dev

Bump new version 0.13.1-alpha.25

Author: sunnamed434

BitMono.sln

@@ -12,7 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		LICENSE = LICENSE
 		README.md = README.md
 		props\SharedProjectProps.props = props\SharedProjectProps.props
-		PREVIEWS.md = PREVIEWS.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D87066C4-1144-4BD8-96E9-9F4676001397}"

CHANGELOG.md

@@ -1,5 +1,6 @@
 | Versions:                       |
 |---------------------------------|
+| [v0.13.1-alpha](#v0131-alpha25) |
 | [v0.13.0-alpha](#v0130-alpha24) |
 | [v0.12.2-alpha](#v0122-alpha23) |
 | [v0.12.1-alpha](#v0121-alpha22) |
@@ -26,6 +27,11 @@
 | [v0.1.0](#v010)                 |
 
 ---
+### v0.13.1-alpha.25:
+2023-04-15
+#### Fixed:
+* Assembly Resolve, which caused problems with PE build.
+
 ### v0.13.0-alpha.24:
 2023-04-05
 #### Added:

src/BitMono.API/BitMono.API.csproj

@@ -11,6 +11,7 @@
     <PackageReference Include="AsmResolver.DotNet" Version="5.1.0" />
     <PackageReference Include="Autofac" Version="6.5.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0-eap1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />

src/BitMono.CLI/BitMono.CLI.csproj

@@ -14,6 +14,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0-eap1" />
     <PackageReference Include="morelinq" Version="3.3.2" />
     <PackageReference Include="NullGuard.Fody" Version="3.1.1" />
     <PackageReference Include="Serilog" Version="3.0.0-dev-01862" />

src/BitMono.CLI/Program.cs

@@ -5,7 +5,6 @@ internal class Program
 {
     private static readonly string BitMonoFileVersionText =
         $"BitMono v{FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location).FileVersion}";
-
     private static readonly string AsciiArt = @$"
        ___  _ __  __  ___
       / _ )(_) /_/  |/  /__  ___  ___
@@ -30,7 +29,7 @@ private static async Task<int> Main(string[] args)
                 .Build();
 
             var lifetimeScope = serviceProvider.LifetimeScope;
-            var obfuscation = lifetimeScope.Resolve<IOptions<Shared.Models.Obfuscation>>().Value;
+            var obfuscation = lifetimeScope.Resolve<IOptions<Shared.Models.ObfuscationSettings>>().Value;
             var logger = lifetimeScope
                 .Resolve<ILogger>()
                 .ForContext<Program>();

src/BitMono.Core/Analyzing/ReflectionCriticalAnalyzer.cs

@@ -2,7 +2,7 @@ namespace BitMono.Core.Analyzing;
 
 public class ReflectionCriticalAnalyzer : ICriticalAnalyzer<MethodDefinition>
 {
-    private readonly Obfuscation m_Obfuscation;
+    private readonly ObfuscationSettings _obfuscationSettings;
     private readonly List<MethodDefinition> m_CachedMethods;
     private static readonly string[] ReflectionMethods = new string[]
     {
@@ -13,17 +13,17 @@ public class ReflectionCriticalAnalyzer : ICriticalAnalyzer<MethodDefinition>
         nameof(Type.GetMember),
     };
 
-    public ReflectionCriticalAnalyzer(IOptions<Obfuscation> obfuscation)
+    public ReflectionCriticalAnalyzer(IOptions<ObfuscationSettings> obfuscation)
     {
-        m_Obfuscation = obfuscation.Value;
+        _obfuscationSettings = obfuscation.Value;
         m_CachedMethods = new List<MethodDefinition>();
     }
 
     public IReadOnlyList<MethodDefinition> CachedMethods => m_CachedMethods.AsReadOnly();
 
     public bool NotCriticalToMakeChanges(MethodDefinition method)
     {
-        if (m_Obfuscation.ReflectionMembersObfuscationExclude == false)
+        if (_obfuscationSettings.ReflectionMembersObfuscationExclude == false)
         {
             return true;
         }

src/BitMono.Core/Analyzing/SerializableBitCriticalAnalyzer.cs

@@ -2,16 +2,16 @@ namespace BitMono.Core.Analyzing;
 
 public class SerializableBitCriticalAnalyzer : ICriticalAnalyzer<TypeDefinition>
 {
-    private readonly Obfuscation m_Obfuscation;
+    private readonly ObfuscationSettings _obfuscationSettings;
 
-    public SerializableBitCriticalAnalyzer(IOptions<Obfuscation> obfuscation)
+    public SerializableBitCriticalAnalyzer(IOptions<ObfuscationSettings> obfuscation)
     {
-        m_Obfuscation = obfuscation.Value;
+        _obfuscationSettings = obfuscation.Value;
     }
 
     public bool NotCriticalToMakeChanges(TypeDefinition type)
     {
-        if (m_Obfuscation.SerializableBitObfuscationExclude == false)
+        if (_obfuscationSettings.SerializableBitObfuscationExclude == false)
         {
             return true;
         }

src/BitMono.Core/Analyzing/SpecificNamespaceCriticalAnalyzer.cs

@@ -2,21 +2,21 @@
 
 public class SpecificNamespaceCriticalAnalyzer : ICriticalAnalyzer<IMetadataMember>
 {
-    private readonly Obfuscation m_Obfuscation;
+    private readonly ObfuscationSettings _obfuscationSettings;
 
-    public SpecificNamespaceCriticalAnalyzer(IOptions<Obfuscation> obfuscation)
+    public SpecificNamespaceCriticalAnalyzer(IOptions<ObfuscationSettings> obfuscation)
     {
-        m_Obfuscation = obfuscation.Value;
+        _obfuscationSettings = obfuscation.Value;
     }
 
     public bool NotCriticalToMakeChanges(IMetadataMember member)
     {
-        if (m_Obfuscation.SpecificNamespacesObfuscationOnly == false)
+        if (_obfuscationSettings.SpecificNamespacesObfuscationOnly == false)
         {
             return true;
         }
 
-        var specificNamespaces = m_Obfuscation.SpecificNamespaces;
+        var specificNamespaces = _obfuscationSettings.SpecificNamespaces;
         if (member is TypeDefinition type && type.HasNamespace())
         {
             if (specificNamespaces.Any(s => s.Equals(type.Namespace.Value)) == false)

src/BitMono.Core/BitMono.Core.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="AsmResolver.DotNet" Version="5.1.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0-eap1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
     <PackageReference Include="NullGuard.Fody" Version="3.1.0" />
     <PackageReference Include="Pocket" Version="0.0.3" />

src/BitMono.Core/Renaming/Renamer.cs

@@ -5,24 +5,24 @@ public class Renamer
 {
     private readonly NameCriticalAnalyzer _nameCriticalAnalyzer;
     private readonly SpecificNamespaceCriticalAnalyzer _specificNamespaceCriticalAnalyzer;
-    private readonly Obfuscation _obfuscation;
+    private readonly ObfuscationSettings _obfuscationSettings;
     private readonly RandomNext _randomNext;
 
     public Renamer(
         NameCriticalAnalyzer nameCriticalAnalyzer,
         SpecificNamespaceCriticalAnalyzer specificNamespaceCriticalAnalyzer,
-        IOptions<Obfuscation> configuration,
+        IOptions<ObfuscationSettings> configuration,
         RandomNext randomNext)
     {
         _nameCriticalAnalyzer = nameCriticalAnalyzer;
         _specificNamespaceCriticalAnalyzer = specificNamespaceCriticalAnalyzer;
-        _obfuscation = configuration.Value;
+        _obfuscationSettings = configuration.Value;
         _randomNext = randomNext;
     }
 
     public string RenameUnsafely()
     {
-        var strings = _obfuscation.RandomStrings;
+        var strings = _obfuscationSettings.RandomStrings;
         var randomStringOne = strings[_randomNext(0, strings.Length - 1)] + " " + strings[_randomNext(0, strings.Length - 1)];
         var randomStringTwo = strings[_randomNext(0, strings.Length - 1)];
         var randomStringThree = strings[_randomNext(0, strings.Length - 1)];