Merge branch 'master' of https://github.com/segmentio/Analytics.NET into issue#154-Catch-PostAsync-Network-exceptions-and-Retry

# Conflicts:
#	Test.NetStandard20/Test.NetStandard20.csproj

Author: juliette-ruchel

Analytics/Analytics.csproj

@@ -14,7 +14,9 @@
     <PackageReleaseNotes>Check out the changelog at: https://raw.githubusercontent.com/segmentio/Analytics.NET/master/CHANGELOG.md</PackageReleaseNotes>
     <PackageTags>analytics, Segment</PackageTags>
     <PackageIcon>packageIcon.png</PackageIcon>
-    <PackageLicenseFile>README.md</PackageLicenseFile>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryUrl>https://github.com/segmentio/Analytics.NET.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)'=='net35'">
@@ -82,4 +84,18 @@
     </None>
   </ItemGroup>
 
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
+      <Version>2.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
+      <Version>2.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>

Analytics/Extensions/ServiceCollectionExtension.cs

@@ -0,0 +1,24 @@
+#if NETSTANDARD2_0 || NET461
+using Microsoft.Extensions.DependencyInjection;
+#endif
+
+namespace Segment.Extensions
+{
+    public static class ServiceCollectionExtension
+    {
+#if NETSTANDARD2_0 || NET461
+        public static void AddAnalytics(this IServiceCollection services, string writeKey, Config config = null)
+        {
+            Config configuration;
+
+            if(config == null)
+                configuration = new Config();
+            else
+                configuration = config;
+
+            var client = new Client(writeKey, configuration);
+            services.AddSingleton<IAnalyticsClient>(client);
+        }
+#endif
+    }
+}

Test.NetStandard20/Extensions/ServiceCollectionExtensionTests.cs

@@ -0,0 +1,51 @@
+using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Segment.Extensions;
+
+
+namespace Segment.Test.Extensions
+{
+    [TestFixture]
+    public class ServiceCollectionExtensionTests
+    {
+
+        [Test]
+        public void TestInicializationOfClientWithServicesCollection()
+        {
+            var writeKey = "writeKey";
+            var services = new ServiceCollection();
+            services.AddAnalytics(writeKey);
+
+            var provider = services.BuildServiceProvider();
+            var analyticsInstance = provider.GetRequiredService(typeof(IAnalyticsClient));
+
+            Assert.IsNotNull(analyticsInstance);
+
+            var client = analyticsInstance as Client;
+            Assert.AreEqual("writeKey", client.WriteKey);
+        }
+
+        [Test]
+        public void TestInicializationOfClientWithServicesCollectionAndConfig()
+        {
+            var writeKey = "writeKey";
+            var threadCount = 10;
+            var config = new Config { Threads = threadCount };
+
+            var services = new ServiceCollection();
+            services.AddAnalytics(writeKey, config);
+
+            var provider = services.BuildServiceProvider();
+            var analyticsInstance = provider.GetRequiredService(typeof(IAnalyticsClient));
+
+            Assert.IsNotNull(analyticsInstance);
+
+            var client = analyticsInstance as Client;
+            Assert.AreEqual("writeKey", client.WriteKey);
+            Assert.AreEqual(threadCount, client.Config.Threads);
+        }
+    }
+}

Test.NetStandard20/Test.NetStandard20.csproj

@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
     <PackageReference Include="EmbedIO" Version="3.4.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
     <PackageReference Include="Moq" Version="4.13.1" />

Test/Extensions/ServiceCollectionExtensionTests.cs

@@ -0,0 +1,51 @@
+using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Segment.Extensions;
+
+
+namespace Segment.Test.Extensions
+{
+    [TestFixture]
+    public class ServiceCollectionExtensionTests
+    {
+
+        [Test]
+        public void TestInicializationOfClientWithServicesCollection()
+        {
+            var writeKey = "writeKey";
+            var services = new ServiceCollection();
+            services.AddAnalytics(writeKey);
+
+            var provider = services.BuildServiceProvider();
+            var analyticsInstance = provider.GetRequiredService(typeof(IAnalyticsClient));
+
+            Assert.IsNotNull(analyticsInstance);
+
+            var client = analyticsInstance as Client;
+            Assert.AreEqual("writeKey", client.WriteKey);
+        }
+
+        [Test]
+        public void TestInicializationOfClientWithServicesCollectionAndConfig()
+        {
+            var writeKey = "writeKey";
+            var threadCount = 10;
+            var config = new Config { Threads = threadCount };
+
+            var services = new ServiceCollection();
+            services.AddAnalytics(writeKey, config);
+
+            var provider = services.BuildServiceProvider();
+            var analyticsInstance = provider.GetRequiredService(typeof(IAnalyticsClient));
+
+            Assert.IsNotNull(analyticsInstance);
+
+            var client = analyticsInstance as Client;
+            Assert.AreEqual("writeKey", client.WriteKey);
+            Assert.AreEqual(threadCount, client.Config.Threads);
+        }
+    }
+}

Test/Test.csproj

@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="NUnit" Version="3.8.1" />