update .net core 3.0 RTM (#1025)

* feat: update to asp.net core 3.0 preview 9

* fix :  AspDotNetLogger unittest

* feat:  update generic host  and  useMvc

1、Using 'UseMvc' to configure MVC is not supported while using Endpoint Routing https://github.com/aspnet/AspNetCore/issues/9542
2、 use IHost and IHostBuilder

* feat : update .net core 3.0 rc1

* eureka extension

* fixed logger formatter error

* fixed synchronous operations are disallowed of ReadToEnd method

* fix log tests

* Flush method of FakeStream should do nothing

* Update ContentTests.cs

* Fixed ws tests

* feat： delelte comment code

* feat： update .net core 3.0 RTM

* Update OcelotBuilderTests.cs

* Update .travis.yml

mono 6.0.0 and dotnet 3.0.100

* Update Ocelot.IntegrationTests.csproj

update Microsoft.Data.SQLite 3.0.0

* Update .travis.yml

* feat： remove FrameworkReference

1、 remove FrameworkReference
2、 update package

* add appveyor configuration to use version of VS2019 with dotnet core 3 sdk support

* update obsoleted SetCollectionValidator method

* Swap out OpenCover for Coverlet

* Bump Cake to 0.35.0

* Downgrade coveralls.net to 0.7.0
Fix disposing of PollConsul instance

* Remove environment specific path separator

* Do not return ReportGenerator on Mac/Linux

* Remove direct dependency on IInternalConfiguration

* Fix ordering of variable assignment

* Fix broken tests

* Fix acceptance tests for Consul

test/Ocelot.UnitTests/Consul/ConsulFileConfigurationRepositoryTests.cs

@@ -1,6 +1,7 @@
 namespace Ocelot.UnitTests.Consul
 {
     using global::Consul;
+    using Microsoft.Extensions.Options;
     using Moq;
     using Newtonsoft.Json;
     using Ocelot.Cache;
@@ -23,8 +24,8 @@
     public class ConsulFileConfigurationRepositoryTests
     {
         private ConsulFileConfigurationRepository _repo;
+        private Mock<IOptions<FileConfiguration>> _options;
         private Mock<IOcelotCache<FileConfiguration>> _cache;
-        private Mock<IInternalConfigurationRepository> _internalRepo;
         private Mock<IConsulClientFactory> _factory;
         private Mock<IOcelotLoggerFactory> _loggerFactory;
         private Mock<IConsulClient> _client;
@@ -36,9 +37,9 @@
         public ConsulFileConfigurationRepositoryTests()
         {
             _cache = new Mock<IOcelotCache<FileConfiguration>>();
-            _internalRepo = new Mock<IInternalConfigurationRepository>();
             _loggerFactory = new Mock<IOcelotLoggerFactory>();
 
+            _options = new Mock<IOptions<FileConfiguration>>();
             _factory = new Mock<IConsulClientFactory>();
             _client = new Mock<IConsulClient>();
             _kvEndpoint = new Mock<IKVEndpoint>();
@@ -51,11 +52,9 @@
                 .Setup(x => x.Get(It.IsAny<ConsulRegistryConfiguration>()))
                 .Returns(_client.Object);
 
-            _internalRepo
-                .Setup(x => x.Get())
-                .Returns(new OkResponse<IInternalConfiguration>(new InternalConfiguration(new List<ReRoute>(), "", new ServiceProviderConfigurationBuilder().Build(), "", It.IsAny<LoadBalancerOptions>(), It.IsAny<string>(), It.IsAny<QoSOptions>(), It.IsAny<HttpHandlerOptions>())));
-
-            _repo = new ConsulFileConfigurationRepository(_cache.Object, _internalRepo.Object, _factory.Object, _loggerFactory.Object);
+            _options
+                .SetupGet(x => x.Value)
+                .Returns(() => _fileConfiguration);
         }
 
         [Fact]
@@ -85,7 +84,10 @@
         [Fact]
         public void should_get_null_config()
         {
-            this.Given(_ => GivenFetchFromConsulReturnsNull())
+            var config = FakeFileConfiguration();
+
+            this.Given(_ => GivenIHaveAConfiguration(config))
+               .Given(_ => GivenFetchFromConsulReturnsNull())
                .When(_ => WhenIGetTheConfiguration())
                .Then(_ => ThenTheConfigurationIsNull())
                .BDDfy();
@@ -136,14 +138,8 @@
 
         private void GivenTheConfigKeyComesFromFileConfig(string key)
         {
-            _internalRepo
-                .Setup(x => x.Get())
-                .Returns(new OkResponse<IInternalConfiguration>(new InternalConfiguration(new List<ReRoute>(), "",
-                    new ServiceProviderConfigurationBuilder().WithConfigurationKey(key).Build(), "",
-                    new LoadBalancerOptionsBuilder().Build(), "", new QoSOptionsBuilder().Build(),
-                    new HttpHandlerOptionsBuilder().Build())));
-
-            _repo = new ConsulFileConfigurationRepository(_cache.Object, _internalRepo.Object, _factory.Object, _loggerFactory.Object);
+            _fileConfiguration.GlobalConfiguration.ServiceDiscoveryProvider.ConfigurationKey = key;
+            _repo = new ConsulFileConfigurationRepository(_options.Object, _cache.Object, _factory.Object, _loggerFactory.Object);
         }
 
         private void ThenTheConfigurationIsNull()
@@ -221,6 +217,8 @@
         private void GivenIHaveAConfiguration(FileConfiguration config)
         {
             _fileConfiguration = config;
+
+            _repo = new ConsulFileConfigurationRepository(_options.Object, _cache.Object, _factory.Object, _loggerFactory.Object);
         }
 
         private FileConfiguration FakeFileConfiguration()

test/Ocelot.UnitTests/Consul/OcelotBuilderExtensionsTests.cs

@@ -1,14 +1,15 @@
 namespace Ocelot.UnitTests.Consul
 {
     using Microsoft.AspNetCore.Hosting;
-    using Microsoft.AspNetCore.Hosting.Internal;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
+    using Moq;
     using Ocelot.DependencyInjection;
     using Provider.Consul;
     using Shouldly;
     using System;
     using System.Collections.Generic;
+    using System.Reflection;
     using TestStack.BDDfy;
     using Xunit;
 
@@ -24,10 +25,21 @@
         {
             _configRoot = new ConfigurationRoot(new List<IConfigurationProvider>());
             _services = new ServiceCollection();
-            _services.AddSingleton<IHostingEnvironment, HostingEnvironment>();
+            _services.AddSingleton<IWebHostEnvironment>(GetHostingEnvironment());
             _services.AddSingleton(_configRoot);
         }
 
+
+        private IWebHostEnvironment GetHostingEnvironment()
+        {
+            var environment = new Mock<IWebHostEnvironment>();
+            environment
+                .Setup(e => e.ApplicationName)
+                .Returns(typeof(OcelotBuilderExtensionsTests).GetTypeInfo().Assembly.GetName().Name);
+
+            return environment.Object;
+        }
+
         [Fact]
         public void should_set_up_consul()
         {

test/Ocelot.UnitTests/Consul/PollingConsulServiceDiscoveryProviderTests.cs

@@ -15,7 +15,6 @@
     public class PollingConsulServiceDiscoveryProviderTests
     {
         private readonly int _delay;
-        private PollConsul _provider;
         private readonly List<Service> _services;
         private readonly Mock<IOcelotLoggerFactory> _factory;
         private readonly Mock<IOcelotLogger> _logger;
@@ -56,27 +55,28 @@
 
         private void WhenIGetTheServices(int expected)
         {
-            _provider = new PollConsul(_delay, _factory.Object, _consulServiceDiscoveryProvider.Object);
-
-            var result = Wait.WaitFor(3000).Until(() =>
+            using (var provider = new PollConsul(_delay, _factory.Object, _consulServiceDiscoveryProvider.Object))
             {
-                try
+                var result = Wait.WaitFor(3000).Until(() =>
                 {
-                    _result = _provider.Get().GetAwaiter().GetResult();
-                    if (_result.Count == expected)
+                    try
                     {
-                        return true;
+                        _result = provider.Get().GetAwaiter().GetResult();
+                        if (_result.Count == expected)
+                        {
+                            return true;
+                        }
+
+                        return false;
                     }
+                    catch (Exception)
+                    {
+                        return false;
+                    }
+                });
 
-                    return false;
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-            });
-
-            result.ShouldBeTrue();
+                result.ShouldBeTrue();
+            }
         }
     }
 }

test/Ocelot.UnitTests/Consul/ProviderFactoryTests.cs

@@ -49,7 +49,9 @@ namespace Ocelot.UnitTests.Consul
                 .Build();
 
             var provider = ConsulProviderFactory.Get(_provider, new ServiceProviderConfiguration("pollconsul", "", 1, "", "", stopsPollerFromPolling), reRoute);
-            provider.ShouldBeOfType<PollConsul>();
+            var pollProvider = provider as PollConsul;
+            pollProvider.ShouldNotBeNull();
+            pollProvider.Dispose();
         }
     }
 }