Feedback

Author: jkotalik

src/Servers/IIS/build/repo.props

@@ -25,18 +25,16 @@ public HttpsTest(ITestOutputHelper output) : base(output)
         {
         }
 
-        [Theory]
-        [InlineData("V1")]
+        [Fact]
         public Task Https_HelloWorld_CLR_X64(string ancmVersion)
         {
-            return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396, ancmVersion);
+            return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396, "V1");
         }
 
-        [Theory]
-        [InlineData("V1")]
-        public Task Https_HelloWorld_CoreCLR_X64_Portable(string ancmVersion)
+        [Fact]
+        public Task Https_HelloWorld_CoreCLR_X64_Portable()
         {
-            return HttpsHelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44394, ancmVersion);
+            return HttpsHelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44394, "V1");
         }
 
         private async Task HttpsHelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, string ancmVersion)
@@ -97,36 +95,32 @@ private async Task HttpsHelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType
             }
         }
 
-        [Theory]
-        [InlineData("V1")]
+        [Fact]
         public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable(string ancmVersion)
         {
-            return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false, ancmVersion);
+            return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false, "V1");
         }
 
-        [Theory]
-        [InlineData("V1")]
+        [Fact]
         public Task Https_HelloWorld_NoClientCert_Clr_X64(string ancmVersion)
         {
-            return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false, ancmVersion);
+            return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false, "V1");
         }
 
 #pragma warning disable xUnit1004 // Test methods should not be skipped
-        [Theory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")]
-        [InlineData("V1")]
+        [Fact(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")]
 #pragma warning restore xUnit1004 // Test methods should not be skipped
         public Task Https_HelloWorld_ClientCert_Clr_X64(string ancmVersion)
         {
-            return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44301, sendClientCert: true, ancmVersion);
+            return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44301, sendClientCert: true, "V1");
         }
 
 #pragma warning disable xUnit1004 // Test methods should not be skipped
-        [Theory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")]
-        [InlineData("V1")]
+        [Fact(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")]
 #pragma warning restore xUnit1004 // Test methods should not be skipped
         public Task Https_HelloWorld_ClientCert_CoreCLR_X64_Portable(string ancmVersion)
         {
-            return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44302, sendClientCert: true, ancmVersion);
+            return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44302, sendClientCert: true, "V1");
         }
 
         private async Task HttpsHelloWorldCerts(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, bool sendClientCert, string ancmVersion)

src/Servers/IIS/build/repo.targets

@@ -14,6 +14,7 @@
     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Reference Include="xunit" />
   </ItemGroup>
 
 </Project>

src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs

@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.IISIntegration;
 using Microsoft.Extensions.Logging;
+using Xunit;
 
 namespace TestSites
 {
@@ -46,6 +47,7 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
                 {
                     if (context.User.Identity.IsAuthenticated)
                     {
+                        Assert.IsType<WindowsPrincipal>(context.User);
                         return context.Response.WriteAsync(context.User.Identity.AuthenticationType);
                     }
                     else

src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj

@@ -8,6 +8,10 @@
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
     <VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
     <ExperimentalVersionPrefix>0.1.$(AspNetCorePatchVersion)</ExperimentalVersionPrefix>
+
+    <!-- ANCM versioning is intentionally 10 + AspNetCoreMajorVersion because earlier versions of ANCM shipped as 8.x. -->
+    <AspNetCoreModuleVersionMajor>1$(AspNetCoreMajorVersion)</AspNetCoreModuleVersionMajor>
+
     <VersionSuffix>$(PreReleaseLabel)-$(BuildNumber)</VersionSuffix>
     <BrandingVersionSuffix>$(PreReleaseBrandingLabel) Build $(BuildNumber)</BrandingVersionSuffix>