Develop into master #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

Sergio1192 wants to merge 41 commits into master from develop

.github/workflows/ci.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,10 +24,9 @@ jobs: @@
             uses: actions/setup-dotnet@v2
             with:
               dotnet-version: |
-.0.421
-.0.408
 .0.415
 .0.306
+.0.101
           - name: Build
             run: dotnet build -c $BUILD_CONFIG
@@ Expand Down @@

.github/workflows/nuget.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,10 +19,9 @@ jobs: @@
             uses: actions/setup-dotnet@v2
             with:
               dotnet-version: |
-.0.421
-.0.408
 .0.415
 .0.306
+.0.101
           - name: Build
             run: dotnet build -c $BUILD_CONFIG
@@ Expand Down @@

Directory.Build.props

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,12 +1,12 @@
  
    ﻿<Project>

        <PropertyGroup Label="SDK Versions">

            <NetCoreTargetVersion>net6.0;net7.0;net8.0;net9.0</NetCoreTargetVersion>

            <NetCoreTargetVersion>net8.0;net9.0;net10.0</NetCoreTargetVersion>

            <LangVersion>latest</LangVersion>

            <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

        </PropertyGroup>

        <PropertyGroup Label="Package information">

            <Version>4.1.0</Version>

            <Version>5.0.0</Version>

            <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

            <PackageProjectUrl>http://github.com/xabaril/Acheve.TestHost</PackageProjectUrl>

Directory.Packages.props

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,23 +1,12 @@
  
    ﻿<Project>

      <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net6.0' ">

        <NetCoreVersion>6.0.36</NetCoreVersion>

        <MicrosoftNETTestSdkVersion>17.9.0</MicrosoftNETTestSdkVersion>

        <XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>

      </PropertyGroup>

      <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net7.0' ">

        <NetCoreVersion>7.0.20</NetCoreVersion>

        <MicrosoftNETTestSdkVersion>17.9.0</MicrosoftNETTestSdkVersion>

        <XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>

      </PropertyGroup>

      <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net8.0' ">

        <NetCoreVersion>8.0.21</NetCoreVersion>

        <MicrosoftNETTestSdkVersion>18.0.0</MicrosoftNETTestSdkVersion>

        <XUnitRunnerVisualStudioVersion>3.1.5</XUnitRunnerVisualStudioVersion>

        <NetCoreVersion>8.0.22</NetCoreVersion>

      </PropertyGroup>

      <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net9.0' ">

        <NetCoreVersion>9.0.10</NetCoreVersion>

        <MicrosoftNETTestSdkVersion>18.0.0</MicrosoftNETTestSdkVersion>

        <XUnitRunnerVisualStudioVersion>3.1.5</XUnitRunnerVisualStudioVersion>

        <NetCoreVersion>9.0.11</NetCoreVersion>

      </PropertyGroup>

      <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net10.0' ">

    	<NetCoreVersion>10.0.1</NetCoreVersion>

      </PropertyGroup>

      <ItemGroup Label="General Dependencies">

        <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(NetCoreVersion)" />

    @@ -27,10 +16,10 @@
  
      </ItemGroup>

      <ItemGroup Label="Testing Dependencies">

        <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(NetCoreVersion)" />

        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />

        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />

        <PackageVersion Include="FluentAssertions" Version="[7.2.0]" />

        <PackageVersion Include="xunit" Version="2.9.3" />

        <PackageVersion Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)" />

        <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />

        <PackageVersion Include="coverlet.collector" Version="6.0.4" />

      </ItemGroup>

      <ItemGroup Label="Github Dependencies">

global.json

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     {
       "projects": ["src", "test", "samples"],
       "sdk": {
-        "version": "9.0.0",
+        "version": "10.0.0",
         "rollForward": "latestMajor"
       }
     }

samples/Sample.IntegrationTests/Infrastructure/TestHostFixture.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,14 +1,15 @@
  
    ﻿using Microsoft.AspNetCore.Hosting;

    using Microsoft.AspNetCore.TestHost;

    using Microsoft.Extensions.Hosting;

    using System;

    using System.Threading.Tasks;

    using Xunit;

    namespace Sample.IntegrationTests.Infrastructure

    {

        public class TestHostFixture : IDisposable, IAsyncLifetime

        public sealed class TestHostFixture : IDisposable, IAsyncLifetime

        {

            private IWebHost _host;

            private IHost _host;

            public TestServer Server => _host.GetTestServer();

    @@ -21,10 +22,13 @@ public void Dispose()
  
            /// <inheritdoc />

            public async Task InitializeAsync()

            {

                _host = new WebHostBuilder()

                    .UseTestServer()

                    .UseStartup<TestStartup>()

                    .Build();

                _host = Host.CreateDefaultBuilder()

                    .ConfigureWebHost(webHostBuilder =>

                    {

                        webHostBuilder

                            .UseStartup<TestStartup>()

                            .UseTestServer();

                    }).Build();

                await _host.StartAsync();

            }

samples/Sample.IntegrationTests/Infrastructure/WebApplicationFactoryFixture.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,20 +1,21 @@
  
    ﻿using Microsoft.AspNetCore;

    using Microsoft.AspNetCore.Hosting;

    ﻿using Microsoft.AspNetCore.Hosting;

    using Microsoft.AspNetCore.Mvc.Testing;

    using Microsoft.AspNetCore.TestHost;

    using Microsoft.Extensions.Hosting;

    namespace Sample.IntegrationTests.Infrastructure

    {

        public class WebApplicationFactoryFixture : WebApplicationFactory<TestStartup>

        {

            protected override IWebHostBuilder CreateWebHostBuilder()

            protected override IHostBuilder CreateHostBuilder()

            {

                return WebHost.CreateDefaultBuilder();

                return Host.CreateDefaultBuilder();

            }

            protected override void ConfigureWebHost(IWebHostBuilder builder)

            {

                builder.UseStartup<TestStartup>()

                builder

                    .UseStartup<TestStartup>()

                    .UseSolutionRelativeContentRoot("samples")

                    .UseTestServer();

            }

src/Acheve.TestHost/Routing/TestServerAction.cs

-Original file line number
+Diff line change
@@ Expand Up @@
                 bool canBeObjectWithMultipleFroms = false;
                 if (hasNoAttributes && !isPrimitive)
                 {
-    #if NET8_0_OR_GREATER
                     canBeObjectWithMultipleFroms = MethodInfo.GetParameters().Length == 1;
-    #else
-                    canBeObjectWithMultipleFroms = false;
-    #endif
                     if (activeBodyApiController)
                     {
@@ Expand Down @@

src/Acheve.TestHost/Security/TestServerHandler.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,22 +13,12 @@ namespace Acheve.TestHost @@
     {
         public class TestServerHandler : AuthenticationHandler<TestServerOptions>
         {
-    #if NET8_0_OR_GREATER
             public TestServerHandler(
                 IOptionsMonitor<TestServerOptions> options,
                 ILoggerFactory logger,
                 UrlEncoder encoder)
                 : base(options, logger, encoder)
             { }
-    #else
-            public TestServerHandler(
-                IOptionsMonitor<TestServerOptions> options,
-                ILoggerFactory logger,
-                UrlEncoder encoder,
-                ISystemClock clock)
-                : base(options, logger, encoder, clock)
-            { }
-    #endif
             protected new TestServerEvents Events
             {
@@ Expand Down @@

tests/UnitTests/Acheve.TestHost/Routing/Builders/TestServerBuilder.cs

-Original file line number
+Diff line change
@@ -1,33 +1,42 @@
-    using System.Reflection;
-    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Hosting;
-    using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.TestHost;
     using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.Hosting;
+    using System.Reflection;
     namespace UnitTests.Acheve.TestHost.Builders
     {
         public class TestServerBuilder
         {
-            private readonly WebHostBuilder _webHostBuilder;
+            private readonly HostBuilder _hostBuilder;
             public TestServerBuilder()
             {
-                _webHostBuilder = new WebHostBuilder();
+                _hostBuilder = new HostBuilder();
             }
             public TestServerBuilder UseDefaultStartup()
             {
-                _webHostBuilder.UseStartup<DefaultStartup>();
+                _hostBuilder.ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseTestServer()
+                        .UseStartup<DefaultStartup>();
+                });
                 return this;
             }
             public TestServer Build()
             {
-                return new TestServer(_webHostBuilder);
+                var host = _hostBuilder
+                    .Build();
+                host.Start();
+                return host.GetTestServer();
             }
             class DefaultStartup
@@ Expand Down @@

tests/UnitTests/Acheve.TestHost/Routing/TestBuilders/TestServerBuilder.cs

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Develop into master #103

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Develop into master #103

Are you sure you want to change the base?

Uh oh!

Develop into master #103

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!