diff --git a/AspNetCoreModule.sln b/AspNetCoreModule.sln index e2ab3a60d5..d18cf23d4b 100644 --- a/AspNetCoreModule.sln +++ b/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}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2097C03C-E2F7-4396-B3BC-4335F1B87B5E}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FDD2EDF8-1B62-4978-9815-9D95260B8B91}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspnetCoreModule.TestSites.Standard", "test\AspNetCoreModule.TestSites.Standard\AspnetCoreModule.TestSites.Standard.xproj", "{030225D8-4EE8-47E5-B692-2A96B3B51A38}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreModule.Test", "test\AspNetCoreModule.Test\AspNetCoreModule.Test.csproj", "{4DDA7560-AA29-4161-A5EA-A7E8F3997321}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreModule.TestSites.Standard", "test\AspNetCoreModule.TestSites.Standard\AspNetCoreModule.TestSites.Standard.csproj", "{030225D8-4EE8-47E5-B692-2A96B3B51A38}" +EndProject +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 diff --git a/Build/repo.props b/Build/repo.props new file mode 100644 index 0000000000..a56e75519b --- /dev/null +++ b/Build/repo.props @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index 8f2f99691a..0605b59c01 100644 --- a/build.ps1 +++ b/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 diff --git a/global.json b/global.json deleted file mode 100644 index 0c827e1b26..0000000000 --- a/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projects": [ "test" ] -} \ No newline at end of file diff --git a/test/AspNetCoreModule.Test/AspNetCoreModule.Test.ForVS.csproj b/test/AspNetCoreModule.Test/AspNetCoreModule.Test.ForVS.csproj deleted file mode 100644 index dd35d6f469..0000000000 --- a/test/AspNetCoreModule.Test/AspNetCoreModule.Test.ForVS.csproj +++ /dev/null @@ -1,155 +0,0 @@ - - - - - Debug - AnyCPU - {FB383E4C-A762-4FEA-BEFF-B3E6F4FA40C5} - Library - Properties - AspNetCoreModule.FunctionalTest - AspNetCoreModule.FunctionalTest - v4.5.1 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\dotnet-test-xunit.2.2.0-preview2-build1029\lib\net451\dotnet-test-xunit.exe - True - - - ..\..\..\..\Users\jhkim\.nuget\packages\Microsoft.AspNetCore.Server.IntegrationTesting\0.3.0-preview1-22821\lib\net451\Microsoft.AspNetCore.Server.IntegrationTesting.dll - - - ..\..\packages\Microsoft.AspNetCore.Server.Testing.0.2.0-alpha1-21873\lib\net451\Microsoft.AspNetCore.Server.Testing.dll - True - - - ..\..\packages\Microsoft.AspNetCore.Testing.1.2.0-preview1-22815\lib\net451\Microsoft.AspNetCore.Testing.dll - True - - - ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.1.2.0-preview1-22821\lib\netstandard1.0\Microsoft.Extensions.Configuration.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.2.0-preview1-22821\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.1.1.0-preview1-final\lib\netstandard1.0\Microsoft.Extensions.FileProviders.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.FileProviders.Embedded.1.1.0-preview1-final\lib\net451\Microsoft.Extensions.FileProviders.Embedded.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.1.2.0-preview1-22821\lib\netstandard1.1\Microsoft.Extensions.Logging.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.2.0-preview1-22821\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Logging.Console.1.2.0-preview1-22821\lib\net451\Microsoft.Extensions.Logging.Console.dll - True - - - ..\..\packages\Microsoft.Extensions.PlatformAbstractions.1.2.0-preview1-22821\lib\net451\Microsoft.Extensions.PlatformAbstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Primitives.1.2.0-preview1-22821\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll - True - - - ..\..\packages\Microsoft.Net.Http.Headers.1.2.0-preview1-22821\lib\netstandard1.1\Microsoft.Net.Http.Headers.dll - True - - - ..\..\packages\Microsoft.Web.Administration.7.0.0.0\lib\net20\Microsoft.Web.Administration.dll - True - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - - ..\..\packages\System.Buffers.4.3.0\lib\netstandard1.1\System.Buffers.dll - True - - - - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.3.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll - True - - - ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - - - - - - - - - - ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.2.0-beta4-build3444\lib\net45\xunit.core.dll - True - - - ..\..\packages\xunit.extensibility.execution.2.2.0-beta4-build3444\lib\net45\xunit.execution.desktop.dll - True - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/AspNetCoreModule.Test/AspNetCoreModule.Test.xproj b/test/AspNetCoreModule.Test/AspNetCoreModule.Test.xproj deleted file mode 100644 index b1ed5dc42f..0000000000 --- a/test/AspNetCoreModule.Test/AspNetCoreModule.Test.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4dda7560-aa29-4161-a5ea-a7e8f3997321 - AspNetCoreModule.Test - .\obj - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/AspNetCoreModule.Test/Framework/IISConfigUtility.cs b/test/AspNetCoreModule.Test/Framework/IISConfigUtility.cs index f727b958f4..0a77d73e57 100644 --- a/test/AspNetCoreModule.Test/Framework/IISConfigUtility.cs +++ b/test/AspNetCoreModule.Test/Framework/IISConfigUtility.cs @@ -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; diff --git a/test/AspNetCoreModule.Test/Framework/InitializeTestMachine.cs b/test/AspNetCoreModule.Test/Framework/InitializeTestMachine.cs index 07aafb1264..22a07e43fd 100644 --- a/test/AspNetCoreModule.Test/Framework/InitializeTestMachine.cs +++ b/test/AspNetCoreModule.Test/Framework/InitializeTestMachine.cs @@ -27,6 +27,11 @@ namespace AspNetCoreModule.Test.Framework 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) diff --git a/test/AspNetCoreModule.Test/Framework/TestUtility.cs b/test/AspNetCoreModule.Test/Framework/TestUtility.cs index b688582dc8..9e7d6d67fd 100644 --- a/test/AspNetCoreModule.Test/Framework/TestUtility.cs +++ b/test/AspNetCoreModule.Test/Framework/TestUtility.cs @@ -705,7 +705,7 @@ namespace AspNetCoreModule.Test.Framework // create Powershell runspace Runspace runspace = RunspaceFactory.CreateRunspace(); - + // open it runspace.Open(); diff --git a/test/AspNetCoreModule.Test/FunctionalTestHelper.cs b/test/AspNetCoreModule.Test/FunctionalTestHelper.cs index 09b3cb0ce7..97bf2d92d8 100644 --- a/test/AspNetCoreModule.Test/FunctionalTestHelper.cs +++ b/test/AspNetCoreModule.Test/FunctionalTestHelper.cs @@ -1041,15 +1041,12 @@ namespace AspNetCoreModule.Test // 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 @@ namespace AspNetCoreModule.Test 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 diff --git a/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj b/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj new file mode 100644 index 0000000000..9a9b87c30c --- /dev/null +++ b/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj @@ -0,0 +1,51 @@ + + + + net452 + true + true + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/AspNetCoreModule.Test/project.json b/test/AspNetCoreModule.Test/project.json deleted file mode 100644 index bc9d8099d2..0000000000 --- a/test/AspNetCoreModule.Test/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "copyToOutput": { - "include": [ - "Http.config" - ] - } - }, - "testRunner": "xunit", - "dependencies": { - "Microsoft.Web.Administration": "7.0.0", - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Testing": "1.2.0-*", - "Microsoft.Extensions.Logging": "1.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.2.0-*", - "Microsoft.Extensions.PlatformAbstractions": "1.2.0-*", - "Microsoft.Net.Http.Headers": "1.1.0-*", - "xunit": "2.2.0-*", - "System.Management.Automation.dll": "10.0.10586" - }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Data": "", - "System.IO.Compression.FileSystem": "", - "System.Management": "", - "System.Net.Http": "", - "System.Net.Http.WebRequest": "", - "System.Runtime": "", - "System.ServiceProcess": "", - "System.Xml": "" - } - } - } -} \ No newline at end of file diff --git a/test/AspNetCoreModule.Test/project.json.compileerror.txt b/test/AspNetCoreModule.Test/project.json.compileerror.txt deleted file mode 100644 index e3833d3d0b..0000000000 --- a/test/AspNetCoreModule.Test/project.json.compileerror.txt +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": "1.1.0-*", - "dependencies": { - "Microsoft.AspNetCore.WebSockets.Server": "*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.2.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.2.0-*", - "Microsoft.AspNetCore.Server.WebListener": "1.2.0-*", - "Microsoft.AspNetCore.WebUtilities": "1.2.0-*", - "Microsoft.Extensions.Configuration.CommandLine": "1.2.0-*", - "Microsoft.Extensions.Configuration.Json": "1.2.0-*", - "Microsoft.Extensions.Logging.Console": "1.2.0-*", - "Microsoft.Net.Http.Headers": "1.2.0-*" - }, - "buildOptions": { - "emitEntryPoint": true - }, - "publishOptions": { - "include": [ - "web.config" - ] - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0-*", - "type": "platform" - } - } - } - }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - "scripts": { - "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" - } -} \ No newline at end of file diff --git a/test/AspNetCoreModule.TestSites.Standard/AspnetCoreModule.TestSites.Standard.xproj b/test/AspNetCoreModule.TestSites.Standard/AspnetCoreModule.TestSites.Standard.xproj deleted file mode 100644 index 9ad0d6bf8b..0000000000 --- a/test/AspNetCoreModule.TestSites.Standard/AspnetCoreModule.TestSites.Standard.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 030225d8-4ee8-47e5-b692-2a96b3b51a38 - .\obj - .\bin\ - - - 2.0 - 49212 - - - \ No newline at end of file diff --git a/test/AspNetCoreModule.TestSites.Standard/aspnetcoremodule.testsites.standard.csproj b/test/AspNetCoreModule.TestSites.Standard/aspnetcoremodule.testsites.standard.csproj new file mode 100644 index 0000000000..08a7cfdd27 --- /dev/null +++ b/test/AspNetCoreModule.TestSites.Standard/aspnetcoremodule.testsites.standard.csproj @@ -0,0 +1,21 @@ + + + netcoreapp1.1 + + + + + + + + + + + + + + + + + + diff --git a/test/AspNetCoreModule.TestSites.Standard/project.json b/test/AspNetCoreModule.TestSites.Standard/project.json deleted file mode 100644 index cf5023ba58..0000000000 --- a/test/AspNetCoreModule.TestSites.Standard/project.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "dependencies": { - "Microsoft.AspNetCore.WebSockets.Server": "0.1.0-rc2-final", - "Microsoft.AspNetCore.Diagnostics": "1.0.1-*", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.1-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.1-*", - "Microsoft.AspNetCore.Server.WebListener": "1.0.1-*", - "Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.1-*", - "Microsoft.AspNetCore.ResponseCompression": "*", - "Microsoft.AspNetCore.ResponseCaching": "*", - "Microsoft.AspNetCore.StaticFiles": "*", - "Microsoft.Extensions.Configuration.CommandLine": "1.0.1-*", - "Microsoft.Extensions.Logging.Console": "1.0.1-*" - }, - - "buildOptions": { - "emitEntryPoint": true, - "copyToOutput": [ - ] - }, - - "publishOptions": { - "include": [ - "web.config" - ] - }, - - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.1-*", - "type": "platform" - } - } - } - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } -}