Cleanup tests and fix version information

jkotalik · jkotalik · commit 8686a58aa79b · 2018-12-12T08:49:20.000-08:00
diff --git a/src/Servers/IIS/build/native.targets b/src/Servers/IIS/build/native.targets
@@ -1,5 +1,4 @@
 <Project>
-  <Import Project="$(RepositoryRoot)\version.props" />
   <Target Name="CreateVersionHeader" BeforeTargets="PrepareForBuild">
     <ItemGroup>
       <VersionHeaderContents Include="// Copyright (c) .NET Foundation. All rights reserved." />
diff --git a/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/resource.h b/src/Servers/IIS/src/AspNetCoreModuleV1/AspNetCore/resource.h
@@ -7,7 +7,7 @@
 #define IDS_SERVER_ERROR                1001
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        101
diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
@@ -19,19 +19,16 @@ public HelloWorldTests(ITestOutputHelper output) : base(output)
         {
         }
 
-        [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]
-        [InlineData("V1")]
-        [InlineData("V2")]
-        public Task HelloWorld_IISExpress_Clr_X64_Portable(string ancmVersion)
+        [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]
+        public Task HelloWorld_IISExpress_Clr_X64_Portable()
         {
-            return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, ancmVersion);
+            return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, "V1");
         }
 
-        [Theory]
-        [InlineData("V1")]
-        public Task HelloWorld_IISExpress_CoreClr_X64_Portable(string ancmVersion)
+        [Fact]
+        public Task HelloWorld_IISExpress_CoreClr_X64_Portable()
         {
-            return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, ancmVersion);
+            return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, "V1");
         }
 
         private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, string ancmVersion)
diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
@@ -26,7 +26,7 @@ public HttpsTest(ITestOutputHelper output) : base(output)
         }
 
         [Fact]
-        public Task Https_HelloWorld_CLR_X64(string ancmVersion)
+        public Task Https_HelloWorld_CLR_X64()
         {
             return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396, "V1");
         }
@@ -96,29 +96,29 @@ private async Task HttpsHelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType
         }
 
         [Fact]
-        public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable(string ancmVersion)
+        public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable()
         {
             return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false, "V1");
         }
 
         [Fact]
-        public Task Https_HelloWorld_NoClientCert_Clr_X64(string ancmVersion)
+        public Task Https_HelloWorld_NoClientCert_Clr_X64()
         {
             return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false, "V1");
         }
 
 #pragma warning disable xUnit1004 // Test methods should not be skipped
         [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)
+        public Task Https_HelloWorld_ClientCert_Clr_X64()
         {
             return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44301, sendClientCert: true, "V1");
         }
 
 #pragma warning disable xUnit1004 // Test methods should not be skipped
         [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)
+        public Task Https_HelloWorld_ClientCert_CoreCLR_X64_Portable()
         {
             return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44302, sendClientCert: true, "V1");
         }
diff --git a/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
@@ -25,20 +25,16 @@ public NtlmAuthenticationTests(ITestOutputHelper output) : base(output)
         {
         }
 
-        [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]
-        [InlineData("V1")]
-        [InlineData("V2")]
-        public Task NtlmAuthentication_Clr_X64(string ancmVersion)
+        [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]
+        public Task NtlmAuthentication_Clr_X64_Portable()
         {
-            return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051, ancmVersion);
+            return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051, "V1");
         }
 
-        [Theory]
-        [InlineData("V1")]
-        [InlineData("V2")]
-        public Task NtlmAuthentication_CoreClr_X64_Portable(string ancmVersion)
+        [Fact]
+        public Task NtlmAuthentication_CoreClr_X64_Portable()
         {
-            return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052, ancmVersion);
+            return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052, "V1");
         }
 
         private async Task NtlmAuthentication(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, string ancmVersion)
@@ -59,7 +55,7 @@ private async Task NtlmAuthentication(RuntimeFlavor runtimeFlavor, ApplicationTy
                     additionalPublishParameters += " -r " + windowsRid;
 
                 }
-   
+
                 var deploymentParameters = new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), serverType, runtimeFlavor, architecture)
                 {
                     ApplicationBaseUriHint = $"http://localhost:{port}",
diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj
@@ -14,7 +14,6 @@
     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
-    <Reference Include="xunit" />
   </ItemGroup>
 
 </Project>
diff --git a/version.props b/version.props
@@ -11,6 +11,8 @@
 
     <!-- ANCM versioning is intentionally 10 + AspNetCoreMajorVersion because earlier versions of ANCM shipped as 8.x. -->
     <AspNetCoreModuleVersionMajor>1$(AspNetCoreMajorVersion)</AspNetCoreModuleVersionMajor>
+    <AspNetCoreModuleVersionMinor>$(AspNetCoreMinorVersion)</AspNetCoreModuleVersionMinor>
+    <AspNetCoreModuleVersionRevision>$(AspNetCorePatchVersion)</AspNetCoreModuleVersionRevision>
 
     <VersionSuffix>$(PreReleaseLabel)-$(BuildNumber)</VersionSuffix>
     <BrandingVersionSuffix>$(PreReleaseBrandingLabel) Build $(BuildNumber)</BrandingVersionSuffix>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<Project>`
`2`		`- <Import Project="$(RepositoryRoot)\version.props" />`
`3`	`2`	`<Target Name="CreateVersionHeader" BeforeTargets="PrepareForBuild">`
`4`	`3`	`<ItemGroup>`
`5`	`4`	`<VersionHeaderContents Include="// Copyright (c) .NET Foundation. All rights reserved." />`
Original file line number	Diff line number	Diff line change
`@@ -19,19 +19,16 @@ public HelloWorldTests(ITestOutputHelper output) : base(output)`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`
`22`		`- [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]`
`23`		`- [InlineData("V1")]`
`24`		`- [InlineData("V2")]`
`25`		`- public Task HelloWorld_IISExpress_Clr_X64_Portable(string ancmVersion)`
	`22`	`+ [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]`
	`23`	`+ public Task HelloWorld_IISExpress_Clr_X64_Portable()`
`26`	`24`	`{`
`27`		`- return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, ancmVersion);`
	`25`	`+ return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, "V1");`
`28`	`26`	`}`
`29`	`27`
`30`		`- [Theory]`
`31`		`- [InlineData("V1")]`
`32`		`- public Task HelloWorld_IISExpress_CoreClr_X64_Portable(string ancmVersion)`
	`28`	`+ [Fact]`
	`29`	`+ public Task HelloWorld_IISExpress_CoreClr_X64_Portable()`
`33`	`30`	`{`
`34`		`- return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, ancmVersion);`
	`31`	`+ return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, "V1");`
`35`	`32`	`}`
`36`	`33`
`37`	`34`	`private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, string ancmVersion)`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public HttpsTest(ITestOutputHelper output) : base(output)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`[Fact]`
`29`		`- public Task Https_HelloWorld_CLR_X64(string ancmVersion)`
	`29`	`+ public Task Https_HelloWorld_CLR_X64()`
`30`	`30`	`{`
`31`	`31`	`return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396, "V1");`
`32`	`32`	`}`
`@@ -96,29 +96,29 @@ private async Task HttpsHelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`[Fact]`
`99`		`- public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable(string ancmVersion)`
	`99`	`+ public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable()`
`100`	`100`	`{`
`101`	`101`	`return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false, "V1");`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`[Fact]`
`105`		`- public Task Https_HelloWorld_NoClientCert_Clr_X64(string ancmVersion)`
	`105`	`+ public Task Https_HelloWorld_NoClientCert_Clr_X64()`
`106`	`106`	`{`
`107`	`107`	`return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false, "V1");`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`#pragma warning disable xUnit1004 // Test methods should not be skipped`
`111`	`111`	`[Fact(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")]`
`112`	`112`	`#pragma warning restore xUnit1004 // Test methods should not be skipped`
`113`		`- public Task Https_HelloWorld_ClientCert_Clr_X64(string ancmVersion)`
	`113`	`+ public Task Https_HelloWorld_ClientCert_Clr_X64()`
`114`	`114`	`{`
`115`	`115`	`return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44301, sendClientCert: true, "V1");`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`#pragma warning disable xUnit1004 // Test methods should not be skipped`
`119`	`119`	`[Fact(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")]`
`120`	`120`	`#pragma warning restore xUnit1004 // Test methods should not be skipped`
`121`		`- public Task Https_HelloWorld_ClientCert_CoreCLR_X64_Portable(string ancmVersion)`
	`121`	`+ public Task Https_HelloWorld_ClientCert_CoreCLR_X64_Portable()`
`122`	`122`	`{`
`123`	`123`	`return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44302, sendClientCert: true, "V1");`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,20 +25,16 @@ public NtlmAuthenticationTests(ITestOutputHelper output) : base(output)`
`25`	`25`	`{`
`26`	`26`	`}`
`27`	`27`
`28`		`- [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]`
`29`		`- [InlineData("V1")]`
`30`		`- [InlineData("V2")]`
`31`		`- public Task NtlmAuthentication_Clr_X64(string ancmVersion)`
	`28`	`+ [Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]`
	`29`	`+ public Task NtlmAuthentication_Clr_X64_Portable()`
`32`	`30`	`{`
`33`		`- return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051, ancmVersion);`
	`31`	`+ return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051, "V1");`
`34`	`32`	`}`
`35`	`33`
`36`		`- [Theory]`
`37`		`- [InlineData("V1")]`
`38`		`- [InlineData("V2")]`
`39`		`- public Task NtlmAuthentication_CoreClr_X64_Portable(string ancmVersion)`
	`34`	`+ [Fact]`
	`35`	`+ public Task NtlmAuthentication_CoreClr_X64_Portable()`
`40`	`36`	`{`
`41`		`- return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052, ancmVersion);`
	`37`	`+ return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052, "V1");`
`42`	`38`	`}`
`43`	`39`
`44`	`40`	`private async Task NtlmAuthentication(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, int port, string ancmVersion)`
`@@ -59,7 +55,7 @@ private async Task NtlmAuthentication(RuntimeFlavor runtimeFlavor, ApplicationTy`
`59`	`55`	`additionalPublishParameters += " -r " + windowsRid;`
`60`	`56`
`61`	`57`	`}`
`62`		`-`
	`58`	`+`
`63`	`59`	`var deploymentParameters = new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), serverType, runtimeFlavor, architecture)`
`64`	`60`	`{`
`65`	`61`	`ApplicationBaseUriHint = $"http://localhost:{port}",`