Merge branch 'release/5.2.0'

WildGums · Sep 21, 2024 · 48f8734 · 48f8734
2 parents 494b6f0 + c85168e
commit 48f8734
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 38 deletions.
diff --git a/deployment/cake/lib-msbuild.cake b/deployment/cake/lib-msbuild.cake
@@ -1,5 +1,5 @@
-#addin "nuget:?package=Cake.Issues&version=4.10.0"
-#addin "nuget:?package=Cake.Issues.MsBuild&version=4.10.0"
+#addin "nuget:?package=Cake.Issues&version=4.10.1"
+#addin "nuget:?package=Cake.Issues.MsBuild&version=4.10.1"
 #addin "nuget:?package=System.Configuration.ConfigurationManager&version=8.0.0"
 
 #tool "nuget:?package=MSBuild.Extension.Pack&version=1.9.1"

diff --git a/src/Orc.Extensibility.Example.Api/Orc.Extensibility.Example.Api.csproj b/src/Orc.Extensibility.Example.Api/Orc.Extensibility.Example.Api.csproj
@@ -19,7 +19,7 @@
   <ItemGroup>
     <PackageReference Include="Catel.MVVM" Version="6.0.3" />
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Fody" Version="6.8.1" PrivateAssets="all">
+    <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />

diff --git a/src/Orc.Extensibility.Example.ExtensionA/FodyWeavers.xml b/src/Orc.Extensibility.Example.ExtensionA/FodyWeavers.xml
@@ -4,12 +4,23 @@
     <Catel />
     <Costura>
         <IncludeAssemblies>
+            Azure.* <!-- required for Microsoft.Data.SqlClient -->
+            EntityFramework
+            EntityFramework.SqlServer
+            Microsoft.Identity.Client*
+            Microsoft.SqlServer.*
             Newtonsoft.Json
             Orc.Metadata
             Orc.Search
             Orc.Search.Xaml
             YamlDotNet
         </IncludeAssemblies>
+        <IncludeRuntimeAssemblies>
+            Microsoft.Data.SqlClient
+            Microsoft.Data.SqlClient.SNI
+            System.Data.SqlClient
+            sni
+        </IncludeRuntimeAssemblies>
     </Costura>
     <LoadAssembliesOnStartup>
         <IncludeAssemblies>

diff --git a/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj b/src/Orc.Extensibility.Example.ExtensionA/Orc.Extensibility.Example.ExtensionA.csproj
@@ -19,17 +19,20 @@
   <ItemGroup>
     <PackageReference Include="Catel.MVVM" Version="6.0.3" />
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
-    <PackageReference Include="Fody" Version="6.8.1" PrivateAssets="all">
+    <PackageReference Include="Costura.Fody" Version="6.0.0-alpha0384" PrivateAssets="all" />
+    <PackageReference Include="EntityFramework" Version="6.5.1" />
+    <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LoadAssembliesOnStartup.Fody" Version="4.6.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" PrivateAssets="all" />
     <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" />
     <PackageReference Include="Orc.Controls" Version="5.0.5" />
     <PackageReference Include="Orc.Search.Xaml" Version="5.0.0" />
     <PackageReference Include="Orchestra.Core" Version="7.0.1" />
-    <PackageReference Include="YamlDotNet" Version="16.0.0" PrivateAssets="all" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+    <PackageReference Include="YamlDotNet" Version="16.1.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Orc.Extensibility.Example.ExtensionA/Plugins/PluginA.cs b/src/Orc.Extensibility.Example.ExtensionA/Plugins/PluginA.cs
@@ -25,6 +25,26 @@ public async Task InitializeAsync()
         var value = _languageService.GetRequiredString("TestResource");
 
         Log.Info($"{typeof(YamlDotNet.Core.AnchorName).FullName}");
+        Log.Info($"{typeof(System.Data.SqlClient.SqlClientFactory).FullName}");
+        Log.Info($"{typeof(Microsoft.Data.SqlClient.SqlClientFactory).FullName}");
+        Log.Info($"{typeof(Microsoft.Data.SqlClient.SqlConnection).FullName}");
+
+        try
+        {
+            var connectionString = ".\\SQLExpress";
+
+            System.Data.Entity.Database.Exists(connectionString);
+
+            //using (var connection = new System.Data.SqlClient.SqlConnection(connectionString))
+            //{
+            //    await connection.OpenAsync();
+            //}
+        }
+        catch 
+        {
+            // Ignore
+            Log.Error("Failed to open database connection");
+        }
 
         await _messageService.ShowAsync($"Plugin A has been loaded, setting color to red. Resource value: '{value}'");
 

diff --git a/src/Orc.Extensibility.Example.ExtensionB/Orc.Extensibility.Example.ExtensionB.csproj b/src/Orc.Extensibility.Example.ExtensionB/Orc.Extensibility.Example.ExtensionB.csproj
@@ -19,8 +19,8 @@
   <ItemGroup>
     <PackageReference Include="Catel.MVVM" Version="6.0.3" />
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
-    <PackageReference Include="Fody" Version="6.8.1" PrivateAssets="all">
+    <PackageReference Include="Costura.Fody" Version="6.0.0-alpha0384" PrivateAssets="all" />
+    <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LoadAssembliesOnStartup.Fody" Version="4.6.0" PrivateAssets="all" />

diff --git a/src/Orc.Extensibility.Example/Orc.Extensibility.Example.csproj b/src/Orc.Extensibility.Example/Orc.Extensibility.Example.csproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Catel.MVVM" Version="6.0.3" />
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Fody" Version="6.8.1" PrivateAssets="all">
+    <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LoadAssembliesOnStartup.Fody" Version="4.6.0" PrivateAssets="all" />

diff --git a/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj b/src/Orc.Extensibility.Tests/Orc.Extensibility.Tests.csproj
@@ -14,16 +14,17 @@
 
   <ItemGroup>
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Fody" Version="6.8.1" PrivateAssets="all">
+    <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="ModuleInit.Fody" Version="2.1.1" PrivateAssets="all" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="NUnit" Version="4.1.0" PrivateAssets="all" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NUnit" Version="4.2.2" PrivateAssets="all" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" PrivateAssets="all" />
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" PrivateAssets="all" />
-    <PackageReference Include="Verify.NUnit" Version="26.2.0" />
+    <PackageReference Include="Verify.NUnit" Version="26.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ensibility.Tests/PublicApiFacts.Orc_Extensibility_HasNoBreakingChanges_Async.verified.txt b/...ensibility.Tests/PublicApiFacts.Orc_Extensibility_HasNoBreakingChanges_Async.verified.txt
@@ -307,10 +307,10 @@ namespace Orc.Extensibility
     public class RuntimeAssemblyResolverService : Orc.Extensibility.IRuntimeAssemblyResolverService
     {
         public RuntimeAssemblyResolverService(Orc.FileSystem.IFileService fileService, Orc.FileSystem.IDirectoryService directoryService, Orc.Extensibility.IAssemblyReflectionService assemblyReflectionService, Catel.Services.IAppDataService appDataService) { }
-        protected virtual System.Threading.Tasks.Task<System.Collections.Generic.List<Orc.Extensibility.ICosturaRuntimeAssembly>?> FindEmbeddedAssembliesViaMetadataAsync(System.Collections.Generic.IEnumerable<Orc.Extensibility.EmbeddedResource> resources) { }
+        protected virtual System.Threading.Tasks.Task<System.Collections.Generic.List<Orc.Extensibility.ICosturaRuntimeAssembly>?> FindEmbeddedAssembliesViaCosturaMetadataAsync(System.Collections.Generic.IEnumerable<Orc.Extensibility.EmbeddedResource> resources) { }
         protected System.Threading.Tasks.Task<System.Collections.Generic.List<Orc.Extensibility.EmbeddedResource>> FindEmbeddedResourcesAsync(System.Reflection.PortableExecutable.PEReader peReader, Orc.Extensibility.IRuntimeAssembly containerAssembly) { }
         public Orc.Extensibility.IPluginLoadContext[] GetPluginLoadContexts() { }
-        protected virtual System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<Orc.Extensibility.IRuntimeAssembly>> IndexCosturaEmbeddedAssembliesAsync(Orc.Extensibility.IPluginLoadContext pluginLoadContext, Orc.Extensibility.IRuntimeAssembly? originatingAssembly, Orc.Extensibility.IRuntimeAssembly runtimeAssembly) { }
+        protected virtual System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<Orc.Extensibility.IRuntimeAssembly>> IndexCosturaClassicEmbeddedAssembliesAsync(Orc.Extensibility.IPluginLoadContext pluginLoadContext, Orc.Extensibility.IRuntimeAssembly? originatingAssembly, Orc.Extensibility.IRuntimeAssembly runtimeAssembly) { }
         public System.Threading.Tasks.Task RegisterAssemblyAsync(Orc.Extensibility.IRuntimeAssembly runtimeAssembly) { }
         protected System.Threading.Tasks.Task RegisterAssemblyAsync(Orc.Extensibility.IPluginLoadContext pluginLoadContext, Orc.Extensibility.IRuntimeAssembly? originatingAssembly, Orc.Extensibility.IRuntimeAssembly runtimeAssembly) { }
         protected virtual bool ShouldIgnoreAssemblyForCosturaExtracting(Orc.Extensibility.IPluginLoadContext pluginLoadContext, Orc.Extensibility.IRuntimeAssembly? originatingAssembly, Orc.Extensibility.IRuntimeAssembly runtimeAssembly) { }

diff --git a/src/Orc.Extensibility/DotNetCorePlugins/Internal/PlatformInformation.cs b/src/Orc.Extensibility/DotNetCorePlugins/Internal/PlatformInformation.cs
@@ -31,8 +31,15 @@ static PlatformInformation()
             NativeLibraryPrefixes = new[] { string.Empty };
             NativeLibraryExtensions = new[] { ".dll" };
 
-            // For now we only care about windows
-            runtimeIdentifiers.Add($"win-{RuntimeInformation.OSArchitecture.ToString().ToLower()}");
+            var runtimeIdentifier = RuntimeInformation.RuntimeIdentifier;
+            var osArchitecture = RuntimeInformation.OSArchitecture.ToString();
+
+            Log.Debug($"OS Architecture:    {osArchitecture}");
+            Log.Debug($"Runtime identifier: {runtimeIdentifier}");
+
+            // Note that we need to respect the process, not the OS
+            runtimeIdentifiers.Add(runtimeIdentifier);
+            //runtimeIdentifiers.Add($"win-{osArchitecture.ToLower()}");
             runtimeIdentifiers.Add("win");
         }
         else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
@@ -55,4 +62,4 @@ static PlatformInformation()
 
         RuntimeIdentifiers = runtimeIdentifiers.ToArray();
     }
-}
+}
diff --git a/src/Orc.Extensibility/Orc.Extensibility.csproj b/src/Orc.Extensibility/Orc.Extensibility.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="Catel.Fody" Version="4.9.0" PrivateAssets="all" />
-    <PackageReference Include="Fody" Version="6.8.1" PrivateAssets="all">
+    <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MethodTimer.Fody" Version="3.2.2" PrivateAssets="all" />
@@ -28,11 +28,11 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
-    <PackageReference Include="System.Reflection.MetadataLoadContext" Version="6.0.*" />
+    <PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
   </ItemGroup>  
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net8.0')) ">
-    <PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.*" />
+    <PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
   </ItemGroup>
 
   <Import Project="$(MSBuildProjectDirectory)\..\Directory.build.nullable.props" Condition="Exists('$(MSBuildProjectDirectory)\..\Directory.build.nullable.props')" />

diff --git a/src/Orc.Extensibility/Services/RuntimeAssemblyResolverService.cs b/src/Orc.Extensibility/Services/RuntimeAssemblyResolverService.cs
@@ -2,22 +2,17 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO.Compression;
 using System.IO;
 using System.Linq;
 using System.Reflection.PortableExecutable;
-using System.Reflection;
 using Catel.Logging;
 using Orc.FileSystem;
 using Catel.Services;
 using System.Reflection.Metadata;
 using Catel;
 using MethodTimer;
-using Catel.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using System.Diagnostics;
 using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 
 public partial class RuntimeAssemblyResolverService : IRuntimeAssemblyResolverService
 {
@@ -86,12 +81,12 @@ public async Task UnregisterAssemblyAsync(IRuntimeAssembly runtimeAssembly)
 
     protected async Task RegisterAssemblyAsync(IPluginLoadContext pluginLoadContext, IRuntimeAssembly? originatingAssembly, IRuntimeAssembly runtimeAssembly)
     {
-        var assemblies = await IndexCosturaEmbeddedAssembliesAsync(pluginLoadContext, originatingAssembly, runtimeAssembly);
+        var assemblies = await IndexCosturaClassicEmbeddedAssembliesAsync(pluginLoadContext, originatingAssembly, runtimeAssembly);
         pluginLoadContext.RuntimeAssemblies.AddRange(assemblies);
     }
 
     [Time("{runtimeAssembly}")]
-    protected virtual async Task<IEnumerable<IRuntimeAssembly>> IndexCosturaEmbeddedAssembliesAsync(IPluginLoadContext pluginLoadContext, IRuntimeAssembly? originatingAssembly, IRuntimeAssembly runtimeAssembly)
+    protected virtual async Task<IEnumerable<IRuntimeAssembly>> IndexCosturaClassicEmbeddedAssembliesAsync(IPluginLoadContext pluginLoadContext, IRuntimeAssembly? originatingAssembly, IRuntimeAssembly runtimeAssembly)
     {
         // Ignore specific assemblies
         if (ShouldIgnoreAssemblyForCosturaExtracting(pluginLoadContext, originatingAssembly, runtimeAssembly))
@@ -119,7 +114,7 @@ protected virtual async Task<IEnumerable<IRuntimeAssembly>> IndexCosturaEmbedded
                         var embeddedResources = await FindEmbeddedResourcesAsync(peReader, runtimeAssembly);
                         if (embeddedResources.Count > 0)
                         {
-                            var costuraEmbeddedAssembliesFromMetadata = await FindEmbeddedAssembliesViaMetadataAsync(embeddedResources);
+                            var costuraEmbeddedAssembliesFromMetadata = await FindEmbeddedAssembliesViaCosturaMetadataAsync(embeddedResources);
                             if (costuraEmbeddedAssembliesFromMetadata is null)
                             {
                                 Log.Error($"Files are embedded with an older version of Costura (< 5.x). It's required to update so metadata is embedded by Costura");
@@ -132,6 +127,8 @@ protected virtual async Task<IEnumerable<IRuntimeAssembly>> IndexCosturaEmbedded
                                 if (costuraEmbeddedAssembly.IsRuntime)
                                 {
                                     // Check if correct platform
+                                    //RuntimeInformation.RuntimeIdentifier
+
                                     if (!PlatformInformation.RuntimeIdentifiers.Any(x => costuraEmbeddedAssembly.RelativeFileName.ContainsIgnoreCase($"/{x}/")))
                                     {
                                         Log.Debug($"Ignoring '{costuraEmbeddedAssembly}' since it's not applicable to the current platform");
@@ -167,7 +164,7 @@ protected virtual async Task<IEnumerable<IRuntimeAssembly>> IndexCosturaEmbedded
                                 indexedCosturaAssemblies.Add(costuraEmbeddedAssembly);
 
                                 // Recursive indexing
-                                var recursiveRuntimeAssemblies = await IndexCosturaEmbeddedAssembliesAsync(pluginLoadContext, originatingAssembly, costuraEmbeddedAssembly);
+                                var recursiveRuntimeAssemblies = await IndexCosturaClassicEmbeddedAssembliesAsync(pluginLoadContext, originatingAssembly, costuraEmbeddedAssembly);
                                 if (recursiveRuntimeAssemblies.Any())
                                 {
                                     indexedCosturaAssemblies.AddRange(recursiveRuntimeAssemblies);
@@ -288,11 +285,11 @@ protected async Task<List<EmbeddedResource>> FindEmbeddedResourcesAsync(PEReader
         return embeddedResources;
     }
 
-    protected virtual async Task<List<ICosturaRuntimeAssembly>?> FindEmbeddedAssembliesViaMetadataAsync(IEnumerable<EmbeddedResource> resources)
+    protected virtual async Task<List<ICosturaRuntimeAssembly>?> FindEmbeddedAssembliesViaCosturaMetadataAsync(IEnumerable<EmbeddedResource> resources)
     {
         var metadataResource = (from x in resources
-            where x.Name.EqualsIgnoreCase("costura.metadata")
-            select x).FirstOrDefault();
+                                where x.Name.EqualsIgnoreCase("costura.metadata")
+                                select x).FirstOrDefault();
         if (metadataResource is null)
         {
             // Not found, return null
@@ -319,8 +316,8 @@ where x.Name.EqualsIgnoreCase("costura.metadata")
                         var costuraEmbeddedResource = new CosturaRuntimeAssembly(line);
 
                         var embeddedResource = (from x in resources
-                            where x.Name == costuraEmbeddedResource.ResourceName
-                            select x).FirstOrDefault();
+                                                where x.Name == costuraEmbeddedResource.ResourceName
+                                                select x).FirstOrDefault();
                         if (embeddedResource is null)
                         {
                             Log.Error($"Expected to find Costura embedded resource '{costuraEmbeddedResource.ResourceName}', but could not find it");
@@ -337,4 +334,4 @@ where x.Name.EqualsIgnoreCase("costura.metadata")
 
         return embeddedResources;
     }
-}
+}