Merge branch 'feature/85' into develop

i4004 · i4004 · commit 5d7ab36781a8 · 2019-06-24T22:31:19.000+06:00
diff --git a/src/SampleApps/SampleApp.Angular/SampleApp.Angular.csproj b/src/SampleApps/SampleApp.Angular/SampleApp.Angular.csproj
@@ -1,14 +1,14 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>netcoreapp2.1</TargetFramework>
+		<TargetFramework>netcoreapp2.2</TargetFramework>
 		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
 		<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
 		<SpaRoot>ClientApp/</SpaRoot>
 		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
 		<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" />
diff --git a/src/SampleApps/SampleApp.Angular/Web.config b/src/SampleApps/SampleApp.Angular/Web.config
@@ -9,6 +9,7 @@
 				<environmentVariables>
 					<environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
 					<environmentVariable name="ASPNETCORE_HTTPS_PORT" value="44337" />
+					<environmentVariable name="COMPLUS_ForceENC" value="1" />
 				</environmentVariables>
 			</aspNetCore>
 		</system.webServer>
diff --git a/src/SampleApps/SampleApp.SelfHosted/SampleApp.SelfHosted.csproj b/src/SampleApps/SampleApp.SelfHosted/SampleApp.SelfHosted.csproj
@@ -11,7 +11,6 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="Simplify.DI.Provider.SimpleInjector" Version="1.4.0" />
 		<PackageReference Include="bootstrap" Version="3.3.7" PrivateAssets="All" />
 		<PackageReference Include="jQuery" Version="3.1.0" PrivateAssets="All" />
 		<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />
diff --git a/src/SampleApps/SampleApp.SelfHosted/Startup.cs b/src/SampleApps/SampleApp.SelfHosted/Startup.cs
@@ -3,7 +3,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Simplify.DI;
-using Simplify.DI.Provider.SimpleInjector;
 using Simplify.Web.Owin;
 
 namespace SampleApp.SelfHosted
@@ -18,17 +17,14 @@ public void ConfigureServices(IServiceCollection services)
 
 		public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 		{
-			var provider = new SimpleInjectorDIProvider();
-			DIContainer.Current = provider;
-
 			if (env.IsDevelopment())
 				app.UseDeveloperExceptionPage();
 
 			app.UseAuthentication();
 
 			app.UseSimplifyWeb();
 
-			provider.Container.Verify();
+			DIContainer.Current.Verify();
 		}
 	}
 }
diff --git a/src/SampleApps/SampleApp.Vue.Element/SampleApp.Vue.Element.csproj b/src/SampleApps/SampleApp.Vue.Element/SampleApp.Vue.Element.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>netcoreapp2.1</TargetFramework>
+		<TargetFramework>netcoreapp2.2</TargetFramework>
 		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
 		<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
 		<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" />
diff --git a/src/SampleApps/SampleApp.Vue/SampleApp.Vue.csproj b/src/SampleApps/SampleApp.Vue/SampleApp.Vue.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>netcoreapp2.1</TargetFramework>
+		<TargetFramework>netcoreapp2.2</TargetFramework>
 		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
 		<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
 		<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" />
diff --git a/src/SampleApps/SampleApp.WindowsServiceHosted/Program.cs b/src/SampleApps/SampleApp.WindowsServiceHosted/Program.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using SampleApp.WindowsServiceHosted.Setup;
 using Simplify.DI;
-using Simplify.DI.Provider.SimpleInjector;
 using Simplify.WindowsServices;
 
 namespace SampleApp.WindowsServiceHosted
@@ -31,12 +30,9 @@ private static void Main(string[] args)
 
 		private static void InitializeContainer()
 		{
-			var provider = new SimpleInjectorDIProvider();
-			DIContainer.Current = provider;
-
 			IocRegistrations.Register();
 
-			provider.Container.Verify();
+			DIContainer.Current.Verify();
 		}
 	}
 }
diff --git a/src/SampleApps/SampleApp.WindowsServiceHosted/SampleApp.WindowsServiceHosted.csproj b/src/SampleApps/SampleApp.WindowsServiceHosted/SampleApp.WindowsServiceHosted.csproj
@@ -11,8 +11,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-		<PackageReference Include="Simplify.DI.Provider.SimpleInjector" Version="1.4.0" />
-		<PackageReference Include="Simplify.WindowsServices" Version="2.7.0" />
+		<PackageReference Include="Simplify.WindowsServices" Version="2.8.1" />
 		<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />
 		<Reference Include="System.ServiceModel" />
 	</ItemGroup>
diff --git a/src/Simplify.Web/Simplify.Web.csproj b/src/Simplify.Web/Simplify.Web.csproj
@@ -37,11 +37,11 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
 		<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
-		<PackageReference Include="Simplify.DI" Version="2.0.1" />
+		<PackageReference Include="Simplify.DI" Version="2.1.0" />
 		<PackageReference Include="Simplify.Templates" Version="1.5.1" />
 		<PackageReference Include="Simplify.String.Sources" Version="1.2.0" PrivateAssets="All" />
 		<PackageReference Include="Simplify.System.Sources" Version="1.1.0" PrivateAssets="All" />

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using Microsoft.AspNetCore.Hosting;`
`4`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`5`	`5`	`using Simplify.DI;`
`6`		`-using Simplify.DI.Provider.SimpleInjector;`
`7`	`6`	`using Simplify.Web.Owin;`
`8`	`7`
`9`	`8`	`namespace SampleApp.SelfHosted`
`@@ -18,17 +17,14 @@ public void ConfigureServices(IServiceCollection services)`
`18`	`17`
`19`	`18`	`public void Configure(IApplicationBuilder app, IHostingEnvironment env)`
`20`	`19`	`{`
`21`		`- var provider = new SimpleInjectorDIProvider();`
`22`		`- DIContainer.Current = provider;`
`23`		`-`
`24`	`20`	`if (env.IsDevelopment())`
`25`	`21`	`app.UseDeveloperExceptionPage();`
`26`	`22`
`27`	`23`	`app.UseAuthentication();`
`28`	`24`
`29`	`25`	`app.UseSimplifyWeb();`
`30`	`26`
`31`		`- provider.Container.Verify();`
	`27`	`+ DIContainer.Current.Verify();`
`32`	`28`	`}`
`33`	`29`	`}`
`34`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using SampleApp.WindowsServiceHosted.Setup;`
`3`	`3`	`using Simplify.DI;`
`4`		`-using Simplify.DI.Provider.SimpleInjector;`
`5`	`4`	`using Simplify.WindowsServices;`
`6`	`5`
`7`	`6`	`namespace SampleApp.WindowsServiceHosted`
`@@ -31,12 +30,9 @@ private static void Main(string[] args)`
`31`	`30`
`32`	`31`	`private static void InitializeContainer()`
`33`	`32`	`{`
`34`		`- var provider = new SimpleInjectorDIProvider();`
`35`		`- DIContainer.Current = provider;`
`36`		`-`
`37`	`33`	`IocRegistrations.Register();`
`38`	`34`
`39`		`- provider.Container.Verify();`
	`35`	`+ DIContainer.Current.Verify();`
`40`	`36`	`}`
`41`	`37`	`}`
`42`	`38`	`}`