diff --git a/.github/workflows/build-db-container.yml b/.github/workflows/build-db-container.yml index 28f7b40912..f20c0530c7 100644 --- a/.github/workflows/build-db-container.yml +++ b/.github/workflows/build-db-container.yml @@ -70,10 +70,16 @@ jobs: shell: pwsh run: | $manifestCreate = "docker manifest create ghcr.io/particular/servicecontrol-ravendb:${{ env.TAG_NAME }}" + echo "first" $containers = cat src/ServiceControl.RavenDB/containers.json | ConvertFrom-Json + echo "second" $containers | ForEach-Object -Process { $manifestCreate += " --amend ghcr.io/particular/servicecontrol-ravendb:${{ env.TAG_NAME }}-$($_.tag)" } + echo $manifestCreate Invoke-Expression $manifestCreate + echo "third" docker buildx imagetools inspect ghcr.io/particular/servicecontrol-ravendb:${{ env.TAG_NAME }} - docker manifest push ghcr.io/particular/servicecontrol-ravendb:${{ env.TAG_NAME }} \ No newline at end of file + echo "fourth" + docker manifest push ghcr.io/particular/servicecontrol-ravendb:${{ env.TAG_NAME }} + echo "fifth" \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 398136b693..b9aaf2b441 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -34,8 +34,8 @@ - - + + diff --git a/src/ServiceControl.Infrastructure/PluginAssemblyLoadContext.cs b/src/ServiceControl.Infrastructure/PluginAssemblyLoadContext.cs index 53417e74a4..bfe640faa9 100644 --- a/src/ServiceControl.Infrastructure/PluginAssemblyLoadContext.cs +++ b/src/ServiceControl.Infrastructure/PluginAssemblyLoadContext.cs @@ -19,7 +19,9 @@ protected override Assembly Load(AssemblyName assemblyName) // Since we ensure we are using the same version of dependencies in every project, it should be okay to use the already loaded copy. foreach (var assembly in Default.Assemblies) { - if (assembly.FullName == assemblyName.FullName) + var loadedAssembly = assembly.GetName(); + + if (loadedAssembly.Name == assemblyName.Name && loadedAssembly.Version >= assemblyName.Version) { return null; }