Merge branch 'develop' into bugfix/#111

Author: i4004

.vscode/launch.json

@@ -6,7 +6,7 @@
 		"type": "coreclr",
 		"request": "launch",
 		"preLaunchTask": "Build Kestrel Example",
-		"program": "${workspaceFolder}/src/SampleApps/SampleApp.Kestrel/bin/Debug/netcoreapp3.0/SampleApp.Kestrel.dll",
+		"program": "${workspaceFolder}/src/SampleApps/SampleApp.Kestrel/bin/Debug/netcoreapp3.1/SampleApp.Kestrel.dll",
 		"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Kestrel",
 		"internalConsoleOptions": "openOnSessionStart",
 		"env":
@@ -19,7 +19,7 @@
 		"type": "coreclr",
 		"request": "launch",
 		"preLaunchTask": "Build Classic Example",
-		"program": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/netcoreapp3.0/SampleApp.Classic.dll",
+		"program": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/netcoreapp3.1/SampleApp.Classic.dll",
 		"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Classic",
 		"internalConsoleOptions": "openOnSessionStart",
 		"env":

.vscode/settings.json

@@ -1,4 +1,7 @@
 {
 	"dotnet-test-explorer.testProjectPath": "src/**/*Tests.csproj",
-	"dotnet-test-explorer.testArguments": "/p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info"
+	"dotnet-test-explorer.testArguments": "/p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info",
+	"cSpell.words": [
+		"Redirector"
+	]
 }

src/SampleApps/SampleApp.Classic.Tests/SampleApp.Classic.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
 		<Authors>Alexander Krylkov</Authors>
 		<Product>Simplify</Product>
 		<Description>SampleApp.SelfHosted unit tests</Description>
@@ -10,7 +10,7 @@
 	<ItemGroup>
 		<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
 		<PackageReference Include="coverlet.msbuild" Version="2.9.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
 		<PackageReference Include="NUnit" Version="3.12.0" />
 		<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
 		<PackageReference Include="Moq" Version="4.15.2" />

src/SampleApps/SampleApp.Classic/SampleApp.Classic.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" InitialTargets="BeforeBuild">
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.0</TargetFramework>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<Authors>Alexander Krylkov</Authors>
 		<Product>Simplify</Product>
 		<Description>Simplify.Web self hosted example</Description>

src/SampleApps/SampleApp.Kestrel/Properties/PublishProfiles/Release.pubxml

@@ -15,7 +15,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <ProjectGuid>e81216be-e53c-473a-af6c-3a072c2ccaae</ProjectGuid>
     <publishUrl>build</publishUrl>
     <DeleteExistingFiles>True</DeleteExistingFiles>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <SelfContained>false</SelfContained>
   </PropertyGroup>
 </Project>

src/SampleApps/SampleApp.Kestrel/SampleApp.Kestrel.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.0</TargetFramework>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />

src/Simplify.Web.Tests/Simplify.Web.Tests.csproj

@@ -13,7 +13,7 @@
 	<ItemGroup>
 		<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
 		<PackageReference Include="coverlet.msbuild" Version="2.9.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
 		<PackageReference Include="Moq" Version="4.15.2" />
 		<PackageReference Include="NUnit" Version="3.12.0" />
 		<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />

src/Simplify.Web/Simplify.Web.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;netcoreapp3.0;netstandard2.0;net462</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1;netcoreapp3.1;netstandard2.0;net462</TargetFrameworks>
 		<LangVersion>8.0</LangVersion>
 		<Nullable>enable</Nullable>
 		<WarningsAsErrors>nullable</WarningsAsErrors>
@@ -40,10 +40,10 @@
 		<PackageReference Include="Simplify.DI" Version="4.0.7" />
 		<PackageReference Include="Simplify.Templates" Version="2.0.0" />
 		<PackageReference Include="Simplify.String.Sources" Version="1.2.1" PrivateAssets="All" />
-		<PackageReference Include="Simplify.System.Sources" Version="1.2.2" PrivateAssets="All" />
+		<PackageReference Include="Simplify.System.Sources" Version="1.3.0" PrivateAssets="All" />
 		<PackageReference Include="Simplify.Xml.Sources" Version="1.1.2" PrivateAssets="All" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'netcoreapp3.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'netcoreapp3.1' ">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">