diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index fff712994e..1216abe4e6 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -16,32 +16,42 @@ jobs: beforeBuild: - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1" displayName: Setup IISExpress test certificates and schema -- template: jobs/iisintegration-job.yml +- template: jobs/default-build.yml parameters: - TestGroupName: IIS - SkipIISTests: false - SkipIISExpressTests: true - SkipIISForwardsCompatibilityTests: true - SkipIISBackwardsCompatibilityTests: true -- template: jobs/iisintegration-job.yml + jobName: MacOs_Build + jobDisplayName: "Build and test: macOS" + agentOs: macOs +- template: jobs/default-build.yml parameters: - TestGroupName: IISExpress - SkipIISTests: true - SkipIISExpressTests: false - SkipIISForwardsCompatibilityTests: true - SkipIISBackwardsCompatibilityTests: true -- template: jobs/iisintegration-job.yml - parameters: - TestGroupName: IISForwardCompat - SkipIISTests: true - SkipIISExpressTests: true - SkipIISForwardsCompatibilityTests: false - SkipIISBackwardsCompatibilityTests: true -- template: jobs/iisintegration-job.yml - parameters: - TestGroupName: IISBackCompat - SkipIISTests: true - SkipIISExpressTests: true - SkipIISForwardsCompatibilityTests: true - SkipIISBackwardsCompatibilityTests: false + jobName: Linux_Build + jobDisplayName: "Build and test: Linux" + agentOs: Linux +# - template: jobs/iisintegration-job.yml +# parameters: +# TestGroupName: IIS +# SkipIISTests: false +# SkipIISExpressTests: true +# SkipIISForwardsCompatibilityTests: true +# SkipIISBackwardsCompatibilityTests: true +# - template: jobs/iisintegration-job.yml +# parameters: +# TestGroupName: IISExpress +# SkipIISTests: true +# SkipIISExpressTests: false +# SkipIISForwardsCompatibilityTests: true +# SkipIISBackwardsCompatibilityTests: true +# - template: jobs/iisintegration-job.yml +# parameters: +# TestGroupName: IISForwardCompat +# SkipIISTests: true +# SkipIISExpressTests: true +# SkipIISForwardsCompatibilityTests: false +# SkipIISBackwardsCompatibilityTests: true +# - template: jobs/iisintegration-job.yml +# parameters: +# TestGroupName: IISBackCompat +# SkipIISTests: true +# SkipIISExpressTests: true +# SkipIISForwardsCompatibilityTests: true +# SkipIISBackwardsCompatibilityTests: false diff --git a/.azure/pipelines/jobs/iisintegration-job.yml b/.azure/pipelines/jobs/iisintegration-job.yml index 7d43e744f3..af3006a5b9 100644 --- a/.azure/pipelines/jobs/iisintegration-job.yml +++ b/.azure/pipelines/jobs/iisintegration-job.yml @@ -2,10 +2,10 @@ jobs: - template: default-build.yml parameters: beforeBuild: - - powershell: "& ./src/servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/servers/IIS/tools/update_schema.ps1; & ./src/servers/IIS/tools/SetupTestEnvironment.ps1 Setup" + - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1; & ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Setup" displayName: Prepare repo afterBuild: - - powershell: "& ./src/servers/IIS/tools/SetupTestEnvironment.ps1 Shutdown" + - powershell: "& ./src/Servers/IIS/tools/SetupTestEnvironment.ps1 Shutdown" displayName: Stop AppVerifier condition: always() - task: PublishBuildArtifacts@1 @@ -15,7 +15,7 @@ jobs: artifactName: logs artifactType: Container pathtoPublish: src/IISIntegration/artifacts/logs - buildDirectory: src/servers/IIS + buildDirectory: src/Servers/IIS buildArgs: "/p:SkipIISBackwardsCompatibilityTests=${{ parameters.SkipIISBackwardsCompatibilityTests }} /p:SkipIISTests=${{ parameters.SkipIISTests }} /p:SkipIISExpressTests=${{ parameters.SkipIISExpressTests }} /p:SkipIISForwardsCompatibilityTests=${{ parameters.SkipIISBackwardsCompatibilityTests }}" jobName: IISIntegration_${{ parameters.TestGroupName }} jobDisplayName: IISIntegration_${{ parameters.TestGroupName }} diff --git a/.gitmodules b/.gitmodules index 7491ba8bcd..7f40f37aa7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,6 +6,6 @@ path = modules/Scaffolding url = https://github.com/aspnet/Scaffolding.git branch = release/2.2 -[submodule "src/IISIntegration/test/gtest/googletest"] - path = src/IISIntegration/test/gtest/googletest +[submodule "googletest"] + path = src/submodules/googletest url = https://github.com/google/googletest diff --git a/Directory.Build.props b/Directory.Build.props index b6f859c19e..a6bd4a8657 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -85,6 +85,7 @@ true $(MSBuildThisFileDirectory)src\Shared\ + $(RepositoryRoot)src\submodules\googletest\ true diff --git a/build/CodeSign.props b/build/CodeSign.props index 4b3dbe6103..5b48abcb11 100644 --- a/build/CodeSign.props +++ b/build/CodeSign.props @@ -65,6 +65,12 @@ + + + + + + diff --git a/build/artifacts.props b/build/artifacts.props index 14ebbfd29c..baae9b0890 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -126,8 +126,6 @@ - - diff --git a/build/dependencies.props b/build/dependencies.props index 7ae5853c6c..0f81352533 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -108,6 +108,7 @@ 2.2.0 2.2.0 0.6.0-rtm-final + 2.2.0-rtm-35687 0.9.9 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 6a2f89ce7c..04c60ff7a3 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -82,6 +82,7 @@ + diff --git a/build/repo.props b/build/repo.props index 964b440da0..e96da8c9f4 100644 --- a/build/repo.props +++ b/build/repo.props @@ -71,6 +71,12 @@ + + + Platform=x64 + Platform=x86 + + + 2.2.0 + + + + 2.2.0 + + + + 2.2.0 + + + + 2.2.0 + + + + 2.2.0 + + + + 2.2.0 + 2.2.0 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index ba526a19e6..cce6ce895c 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -3,6 +3,8 @@ + + @@ -47,7 +49,7 @@ - + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 56e79bbe40..789d0e20f3 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -5,8 +5,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - @@ -51,22 +49,22 @@ - + + - + + - - - + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index dcda7bfa6e..62e4561ae5 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -5,6 +5,8 @@ + Microsoft.AspNetCore.AspNetCoreModule; + Microsoft.AspNetCore.AspNetCoreModuleV2; Microsoft.AspNetCore.Server.IIS; Microsoft.AspNetCore.Server.IISIntegration; Microsoft.AspNetCore.Server.IntegrationTesting.IIS; diff --git a/eng/dependencies.temp.props b/eng/dependencies.temp.props deleted file mode 100644 index ae186fbe66..0000000000 --- a/eng/dependencies.temp.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/eng/tools/BaselineGenerator/BaselineGenerator.csproj b/eng/tools/BaselineGenerator/BaselineGenerator.csproj index 8e7d5913a6..2f43472aeb 100644 --- a/eng/tools/BaselineGenerator/BaselineGenerator.csproj +++ b/eng/tools/BaselineGenerator/BaselineGenerator.csproj @@ -3,7 +3,7 @@ Exe netcoreapp2.1 - -o "$(MSBuildThisFileDirectory)../../Baseline.Designer.props" + -o "$(MSBuildThisFileDirectory)../../Baseline.Designer.props" --v3 -s https://dotnetfeed.blob.core.windows.net/dotnet-core/flatcontainer $(MSBuildThisFileDirectory)../../ diff --git a/eng/tools/BaselineGenerator/Program.cs b/eng/tools/BaselineGenerator/Program.cs index 4a6177ebec..bf9ee83687 100644 --- a/eng/tools/BaselineGenerator/Program.cs +++ b/eng/tools/BaselineGenerator/Program.cs @@ -96,20 +96,15 @@ namespace PackageBaselineGenerator using (var reader = new PackageArchiveReader(nupkgPath)) { - var first = true; + doc.Root.Add(new XComment($" Package: {id}")); + + var propertyGroup = new XElement("PropertyGroup", + new XAttribute("Condition", $" '$(PackageId)' == '{id}' "), + new XElement("BaselinePackageVersion", version)); + doc.Root.Add(propertyGroup); + foreach (var group in reader.NuspecReader.GetDependencyGroups()) { - if (first) - { - first = false; - doc.Root.Add(new XComment($" Package: {id}")); - - var propertyGroup = new XElement("PropertyGroup", - new XAttribute("Condition", $" '$(PackageId)' == '{id}' "), - new XElement("BaselinePackageVersion", version)); - doc.Root.Add(propertyGroup); - } - var itemGroup = new XElement("ItemGroup", new XAttribute("Condition", $" '$(PackageId)' == '{id}' AND '$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}' ")); doc.Root.Add(itemGroup); @@ -131,7 +126,7 @@ namespace PackageBaselineGenerator { doc.Save(writer); } - + Console.WriteLine($"Generated file in {output}"); return 0; } } diff --git a/src/Middleware/CORS/test/FunctionalTests/package-lock.json b/src/Middleware/CORS/test/FunctionalTests/package-lock.json index 3db2468bdf..c2a6f2c7d6 100644 --- a/src/Middleware/CORS/test/FunctionalTests/package-lock.json +++ b/src/Middleware/CORS/test/FunctionalTests/package-lock.json @@ -1668,7 +1668,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1689,12 +1690,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1709,17 +1712,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -1836,7 +1842,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1848,6 +1855,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1862,6 +1870,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1869,12 +1878,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -1893,6 +1904,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1973,7 +1985,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1985,6 +1998,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2070,7 +2084,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2106,6 +2121,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2125,6 +2141,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2168,12 +2185,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/src/Mvc/global.json b/src/Mvc/global.json deleted file mode 100644 index b5a5299b58..0000000000 --- a/src/Mvc/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "sdk": { - "version": "2.2.100-preview2-009404" - }, - "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181003.2" - } -} diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props new file mode 100644 index 0000000000..f4bd362993 --- /dev/null +++ b/src/Servers/IIS/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/Servers/IIS/Directory.Build.targets b/src/Servers/IIS/Directory.Build.targets new file mode 100644 index 0000000000..d6a76c85fe --- /dev/null +++ b/src/Servers/IIS/Directory.Build.targets @@ -0,0 +1,5 @@ + + + + + diff --git a/src/Servers/IIS/IISIntegration.NoV1.sln b/src/Servers/IIS/IISIntegration.NoV1.sln index c0985af555..883c9e7bb6 100644 --- a/src/Servers/IIS/IISIntegration.NoV1.sln +++ b/src/Servers/IIS/IISIntegration.NoV1.sln @@ -38,7 +38,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E build\applicationhost.iis.config = build\applicationhost.iis.config build\Build.Settings = build\Build.Settings build\Config.Definitions.Props = build\Config.Definitions.Props - build\functional-test-assets.targets = build\functional-test-assets.targets build\Key.snk = build\Key.snk build\launchSettings.json = build\launchSettings.json build\native.targets = build\native.targets diff --git a/src/Servers/IIS/ResolveIisReferences.targets b/src/Servers/IIS/ResolveIisReferences.targets new file mode 100644 index 0000000000..8355fc7c30 --- /dev/null +++ b/src/Servers/IIS/ResolveIisReferences.targets @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + Platform=x64 + + x64\ + + false + + NativeContent + + PreserveNewest + + Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup + + true + TargetFramework + + All + + true + + + + + Platform=x86 + + x86\ + + false + + NativeContent + + PreserveNewest + + Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup + + true + TargetFramework + + All + + true + + + + + + + + + + + + + %(LinkBase)%(FileName)%(Extension) + + + + + + + + + diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props index 13b30556bd..6df77ee807 100644 --- a/src/Servers/IIS/build/assets.props +++ b/src/Servers/IIS/build/assets.props @@ -9,261 +9,261 @@ - $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll - $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll - $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll + $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcore.dll + $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll + $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll $(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll diff --git a/src/Servers/IIS/build/functional-test-assets.targets b/src/Servers/IIS/build/functional-test-assets.targets deleted file mode 100644 index 81fb82b4a3..0000000000 --- a/src/Servers/IIS/build/functional-test-assets.targets +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/Servers/IIS/build/launchSettings.json b/src/Servers/IIS/build/launchSettings.json new file mode 100644 index 0000000000..246b7a0b47 --- /dev/null +++ b/src/Servers/IIS/build/launchSettings.json @@ -0,0 +1,42 @@ +{ + "iisSettings": { + "windowsAuthentication": true, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:5762/", + "sslPort": 0 + } + }, + "profiles": { + "ANCM IIS Express": { + "commandName": "Executable", + "executablePath": "$(IISExpressPath)", + "commandLineArgs": "$(IISExpressArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ANCM_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + }, + "ANCM IIS": { + "commandName": "Executable", + "executablePath": "$(IISPath)", + "commandLineArgs": "$(IISArguments)", + "environmentVariables": { + "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", + "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", + "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", + "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", + "LAUNCHER_ARGS": "$(TargetPath)", + "ASPNETCORE_ENVIRONMENT": "Development", + "LAUNCHER_PATH": "$(DotNetPath)", + "ASPNETCORE_MODULE_DEBUG": "console" + } + } + } +} diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index d650e87592..87998d09cf 100644 --- a/src/Servers/IIS/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -54,27 +54,33 @@ $(MSBuildThisFileDirectory)..\test\testassets\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks - $(InjectDepsAssembly) + $(InjectDepsAssembly) "win7-$(NativePlatform)" "$(AncmInProcessRHPath)" - + $(InjectDepsAssembly).exe $(InjectDepsAssembly) - + $(InjectDepsAssembly).dll dotnet $(InjectDepsAssembly) $(InjectDepsArguments) - + - + diff --git a/src/Servers/IIS/samples/IISSample/IISSample.csproj b/src/Servers/IIS/samples/IISSample/IISSample.csproj index caa381c20d..605fa12147 100644 --- a/src/Servers/IIS/samples/IISSample/IISSample.csproj +++ b/src/Servers/IIS/samples/IISSample/IISSample.csproj @@ -6,9 +6,6 @@ - - - diff --git a/src/Servers/IIS/samples/NativeIISSample/NativeIISSample.csproj b/src/Servers/IIS/samples/NativeIISSample/NativeIISSample.csproj index 91edd87128..1ceb1e2e3b 100644 --- a/src/Servers/IIS/samples/NativeIISSample/NativeIISSample.csproj +++ b/src/Servers/IIS/samples/NativeIISSample/NativeIISSample.csproj @@ -5,17 +5,15 @@ netcoreapp2.2 true + inprocess + - - - inprocess - diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets index 21ff857b22..8a8fe2dfeb 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets @@ -20,7 +20,7 @@ - + NuGetPackage @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj index 521cb9907a..29465aecb3 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj @@ -10,6 +10,7 @@ content true ASP.NET Core Module + false @@ -19,18 +20,16 @@ + - - True - lib - + - + - \ No newline at end of file + diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/lib/netcoreapp2.2/_._ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/_._ similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/lib/netcoreapp2.2/_._ rename to src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/_._ diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets index 21ff857b22..8a8fe2dfeb 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets @@ -20,7 +20,7 @@ - + NuGetPackage @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj index fb862184f7..617d35fe82 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj @@ -10,6 +10,7 @@ content true ASP.NET Core Module + false @@ -18,26 +19,24 @@ - - + + + - - True - lib - + - + - \ No newline at end of file + diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/lib/netcoreapp2.2/_._ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/_._ similarity index 100% rename from src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/lib/netcoreapp2.2/_._ rename to src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/_._ diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index bf6fd7dc54..bc3c92fbb7 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -13,79 +13,27 @@ True - - - - - - - - - - - - - - - False - - - False - - - - False - - - - False - - - - False - - - False - - - - False - - - False - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj index 5e3ef5bd6b..e2fbb5e5b4 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -12,23 +12,23 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs index 4ecb5018a2..02fc967f1a 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs @@ -3,7 +3,6 @@ using System; using System.Runtime.InteropServices; -using Microsoft.AspNetCore.HttpSys.Internal; namespace Microsoft.AspNetCore.Server.IISIntegration { diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index e62f4afd0a..8f241ac01b 100644 --- a/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -3,18 +3,16 @@ netstandard2.0 Microsoft.AspNetCore.Server.IntegrationTesting.IIS - - $(VersionPrefix)-$(VersionSuffix) - $(Version) Provides support for integration testing using IIS based servers. $(NoWarn);CS1591 true aspnetcore;iis True + true + true + false - - @@ -26,13 +24,4 @@ - - - - - - - - - diff --git a/src/Servers/IIS/test/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/test/CommonLibTests/CommonLibTests.vcxproj index 99c7215983..3d5d6efaa4 100644 --- a/src/Servers/IIS/test/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/test/CommonLibTests/CommonLibTests.vcxproj @@ -93,7 +93,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -120,7 +120,7 @@ EnableFastChecks MultiThreadedDebug Level3 - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -145,7 +145,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -173,7 +173,7 @@ MultiThreaded Level3 ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;..\gtest\googletest\googletest\include;..\gtest\googletest\googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\RequestHandlerLib;..\..\src\AspNetCoreModuleV2\IISLib;..\..\src\AspNetCoreModuleV2\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\..\src\AspNetCoreModuleV2\AspNetCore\Inc;..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\ /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" stdcpp17 @@ -193,4 +193,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj index 80fb3a4f43..b86e9482c6 100644 --- a/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -8,6 +8,8 @@ + + @@ -18,18 +20,16 @@ - - + + - - - - - + + + diff --git a/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj index 451a396a8c..27208537e3 100644 --- a/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj @@ -22,9 +22,9 @@ - - + + diff --git a/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 3a276aa358..b6a113cb7f 100644 --- a/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -11,7 +11,6 @@ - False @@ -23,13 +22,14 @@ - - - + + - + + + diff --git a/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj index 330b6a77a4..e164287935 100644 --- a/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj +++ b/src/Servers/IIS/test/IIS.Tests/IIS.Tests.csproj @@ -4,19 +4,18 @@ netcoreapp2.2 - - - - - + + - + + + diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 2eba82046c..1eea688532 100644 --- a/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -21,9 +21,9 @@ - - + + diff --git a/src/Servers/IIS/test/gtest/gtest.vcxproj b/src/Servers/IIS/test/gtest/gtest.vcxproj index f78530ea12..b4ea90651d 100644 --- a/src/Servers/IIS/test/gtest/gtest.vcxproj +++ b/src/Servers/IIS/test/gtest/gtest.vcxproj @@ -19,8 +19,8 @@ - - + + 15.0 @@ -110,7 +110,7 @@ true WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + $(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googletest;$(GoogleTestSubmoduleRoot)googlemock;$(GoogleTestSubmoduleRoot)googlemock\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -126,7 +126,7 @@ true _DEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + $(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googletest;$(GoogleTestSubmoduleRoot)googlemock;$(GoogleTestSubmoduleRoot)googlemock\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -144,7 +144,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + $(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googletest;$(GoogleTestSubmoduleRoot)googlemock;$(GoogleTestSubmoduleRoot)googlemock\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -164,7 +164,7 @@ true NDEBUG;_LIB;%(PreprocessorDefinitions) true - googletest\googletest\include;googletest\googletest;googletest\googlemock;googletest\googlemock\include;%(AdditionalIncludeDirectories) + $(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googletest;$(GoogleTestSubmoduleRoot)googlemock;$(GoogleTestSubmoduleRoot)googlemock\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -177,4 +177,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index 0dda2de217..0b4bd072d5 100644 --- a/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -25,6 +25,7 @@ + diff --git a/src/Servers/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj index 695a6d0b5c..3abf38c73c 100644 --- a/src/Servers/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -7,26 +7,21 @@ true - - - - - - - - + + + diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj index fc50dcd616..81b924c89e 100644 --- a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj +++ b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/OutOfProcessWebSite.csproj @@ -6,10 +6,6 @@ $(StandardTestTfms) - - - - @@ -20,11 +16,13 @@ + + diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Program.cs b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Program.cs new file mode 100644 index 0000000000..90895237d2 --- /dev/null +++ b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Program.cs @@ -0,0 +1,45 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.IO; +using System.Linq; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Logging; + +namespace TestSite +{ + public static class Program + { + public static int Main(string[] args) + { + var mode = args.FirstOrDefault(); + switch (mode) + { + case "CreateFile": + File.WriteAllText(args[1], ""); + return StartServer(); + } + + return StartServer(); + } + + private static int StartServer() + { + var host = new WebHostBuilder() + .ConfigureLogging( + (_, factory) => { + factory.AddConsole(); + factory.AddFilter("Console", level => level >= LogLevel.Information); + }) + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup() + .UseKestrel() + .Build(); + + host.Run(); + return 0; + } + } +} + diff --git a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Startup.cs b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Startup.cs index 6556b5ac41..de54a85a8a 100644 --- a/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Startup.cs +++ b/src/Servers/IIS/test/testassets/OutOfProcessWebSite/Startup.cs @@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.IISIntegration.FunctionalTests; using Microsoft.AspNetCore.Server.IISIntegration; using Microsoft.Extensions.DependencyInjection; +using Xunit; namespace TestSite { @@ -47,6 +48,7 @@ namespace TestSite { if (context.User.Identity.IsAuthenticated) { + Assert.IsType(context.User); return context.Response.WriteAsync(context.User.Identity.AuthenticationType); } else diff --git a/src/Servers/IIS/test/testassets/StressTestWebSite/Program.cs b/src/Servers/IIS/test/testassets/StressTestWebSite/Program.cs new file mode 100644 index 0000000000..e8e5392c2c --- /dev/null +++ b/src/Servers/IIS/test/testassets/StressTestWebSite/Program.cs @@ -0,0 +1,26 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Logging; + +namespace ANCMStressTestApp +{ + public class Program + { + public static void Main(string[] args) + { + var host = new WebHostBuilder() + .ConfigureLogging((_, factory) => + { + factory.AddConsole(); + }) + .UseKestrel() + .UseIISIntegration() + .UseStartup() + .Build(); + + host.Run(); + } + } +} diff --git a/src/Servers/IIS/version.props b/src/Servers/IIS/version.props deleted file mode 100644 index a66579d599..0000000000 --- a/src/Servers/IIS/version.props +++ /dev/null @@ -1,17 +0,0 @@ - - - 2 - 2 - 1 - 1 - $(DotNetMajorVersion).$(DotNetMinorVersion).$(DotNetPatchVersion) - 12 - 2 - $(DotNetPatchVersion) - ancm-oob - $(VersionPrefix) - $(VersionPrefix)-$(PreReleaseLabel)-$(BuildNumber) - $(PackageVersion) - 2.0.0 - - diff --git a/src/submodules/googletest b/src/submodules/googletest new file mode 160000 index 0000000000..4e4df226fc --- /dev/null +++ b/src/submodules/googletest @@ -0,0 +1 @@ +Subproject commit 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49