Updating NuGet packages to latest minor/patch versions (#8856)

Author: BenedekFarkas

.github/workflows/specflow.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - dev
+      - task/nuget-updates
   schedule:
     - cron: '0 0 * * 1' # Every Monday midnight.
 

src/.editorconfig

@@ -8,4 +8,7 @@ trim_trailing_whitespace = true
 
 [*.cs]
 csharp_new_line_before_open_brace = none
-dotnet_sort_system_directives_first = true
+dotnet_sort_system_directives_first = true
+
+[*.config]
+indent_size = 2

src/Libraries/NHibernate/NHibernate.Linq/NHibernate.Linq.csproj

@@ -45,12 +45,12 @@
     <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll</HintPath>
+    <Reference Include="Iesi.Collections, Version=4.1.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Iesi.Collections.4.1.1\lib\net462\Iesi.Collections.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NHibernate, Version=5.5.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll</HintPath>
+    <Reference Include="NHibernate, Version=5.6.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\NHibernate.5.6.0\lib\net48\NHibernate.dll</HintPath>
     </Reference>
     <Reference Include="Remotion.Linq, Version=2.2.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll</HintPath>

src/Libraries/NHibernate/NHibernate.Linq/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr3.Runtime" version="3.5.1" targetFramework="net48" />
-  <package id="Iesi.Collections" version="4.0.4" targetFramework="net48" />
-  <package id="NHibernate" version="5.5.2" targetFramework="net48" />
+  <package id="Iesi.Collections" version="4.1.1" targetFramework="net48" />
+  <package id="NHibernate" version="5.6.0" targetFramework="net48" />
   <package id="Remotion.Linq" version="2.2.0" targetFramework="net48" />
   <package id="Remotion.Linq.EagerFetching" version="2.2.0" targetFramework="net48" />
 </packages>

src/Orchard.Azure.Tests/App.config

@@ -1,48 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="AzureSDK" value="C:\Program Files (x86)\Microsoft SDKs\Azure\" />
-
     <add key="Orchard.Azure.Settings.StorageConnectionString" value="UseDevelopmentStorage=true" />
     <add key="Orchard.Azure.Media.StorageConnectionString" value="UseDevelopmentStorage=true" />
   </appSettings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.WindowsAzure.ServiceRuntime" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Iesi.Collections" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

src/Orchard.Azure.Tests/AzureVirtualEnvironmentTest.cs

@@ -1,77 +1,49 @@
-using System;
-using System.Configuration;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using Microsoft.WindowsAzure.Storage;
+using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Blob;
 using NUnit.Framework;
+using Orchard.Azure.Services.Environment.Configuration;
 
 namespace Orchard.Azure.Tests {
     public abstract class AzureVirtualEnvironmentTest {
-        private Process _storageEmulator;
+        protected IPlatformConfigurationAccessor PlatformConfigurationAccessor = new DefaultPlatformConfigurationAccessor();
+        protected abstract string StorageConnectionStringName { get; }
+        protected CloudStorageAccount DevAccount { get; private set; }
 
         protected abstract void OnInit();
 
-        
         [OneTimeSetUp]
         public void FixtureSetup() {
-            if (!Process.GetProcessesByName("AzureStorageEmulator").Any()) {
-                var azureSDKPath = ConfigurationManager.AppSettings["AzureSDK"];
-                var storageEmulatorRelativePath = "Storage Emulator\\AzureStorageEmulator.exe";
+            var connectionString = PlatformConfigurationAccessor.GetSetting(StorageConnectionStringName, "default", "");
 
-                if (String.IsNullOrEmpty(azureSDKPath)) {
-                    throw new ConfigurationErrorsException("Could not find the AppSetting \"AzureSDK\" that indicates the path to the Azure SDK on the local file system.");
-                }
-
-                var storageEmulatorAbsolutePath = Path.Combine(azureSDKPath, storageEmulatorRelativePath);
-
-                if (!File.Exists(storageEmulatorAbsolutePath)) {
-                    throw new ConfigurationErrorsException("Could not find the executable to start the Azure Storage Emulator.");
-                }
-
-                var storageEmulatorStartInfo = new ProcessStartInfo {
-                    Arguments = "start",
-                    FileName = storageEmulatorAbsolutePath
-                };
-
-                _storageEmulator = new Process { StartInfo = storageEmulatorStartInfo };
-                _storageEmulator.Start();
-                _storageEmulator.WaitForExit();
-            }
+            CloudStorageAccount.TryParse(connectionString, out CloudStorageAccount devAccount);
+            DevAccount = devAccount;
 
             OnInit();
         }
 
-        [OneTimeTearDown]
-        public void FixtureTearDown() {
-            if (_storageEmulator != null)
-                _storageEmulator.Close();
-        }
-
         protected void DeleteAllBlobs(string containerName, CloudStorageAccount account) {
             var blobClient = account.CreateCloudBlobClient();
             var container = blobClient.GetContainerReference(containerName);
 
             foreach (var blob in container.ListBlobs()) {
-                if (blob is CloudBlob) {
-                    ((CloudBlob)blob).DeleteIfExists();
+                if (blob is CloudBlob blobLeaf) {
+                    blobLeaf.DeleteIfExists();
                 }
 
-                if (blob is CloudBlobDirectory) {
-                    DeleteAllBlobs((CloudBlobDirectory)blob);
+                if (blob is CloudBlobDirectory directory) {
+                    DeleteAllBlobs(directory);
                 }
             }
         }
 
         private static void DeleteAllBlobs(CloudBlobDirectory cloudBlobDirectory) {
             foreach (var blob in cloudBlobDirectory.ListBlobs()) {
-                if (blob is CloudBlob) {
-                    ((CloudBlob)blob).DeleteIfExists();
+                if (blob is CloudBlob blobLeaf) {
+                    blobLeaf.DeleteIfExists();
                 }
 
-                if (blob is CloudBlobDirectory) {
-                    DeleteAllBlobs((CloudBlobDirectory)blob);
+                if (blob is CloudBlobDirectory directory) {
+                    DeleteAllBlobs(directory);
                 }
             }
         }

src/Orchard.Azure.Tests/Environment/Configuration/AzureShellSettingsManagerTests.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using Microsoft.WindowsAzure.Storage;
 using NUnit.Framework;
 using Orchard.Azure.Services.Environment.Configuration;
 using Orchard.Environment.Configuration;
@@ -8,14 +7,14 @@
 namespace Orchard.Azure.Tests.Environment.Configuration {
     [TestFixture]
     public class AzureShellSettingsManagerTests : AzureVirtualEnvironmentTest {
+        private IShellSettingsManager _shellSettingsManager;
 
-        protected CloudStorageAccount DevAccount;
-        protected IShellSettingsManager ShellSettingsManager;
+        protected override string StorageConnectionStringName { get; } = Constants.ShellSettingsStorageConnectionStringSettingName;
 
         protected override void OnInit() {
-
-            CloudStorageAccount.TryParse("UseDevelopmentStorage=true", out DevAccount);
-            ShellSettingsManager = new AzureBlobShellSettingsManager(new Moq.Mock<IMimeTypeProvider>().Object, new Moq.Mock<IShellSettingsManagerEventHandler>().Object);
+            _shellSettingsManager = new AzureBlobShellSettingsManager(
+                new Moq.Mock<IMimeTypeProvider>().Object,
+                new Moq.Mock<IShellSettingsManagerEventHandler>().Object);
         }
 
         [SetUp]
@@ -33,9 +32,9 @@ public void TearDown() {
         [Test]
         public void SingleSettingsFileShouldComeBackAsExpected() {
 
-            ShellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLCe", DataConnectionString = "something else" });
+            _shellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLCe", DataConnectionString = "something else" });
 
-            var settings = ShellSettingsManager.LoadSettings().Single();
+            var settings = _shellSettingsManager.LoadSettings().Single();
             Assert.That(settings, Is.Not.Null);
             Assert.That(settings.Name, Is.EqualTo("Default"));
             Assert.That(settings.DataProvider, Is.EqualTo("SQLCe"));
@@ -44,10 +43,10 @@ public void SingleSettingsFileShouldComeBackAsExpected() {
 
         [Test]
         public void SettingsShouldBeOverwritable() {
-            ShellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLCe", DataConnectionString = "something else" });
-            ShellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLCe2", DataConnectionString = "something else2" });
+            _shellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLCe", DataConnectionString = "something else" });
+            _shellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLCe2", DataConnectionString = "something else2" });
 
-            var settings = ShellSettingsManager.LoadSettings().Single();
+            var settings = _shellSettingsManager.LoadSettings().Single();
             Assert.That(settings, Is.Not.Null);
             Assert.That(settings.Name, Is.EqualTo("Default"));
             Assert.That(settings.DataProvider, Is.EqualTo("SQLCe2"));
@@ -57,10 +56,10 @@ public void SettingsShouldBeOverwritable() {
         [Test]
         public void MultipleFilesCanBeDetected() {
 
-            ShellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLCe", DataConnectionString = "something else" });
-            ShellSettingsManager.SaveSettings(new ShellSettings { Name = "Another", DataProvider = "SQLCe2", DataConnectionString = "something else2" });
+            _shellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLCe", DataConnectionString = "something else" });
+            _shellSettingsManager.SaveSettings(new ShellSettings { Name = "Another", DataProvider = "SQLCe2", DataConnectionString = "something else2" });
 
-            var settings = ShellSettingsManager.LoadSettings();
+            var settings = _shellSettingsManager.LoadSettings();
             Assert.That(settings.Count(), Is.EqualTo(2));
 
             var def = settings.Single(x => x.Name == "Default");
@@ -76,25 +75,25 @@ public void MultipleFilesCanBeDetected() {
 
         [Test]
         public void NewSettingsCanBeStored() {
-            ShellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLite", DataConnectionString = "something else" });
+            _shellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLite", DataConnectionString = "something else" });
 
             var foo = new ShellSettings { Name = "Foo", DataProvider = "Bar", DataConnectionString = "Quux" };
 
-            Assert.That(ShellSettingsManager.LoadSettings().Count(), Is.EqualTo(1));
-            ShellSettingsManager.SaveSettings(foo);
-            Assert.That(ShellSettingsManager.LoadSettings().Count(), Is.EqualTo(2));
+            Assert.That(_shellSettingsManager.LoadSettings().Count(), Is.EqualTo(1));
+            _shellSettingsManager.SaveSettings(foo);
+            Assert.That(_shellSettingsManager.LoadSettings().Count(), Is.EqualTo(2));
 
-            foo = ShellSettingsManager.LoadSettings().Where(s => s.Name == "Foo").Single();
+            foo = _shellSettingsManager.LoadSettings().Where(s => s.Name == "Foo").Single();
             Assert.That(foo.Name, Does.Contain("Foo"));
             Assert.That(foo.DataProvider, Does.Contain("Bar"));
             Assert.That(foo.DataConnectionString, Does.Contain("Quux"));
         }
 
         [Test]
         public void SettingsCanContainSeparatorChar() {
-            ShellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLite", DataConnectionString = "Server=tcp:tjyptm5sfc.database.windows.net;Database=orchard;User ID=foo@bar;Password=foo;Trusted_Connection=False;Encrypt=True;" });
+            _shellSettingsManager.SaveSettings(new ShellSettings { Name = "Default", DataProvider = "SQLite", DataConnectionString = "Server=tcp:tjyptm5sfc.database.windows.net;Database=orchard;User ID=foo@bar;Password=foo;Trusted_Connection=False;Encrypt=True;" });
 
-            var settings = ShellSettingsManager.LoadSettings().Where(s => s.Name == "Default").Single();
+            var settings = _shellSettingsManager.LoadSettings().Where(s => s.Name == "Default").Single();
             Assert.That(settings.DataConnectionString, Is.EqualTo("Server=tcp:tjyptm5sfc.database.windows.net;Database=orchard;User ID=foo@bar;Password=foo;Trusted_Connection=False;Encrypt=True;"));
         }
     }