Skip to content

Commit d861460

Browse files
FrazerusFrazerus
authored
Merge pull request #1185 from re-motion/feature/RM-9277-add-support-for-asp-net-core-hosting
Feature/rm 9277 add support for asp net core hosting
2 parents 06d1068 + b9807bb commit d861460

File tree

32 files changed

+685
-254
lines changed

32 files changed

+685
-254
lines changed

‎.nuke/parameters.ci.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Target": [ "CIBuild" ],
55
"TestConfigurations": [ "Debug" ],
66
"TestExecutionRuntimes": [ "Docker_Win_NET48", "EnforcedLocalMachine" ],
7-
"TestPlatforms": [ "x86" ],
7+
"TestPlatforms": [ "x64" ],
88
"TestTargetRuntimes": [ "NET48" ],
99
"TestBrowsers": [ "NoBrowser", "Chrome" ],
1010
"TestSqlServers": [ "NoDB", "SqlServer2016" ],

‎Build/Build.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,10 @@ public override void ConfigureTestMatrix (TestMatricesBuilder builder)
263263
"WebTestingTestMatrix",
264264
new TestDimension[,] // todo docker images need to be wired to the config file
265265
{
266-
{ Chrome, NET48, Debug, x86, NoDB, EnforcedLocalMachine(Docker_Win_NET48) },
267-
{ Chrome, NET481, Release, x86, NoDB, EnforcedLocalMachine(Docker_Win_NET481) },
268-
{ Firefox, NET48, Release, x64, NoDB, EnforcedLocalMachine(Docker_Win_NET481) },
269-
{ Edge, NET48, Release, x64, NoDB, EnforcedLocalMachine(Docker_Win_NET48) },
266+
{ Chrome, NET48, Debug, x64, NoDB, EnforcedLocalMachine(Docker_Win_NET8_0) },
267+
{ Chrome, NET481, Release, x64, NoDB, EnforcedLocalMachine(Docker_Win_NET8_0) },
268+
{ Firefox, NET48, Release, x64, NoDB, EnforcedLocalMachine(Docker_Win_NET8_0) },
269+
{ Edge, NET48, Release, x64, NoDB, EnforcedLocalMachine(Docker_Win_NET8_0) },
270270
// { Edge, NET50, Release, x64, NoDB, Docker_Win_NET50, EnforcedLocalMachine },
271271
},
272272
allowEmpty: true);

‎Build/Customizations/WebTestingTestSetup.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ public void ExecuteTests (TestExecutionContext context, Action<TestExecutionCont
120120
appConfig.SetOrAddAttribute("/configuration/rwt:remotion.webTesting", "verifyWebApplicationStartedTimeout", c_dockerVerifyWebApplicationStartedTimeout);
121121
appConfig.SetOrAddAttribute("/configuration/rwt:remotion.webTesting/rwt:hosting", "name", "Docker");
122122
appConfig.SetOrAddAttribute("/configuration/rwt:remotion.webTesting/rwt:hosting", "type", "Docker");
123+
appConfig.SetOrAddAttribute("/configuration/rwt:remotion.webTesting/rwt:hosting", "innerType", "aspnetcore");
123124
appConfig.SetOrAddAttribute("/configuration/rwt:remotion.webTesting/rwt:hosting", "port", c_dockerPortNumber);
124125
appConfig.SetOrAddAttribute("/configuration/rwt:remotion.webTesting/rwt:hosting", "dockerImageName", dockerImage);
125126
appConfig.SetOrAddAttribute("/configuration/rwt:remotion.webTesting/rwt:hosting", "dockerIsolationMode", dockerIsolationMode);

‎Remotion/ObjectBinding/Web.Development.WebTesting.IntegrationTests/App.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
closeBrowserWindowsOnSetUpAndTearDown="false"
2929
cleanUpUnmatchedDownloadedFiles="false"
3030
requestErrorDetectionStrategy="AspNet">
31-
<hosting name="IisExpress" type="IisExpress" port="60402" />
32-
<testSiteLayout rootPath=".\..\..\..\..\Web.Development.WebTesting.TestSite.NetFramework">
33-
<resources>
31+
<hosting name="AspNetCore" type="AspNetCore" port="60402" />
32+
<testSiteLayout rootPath=".\..\..\..\..\Web.Development.WebTesting.TestSite" processPath="bin\Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.exe">
33+
<resources>
3434
<add path="..\..\ObjectBinding\Sample\res" />
3535
<add path="..\..\ObjectBinding\Web\res" />
3636
<add path="..\..\ObjectBinding\Web.ClientScript\bin" />

‎Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Startup.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ public void Configure (IApplicationBuilder app, IWebHostEnvironment env)
2323
app.UseDeveloperExceptionPage();
2424
}
2525

26+
app.UseDefaultFiles();
27+
app.UseStaticFiles();
28+
2629
app.UseRouting();
2730

2831
app.UseEndpoints(

‎Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/index.html‎ renamed to ‎Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/wwwroot/index.html‎

File renamed without changes.

‎Remotion/ObjectBinding/Web.IntegrationTests/App.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
closeBrowserWindowsOnSetUpAndTearDown="false"
2626
cleanUpUnmatchedDownloadedFiles="false"
2727
requestErrorDetectionStrategy="AspNet">
28-
<hosting name="IisExpress" type="IisExpress" port="60402" />
29-
<testSiteLayout rootPath=".\..\..\..\..\Web.Development.WebTesting.TestSite.NetFramework">
30-
<resources>
28+
<hosting name="AspNetCore" type="AspNetCore" port="60402" />
29+
<testSiteLayout rootPath=".\..\..\..\..\Web.Development.WebTesting.TestSite" processPath="bin\Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.exe">
30+
<resources>
3131
<add path="..\..\ObjectBinding\Sample\res" />
3232
<add path="..\..\ObjectBinding\Web\res" />
3333
<add path="..\..\ObjectBinding\Web.ClientScript\bin" />

‎Remotion/Web/Development.WebTesting.IntegrationTests.RequireUI/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
logsDirectory=".\WebTestingOutput"
2828
closeBrowserWindowsOnSetUpAndTearDown="false"
2929
cleanUpUnmatchedDownloadedFiles="false">
30-
<hosting name="IisExpress" type="IisExpress" port="60401" />
31-
<testSiteLayout rootPath=".\..\..\..\..\Development.WebTesting.TestSite.NetFramework">
30+
<hosting name="AspNetCore" type="AspNetCore" port="60401" />
31+
<testSiteLayout rootPath=".\..\..\..\..\Development.WebTesting.TestSite" processPath="bin\Remotion.Web.Development.WebTesting.TestSite.exe">
3232
<resources>
3333
<add path="..\..\Web\Core\res" />
3434
<add path="..\..\Web\ClientScript\bin" />

‎Remotion/Web/Development.WebTesting.IntegrationTests/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
closeBrowserWindowsOnSetUpAndTearDown="false"
2929
cleanUpUnmatchedDownloadedFiles="false"
3030
requestErrorDetectionStrategy="Remotion.Web.Development.WebTesting.IntegrationTests.DiagnosticInformationCollectingRequestErrorDetectionStrategy, Remotion.Web.Development.WebTesting.IntegrationTests">
31-
<hosting name="IisExpress" type="IisExpress" port="60401" />
32-
<testSiteLayout rootPath=".\..\..\..\..\Development.WebTesting.TestSite.NetFramework">
31+
<hosting name="AspNetCore" type="AspNetCore" port="60401" />
32+
<testSiteLayout rootPath=".\..\..\..\..\Development.WebTesting.TestSite" processPath="bin\Remotion.Web.Development.WebTesting.TestSite.exe">
3333
<resources>
3434
<add path="..\..\Web\Core\res" />
3535
<add path="..\..\Web\ClientScript\bin" />

‎Remotion/Web/Development.WebTesting.TestSite/Startup.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ public void Configure (IApplicationBuilder app, IWebHostEnvironment env)
2323
app.UseDeveloperExceptionPage();
2424
}
2525

26+
app.UseDefaultFiles();
27+
app.UseStaticFiles();
28+
2629
app.UseRouting();
2730

2831
app.UseEndpoints(

0 commit comments

Comments
 (0)