diff --git a/dotnet/src/dotnetframework/Projects/StoreManager/StoreManager.csproj b/dotnet/src/dotnetframework/Projects/StoreManager/StoreManager.csproj index c41b2182e..39fa35871 100644 --- a/dotnet/src/dotnetframework/Projects/StoreManager/StoreManager.csproj +++ b/dotnet/src/dotnetframework/Projects/StoreManager/StoreManager.csproj @@ -9,10 +9,7 @@ GeneXus.StoreManager - - - - + diff --git a/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/ExternalProviderGoogle.cs b/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/ExternalProviderGoogle.cs index db2714e3c..7d6042b7b 100644 --- a/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/ExternalProviderGoogle.cs +++ b/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/ExternalProviderGoogle.cs @@ -49,6 +49,19 @@ public ExternalProviderGoogle() : this(null) public ExternalProviderGoogle(GXService providerService) : base(providerService) { +#if NETFRAMEWORK + AppDomain.CurrentDomain.AssemblyResolve += (sender, args) => + { + if (args.Name.StartsWith(nameof(Google))) + { + int sep = args.Name.IndexOf(','); + if (sep != -1) + return System.Reflection.Assembly.Load(args.Name.Remove(sep)); + } + + return null; + }; +#endif Initialize(); } diff --git a/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj b/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj index 965b1b5f9..e8dd2dcb3 100644 --- a/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj +++ b/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/GXGoogleCloud.csproj @@ -8,11 +8,7 @@ - - - - - + diff --git a/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/app.config b/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/app.config index 70e434f96..612d6bc68 100644 --- a/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/app.config +++ b/dotnet/src/dotnetframework/Providers/Storage/GXGoogleCloud/app.config @@ -1,34 +1,30 @@ - + - - - - - + - + - + - + - + - +