Upgrade to VS2017 (#76)

Author: jhkimnew

AspNetCoreModule.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26224.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCore\AspNetCore.vcxproj", "{439824F9-1455-4CC4-BD79-B44FA0A16552}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -12,16 +12,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\IISLib\IISLib
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{02F461DC-5166-4E88-AAD5-CF110016A647}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspNetCoreModule.Test", "test\AspNetCoreModule.Test\AspNetCoreModule.Test.xproj", "{4DDA7560-AA29-4161-A5EA-A7E8F3997321}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FDD2EDF8-1B62-4978-9815-9D95260B8B91}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2097C03C-E2F7-4396-B3BC-4335F1B87B5E}"
-	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreModule.Test", "test\AspNetCoreModule.Test\AspNetCoreModule.Test.csproj", "{4DDA7560-AA29-4161-A5EA-A7E8F3997321}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FDD2EDF8-1B62-4978-9815-9D95260B8B91}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreModule.TestSites.Standard", "test\AspNetCoreModule.TestSites.Standard\AspNetCoreModule.TestSites.Standard.csproj", "{030225D8-4EE8-47E5-B692-2A96B3B51A38}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspnetCoreModule.TestSites.Standard", "test\AspNetCoreModule.TestSites.Standard\AspnetCoreModule.TestSites.Standard.xproj", "{030225D8-4EE8-47E5-B692-2A96B3B51A38}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}"
+	ProjectSection(SolutionItems) = preProject
+		NuGet.Config = NuGet.Config
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Build/repo.props

@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <ExcludeFromTest Include="$(RepositoryRoot)test\AspNetCoreModule.TestSites.Standard\*.csproj" />
+    <ExcludeFromTest Include="$(RepositoryRoot)test\AspNetCoreModule.Test\*.csproj" Condition="'$(OS)' != 'Windows_NT'" />
+  </ItemGroup>
+</Project>

build.ps1

@@ -33,7 +33,7 @@ cd $PSScriptRoot
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP

global.json

@@ -4,7 +4,6 @@
 using AspNetCoreModule.Test.HttpClientHelper;
 using Microsoft.Web.Administration;
 using System;
-using System.Collections.ObjectModel;
 using System.IO;
 using System.ServiceProcess;
 using System.Threading;

test/AspNetCoreModule.Test/AspNetCoreModule.Test.ForVS.csproj

@@ -27,6 +27,11 @@ public class InitializeTestMachine : IDisposable
 
         public InitializeTestMachine()
         {
+            if (Environment.Is64BitOperatingSystem && !Environment.Is64BitProcess)
+            {
+                TestUtility.LogInformation("Error!!! Skipping to run InitializeTestMachine::InitializeTestMachine() because the test process is started on syswow mode");
+                throw new NotSupportedException("Running this test progrom in syswow64 mode is not supported");                
+            }
             _referenceCount++;
 
             if (_referenceCount == 1)

test/AspNetCoreModule.Test/AspNetCoreModule.Test.xproj

@@ -705,7 +705,7 @@ public static string RunPowershellScript(string scriptText)
 
             // create Powershell runspace
             Runspace runspace = RunspaceFactory.CreateRunspace();
-
+            
             // open it
             runspace.Open();
 

test/AspNetCoreModule.Test/Framework/IISConfigUtility.cs

@@ -1041,15 +1041,12 @@ public static async Task DoClientCertificateMappingTest(IISConfigUtility.AppPool
 
                     // Create a new local administrator user
                     string userName = "tempuser" + TestUtility.RandomString(5);
-                    string password = "AncmTest123!";                    
-                    string temp = TestUtility.RunPowershellScript("( Get-LocalUser -Name " + userName + " 2> $null ).Name");
-                    if (temp == userName)
-                    {
-                        temp = TestUtility.RunPowershellScript("net localgroup administrators /Delete " + userName);
-                        temp = TestUtility.RunPowershellScript("net user " + userName + " /Delete");
-                    }
+                    string password = "AncmTest123!";
+                    string temp;
+                    temp = TestUtility.RunPowershellScript("net localgroup IIS_IUSRS /Delete " + userName);
+                    temp = TestUtility.RunPowershellScript("net user " + userName + " /Delete");
                     temp = TestUtility.RunPowershellScript("net user " + userName + " " + password + " /ADD");
-                    temp = TestUtility.RunPowershellScript("net localgroup administrators /Add " + userName);
+                    temp = TestUtility.RunPowershellScript("net localgroup IIS_IUSRS /Add " + userName);
 
                     // Get public key of the client certificate and Configure OnetToOneClientCertificateMapping the public key and disable anonymous authentication and set SSL flags for Client certificate authentication
                     string publicKey = iisConfig.GetCertificatePublicKey(thumbPrintForClientAuthentication, @"Cert:\CurrentUser\My");
@@ -1102,7 +1099,7 @@ public static async Task DoClientCertificateMappingTest(IISConfigUtility.AppPool
                     Assert.True(result.Contains("403.7"));
 
                     // Clean up user
-                    temp = TestUtility.RunPowershellScript("net localgroup administrators /Delete " + userName);
+                    temp = TestUtility.RunPowershellScript("net localgroup IIS_IUSRS /Delete " + userName);
                     temp = TestUtility.RunPowershellScript("net user " + userName + " /Delete");
 
                     // Remove the SSL Certificate mapping