From fa9d7a7e8cbcee70741d95b2ec5622be22ed9340 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 18 Dec 2017 17:13:30 -0800 Subject: [PATCH] Update dependencies.props [auto-updated: dependencies] --- .gitattributes | 1 + IISIntegration.sln | 81 ++++++++----- NuGetPackageVerifier.json | 6 + README.md | 82 +------------ build/dependencies.props | 109 ++++++------------ build/repo.props | 6 +- build/repo.targets | 21 +--- korebuild-lock.txt | 4 +- src/AspNetCore/AspNetCore.vcxproj | 9 +- src/AspNetCore/aspnetcoremodule.rc | Bin 6094 -> 3044 bytes src/AspNetCore/resource.h | Bin 1106 -> 533 bytes src/CommonLib/stdafx.cpp | Bin 350 -> 176 bytes src/CommonLib/stdafx.h | Bin 1628 -> 815 bytes src/CommonLib/targetver.h | Bin 630 -> 312 bytes src/RequestHandler/RequestHandler.vcxproj | 8 +- src/RequestHandler/Resource.rc | Bin 4360 -> 2181 bytes src/RequestHandler/Source.cpp | 0 .../AspNetCoreModule.Test.csproj | 2 +- .../Framework/TestUtility.cs | 4 +- ...AspNetCoreModule.TestSites.Standard.csproj | 2 +- 20 files changed, 113 insertions(+), 222 deletions(-) delete mode 100644 src/RequestHandler/Source.cpp diff --git a/.gitattributes b/.gitattributes index 97b827b758..62fe7c511d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -42,6 +42,7 @@ *.fs text=auto *.fsx text=auto *.hs text=auto +*.rc text=auto *.csproj text=auto *.vbproj text=auto diff --git a/IISIntegration.sln b/IISIntegration.sln index 12bb8b1bc8..af31823288 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.10 +VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 15.0.26730.03 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04B1EDB6-E967-4D25-89B9-E6F8304038CD}" ProjectSection(SolutionItems) = preProject @@ -18,6 +18,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EF30B533-D715-421A-92B7-92FEF460AC9C}" ProjectSection(SolutionItems) = preProject test\Directory.Build.props = test\Directory.Build.props + test\WebSocketClientEXE\WebSocketClientEXE.csproj = test\WebSocketClientEXE\WebSocketClientEXE.csproj EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}" @@ -49,9 +50,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AspNetCore", "src\AspNetCor EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\IISLib\IISLib.vcxproj", "{4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\CommonLib\CommonLib.vcxproj", "{55494E58-E061-4C4C-A0A8-837008E72F85}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandler", "src\RequestHandler\RequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\CommonLib\CommonLib.vcxproj", "{55494E58-E061-4C4C-A0A8-837008E72F85}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreModule.Test", "test\AspNetCoreModule.Test\AspNetCoreModule.Test.csproj", "{5F31656B-4990-44FE-9090-00E32D933376}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreModule.TestSites.Standard", "test\AspNetCoreModule.TestSites.Standard\AspNetCoreModule.TestSites.Standard.csproj", "{93ECA06C-767E-4A4D-AC59-21F250381297}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -178,30 +183,50 @@ Global {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x64.Build.0 = Release|x64 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.ActiveCfg = Release|Win32 {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE}.Release|x86.Build.0 = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Win32.ActiveCfg = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Win32.Build.0 = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Win32.ActiveCfg = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Win32.Build.0 = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Win32.ActiveCfg = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Win32.Build.0 = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Win32.Deploy.0 = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.ActiveCfg = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.Build.0 = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.Deploy.0 = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Any CPU.ActiveCfg = Release|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Win32.ActiveCfg = Release|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Win32.Build.0 = Release|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Win32.Deploy.0 = Release|Win32 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.ActiveCfg = Release|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.Build.0 = Release|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.Deploy.0 = Release|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.ActiveCfg = Debug|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.Build.0 = Debug|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.ActiveCfg = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.Build.0 = Debug|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|Any CPU.ActiveCfg = Release|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.ActiveCfg = Release|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x64.Build.0 = Release|x64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.ActiveCfg = Release|Win32 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.Build.0 = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32 + {5F31656B-4990-44FE-9090-00E32D933376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Debug|x64.ActiveCfg = Debug|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Debug|x64.Build.0 = Debug|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Debug|x86.ActiveCfg = Debug|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Debug|x86.Build.0 = Debug|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Release|Any CPU.Build.0 = Release|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Release|x64.ActiveCfg = Release|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Release|x64.Build.0 = Release|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Release|x86.ActiveCfg = Release|Any CPU + {5F31656B-4990-44FE-9090-00E32D933376}.Release|x86.Build.0 = Release|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Debug|x64.ActiveCfg = Debug|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Debug|x64.Build.0 = Debug|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Debug|x86.ActiveCfg = Debug|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Debug|x86.Build.0 = Debug|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Release|Any CPU.Build.0 = Release|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Release|x64.ActiveCfg = Release|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Release|x64.Build.0 = Release|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Release|x86.ActiveCfg = Release|Any CPU + {93ECA06C-767E-4A4D-AC59-21F250381297}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -217,8 +242,10 @@ Global {C745BBFD-7888-4038-B41B-6D1832D13878} = {EF30B533-D715-421A-92B7-92FEF460AC9C} {439824F9-1455-4CC4-BD79-B44FA0A16552} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} - {D57EA297-6DC2-4BC0-8C91-334863327863} = {FDD2EDF8-1B62-4978-9815-9D95260B8B91} - {55494E58-E061-4C4C-A0A8-837008E72F85} = {FDD2EDF8-1B62-4978-9815-9D95260B8B91} + {55494E58-E061-4C4C-A0A8-837008E72F85} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {D57EA297-6DC2-4BC0-8C91-334863327863} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {5F31656B-4990-44FE-9090-00E32D933376} = {EF30B533-D715-421A-92B7-92FEF460AC9C} + {93ECA06C-767E-4A4D-AC59-21F250381297} = {EF30B533-D715-421A-92B7-92FEF460AC9C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index b153ab1515..ceddc22350 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -1,4 +1,10 @@ { + "adx-nonshipping": { + "rules": [], + "packages": { + "Microsoft.AspNetCore.AspNetCoreModule": {} + } + }, "Default": { "rules": [ "DefaultCompositeRule" diff --git a/README.md b/README.md index 94f5fa5df9..f9310e5d9e 100644 --- a/README.md +++ b/README.md @@ -1,83 +1,3 @@ -This repo hosts the ASP.NET Core middleware for IIS integration. +This repo hosts the ASP.NET Core middleware for IIS integration and the ASP.NET Core Module. This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. - -======= -# ASP.NET Core Module - -The ASP.NET Core Module is an IIS Module which is responsible for process -management of ASP.NET Core http listeners and to proxy requests to the process -that it manages. - -## Installing the latest ASP.NET Core Module -The ASP.NET Core Module for IIS can be installed on servers without installing the .NET Core runtime. You can download the [Windows (Server Hosting) installer](https://go.microsoft.com/fwlink/?linkid=832756) and run the following command from an Administrator command prompt: -``DotNetCore.1.1.0.Preview1-WindowsHosting.exe OPT_INSTALL_LTS_REDIST=0 OPT_INSTALL_FTS_REDIST=0`` - -## Pre-requisites for building - -### Windows 8.1+ or Windows Server 2012 R2+ - -### Visual C++ Build Tools - -[Download](http://download.microsoft.com/download/D/2/3/D23F4D0F-BA2D-4600-8725-6CCECEA05196/vs_community_ENU.exe) -and install Visual Studio 2015. In Visual Studio 2015 C++ tooling is no longer -installed by default, you must chose "Custom" install and select Visual C++. - -![Visual C++](https://cloud.githubusercontent.com/assets/4734691/18014419/b06e589a-6b77-11e6-9393-4eed32186ca3.png) - -Optionally, if you don't want to install Visual Studio you can just install the -[Visual C++ build tools](http://landinghub.visualstudio.com/visual-cpp-build-tools). - -### MSBuild - -If you have installed Visual Studio, you should already have MSBuild. If you -installed the Visual C++ build tools, you will need to download and install -[Microsoft Build Tools 2015](https://www.microsoft.com/en-us/download/details.aspx?id=48159) - -Once you have installed MSBuild, you can add it your path. The default location -for MSBuild is `%ProgramFiles(x86)%\MSBuild\14.0\Bin` - -### Windows Software Development Kit for Windows 8.1 - -[Download](http://download.microsoft.com/download/B/0/C/B0C80BA3-8AD6-4958-810B-6882485230B5/standalonesdk/sdksetup.exe) -and install the Windows SDK for Windows 8.1. From the Feature list presented, -ensure you select *Windows Software Development Kit*. - -If chose to install from the command prompt, you can run the following command. -```` -.\sdksetup.exe /features OptionId.WindowsDesktopSoftwareDevelopmentKit -```` - -## How to build - - -```powershell - -# Clean -.\build.cmd /target:clean - -# Build -.\build.cmd - -# Build 64-bit -.\build.cmd /property:platform=x64 - -# Build in Release Configuration -.\build.cmd /property:configuration=release -``` - -## Contributions - -Check out the [contributing](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) -page to see the best places to log issues and start discussions. - -This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/) -to clarify expected behavior in our community. -For more information see the [.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct). - -### .NET Foundation - -This project is supported by the [.NET Foundation](http://www.dotnetfoundation.org). - - ->>>>>>> ANCM/dev diff --git a/build/dependencies.props b/build/dependencies.props index 850919796a..2dca7d0862 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,85 +1,48 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) -<<<<<<< HEAD - 2.1.0-preview1-15576 - 2.0.0 - 1.0.0-pre-10202 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 0.5.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 2.1.0-preview1-27644 - 1.1.0 - 2.1.0-preview1-27644 - 2.0.0 - 2.1.0-preview1-26008-01 - 15.3.0 - 4.5.0-preview1-25914-04 - 0.1.0-alpha-002 - 10.0.10586 - 4.5.0-preview1-25902-08 - 4.5.0-preview1-25902-08 - 4.5.0-preview1-25902-08 - 4.4.0 - 0.1.0-alpha-002 - 2.3.0 - 2.3.0 - 7.0.0 - 2.0.0 -======= - 2.1.0-preview1-15620 + 2.1.0-preview1-15638 + 2.1.0-preview1-27867 1.0.0-pre-10223 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 0.5.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 - 2.1.0-preview1-27776 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 0.5.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 2.1.0-preview1-27867 + 1.1.0 + 2.1.0-preview1-27867 2.0.0 - 2.1.0-preview1-26008-01 + 2.1.0-preview1-26016-05 + 2.1.0-preview1-27867 15.3.0 - 4.5.0-preview1-26006-06 - 0.1.0-e171206-2 - 4.5.0-preview1-26006-06 - 4.5.0-preview1-26006-06 - 4.5.0-preview1-26006-06 - 4.5.0-preview1-26006-06 - 0.1.0-e171206-2 + 11.0.0 + 4.5.0-preview1-26016-05 + 0.1.0-e171215-1 + 6.1.7601.17515 + 4.5.0-preview1-26016-05 + 4.5.0-preview1-26016-05 + 4.5.0-preview1-26016-05 + 4.5.0-preview1-26016-05 + 0.1.0-e171215-1 2.3.1 2.3.1 ->>>>>>> 471bd8a... Upgrade deps (#488) diff --git a/build/repo.props b/build/repo.props index 810db16cd7..7421f4691d 100644 --- a/build/repo.props +++ b/build/repo.props @@ -6,15 +6,11 @@ - + - - x64 - - Internal.AspNetCore.Universe.Lineup diff --git a/build/repo.targets b/build/repo.targets index 97c447ab01..04c26d53da 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,8 +1,4 @@ - - https://dotnet.myget.org/F/aspnetcoremodule/api/v2/package - $(VerifyDependsOn);PublishPackage - @@ -21,25 +17,10 @@ - - 1.0.0-pre-$(BuildNumber) - - - - - - - - - - - + \ No newline at end of file diff --git a/korebuild-lock.txt b/korebuild-lock.txt index fe4a961da3..2e540bdffd 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-15620 -commithash:6432b49a2c00310416df39b6fe548ef4af9c6011 +version:2.1.0-preview1-15638 +commithash:1d3a0c725dc6b8ae6b0e47800fd6b4d8f8b8d545 diff --git a/src/AspNetCore/AspNetCore.vcxproj b/src/AspNetCore/AspNetCore.vcxproj index 1237d765a8..4af4211f2e 100644 --- a/src/AspNetCore/AspNetCore.vcxproj +++ b/src/AspNetCore/AspNetCore.vcxproj @@ -72,13 +72,13 @@ - $(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform) + $(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform)\ - $(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform) + $(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform)\ - $(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform) + $(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform)\ @@ -241,9 +241,6 @@ - - - {55494e58-e061-4c4c-a0a8-837008e72f85} diff --git a/src/AspNetCore/aspnetcoremodule.rc b/src/AspNetCore/aspnetcoremodule.rc index 3a6973bab1ac1a7ecd6b13d4a64ba0af27c0d173..bca79c6a18ef1bd18d7f4924d0281dca204e63cd 100644 GIT binary patch literal 3044 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 WTCAViSXt%7zUV&RRhF~=J^loSeVa4@ diff --git a/src/CommonLib/stdafx.cpp b/src/CommonLib/stdafx.cpp index 18b5b37fe16d22894639e83cb6a90679348178ba..6850f4cb6e22e6dc2673c7bcc331178bf420245f 100644 GIT binary patch literal 176 zcmX|)K?=e!6h!xd++nC2-6UraQ4rLPy+BERZ6qe;=U3|O4K2Eyd5;-uameF`!($L^ z-45nUxSrczZEz?02bl#SEzZdK jNlw5y3;N86>rUl0z1CN)wAzH^;^YZU5#RN*85*s=RTetq literal 350 zcmZ9IK@NgY5JTVE#5?@pMmKNB^QH+lgBC>R7HVD$28=d(}@f&XXPX{Wqj5fP3B z6*W(8CjEo<*PWSiq&xH0~bmWSUxm-1JqmTJXC6R}6Fs{HMw(;SPz jK2B9hk6i~@ErGog&xkeGDVc2&C`s%8%t3!P?mf#>PN{JrH`N3e%|H8xCQn6SN*v2wo&$ zg)pD4&T<4x#LI#A4B9rHg4`D-4CEYxbOh#DC-88}k6rt{e(#|mk>vuMO|Us@o0u|1 z7_guWxk8H6pdl$rZ4uVf#p_Evn~WFnc<~X>!w4$ozs-*YJ?NOC!> zwN2g5gF+Ez@;7ZqCm5->5bhjiq?n8PSvvAAQ6l8Ku~uPjM>mr9OepfUHi)9lbh@1B z?M4Z&SZob8gI;>J9O1gQS@{nacX?hK*8b-%Pq$gg+T7(r{fX-Vr0v{BTWNAON6VEU zUC&qhIoOCx9KV> L=UMJ4ZU^}VdaMbW literal 1628 zcmbu9&2H0B5QWbgiFdeaH?W|UV2h9t1gR3u1|&8}m21bbk?RCIX(pnGtpl+ObV27ji+Q)Lo$(8LTkL99 z`W0(0iQLCo5_O>;c%)HlX%WA2-p*KU)f13vZFE;#SdGB{W7ulY%w>HbN*(d^dPhi! zy9T){JtAL%&m3tL8EIgo;Jo*-Wgc_e;~VIwdZX960Otgjr+oSOk@xxCNx*Xaw_$n$ zBf~mebwi$tZoi^BcgXy=RJA61&UcQ*0%WeiI5MOgEJEx{5)n1XedW7o-|l!C>AO4T z9@=`|RxsL4%YN${@DvfnemhT{`|S=tp1Y06%}4^`$Lx;i)rr2-kuzq`Q+J8vDq5cI z>?MrO1|2<)%ng|zk73?@>uM%r{h$8H0sdEHt*D^{$?pUFGmyJ-N2m_)PvGxx@2&$m z{PnkKjC=2zYijgl*L2#l@1bu)dEdV--u_r!y(JNDpUCS8S(3}QK8>^JsdNp#>GLPO zmw0cs({Sf@dt(f#XZa_bdi#2lCgjTEbPhMpm}kzexOlLe#w-gEIJ!L=e8w302XnUz AfB*mh diff --git a/src/CommonLib/targetver.h b/src/CommonLib/targetver.h index 567cd346efccbe2d1f43a4056bdcb58a2b93e1a8..617620b37267acaa10b2cb1aca6c7f506d4b2385 100644 GIT binary patch literal 312 zcmZXQyK2Kg5Jh`~|KWmLV?)vgS89yGjYC|9k#?jVSnVwPu*u&?T3e7uGsVE%bM9s#O5FF)R z0j6uQk5!Za(W1nH&r)ru2P@Z rKw|rhjR3 literal 630 zcmaiyOKZYV5QWcL=zj>fEfw0WxN;+co0fK2Vs4B9U*sm0{`t1wOo&Foy0~*EXI^K{ z&F{}p2USW{Xp2p>*G`#oJ!s%(q!H-M(Ty4fmG}kNtEQTB%)V1m=}BwwfWPvrT#@e@ zH0NG}74Ao{glS)#QXA|NYdIfY7hrMp+Ji@H`t9kzWx_SD6;~Ri;cvXH)6CO{-I1p_IJPQ#X=r zigZeSqQguJz35q;zt9^Q_C^^>*mmuXUCp&pw^fPoGX+dho4RCrySs7j@9_UipWkA5 OQDt4mH~x-^Z~X_?9czaG diff --git a/src/RequestHandler/RequestHandler.vcxproj b/src/RequestHandler/RequestHandler.vcxproj index 68424230df..d3ffaac1cc 100644 --- a/src/RequestHandler/RequestHandler.vcxproj +++ b/src/RequestHandler/RequestHandler.vcxproj @@ -75,22 +75,22 @@ true aspnetcorerh - $(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform) + $(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\ true aspnetcorerh - $(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform) + $(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\ false aspnetcorerh - $(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform) + $(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\ false aspnetcorerh - $(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform) + $(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\ diff --git a/src/RequestHandler/Resource.rc b/src/RequestHandler/Resource.rc index 0241f12cce13bee9be7e89ef038c380c39e9cf45..caf820af68d69e5d579d959011008f9d66e1cf4d 100644 GIT binary patch literal 2181 zcmcIlU2md56n!V*Kis7+HEk5F*`$vMBTI^493XAdgs?Iy2_4)4x7(yYerI4rNI!NT zEDy%HA7}2p=WrQ~V3Dm^Q5KsDqO3e5Iha>huqBkRq#`LWQWgicCQzN)@1!>EUlj2f%1WTHjOWs2Ozr5vvLQQ zAki=c6}ryASlKc1!hx!|hG&O{ zjo|hg#uBO5q~k^Y9kRZlGXdG9wP9aX#$6+Ts?3n>c&Y;Y>FD-R=gLJMuS``YpQW5c zueIvX9@!)1`88%2>E<(}kCHA3O*sMl;T^RvOFKDEPdDH{2tBiKzlyx5*%n9QA{<9( zg&p6E9dGV~Jc$3QGIv}g4KUAg(&jE#z7?9m(YItpdRSMjTjb4M!^R5(-+}(;X5-d! z7b1-_TClNOOF6*zN! z^A0pzv5am-6As-JTt$7iKGkpa=}#d~>4*$BM4*|)(>|duUh+h=YtY&a&I4tHz_duS zviTYoQI3Pbz{{bB0x%0kV8Q2;6IhX72U1q>BcW+dSRX@9kLPzr&C6~ta%e>uP4Z(c zNx7$_T62818>V@Ff^*3>$<1Q_!m{nI5*4)vxHJba(Z}CU(LRsLIIg&s%055FmRui; zc&E)1a$gs`j=rI8uHFXqk7O!J*jt+9tOJ(NGEb^z&O!`g1x|EbZWXy&YO(eAe*0pd f`85^an16r#ZraT+KYn5Xp1G3VzM@6-?o#^;RY4=q literal 4360 zcmdUyS#Q%o5Xa{kiSJ<27b;Mj9zyD4(~GKU5;ccFs#KL6B~nO34i1UW4*dSR*~E^W z0D*@f%U&R<)IO^{cDLN#T#A3k-dk?z?oV(H(a=R> zAL(JQv}`$<9j8M$j;&%xKq>MbunO)Jf zBfG#Fi~i_fpGW(^`NvpCcBpacH#{#n^$F*cJ5;ue%H9H|<(^cWH$Zd+_vwF^)7jY?e5+CS9u~>o8L^@r1x|nAa$Yl0b!FGvTgy*t zt~}vwCN5Qo^|WMF`kbX}N6v1kLAOMwulaMF%P<|Rjp zll_)U_%|84S@kE5MyJ;ur)}1IKo>^!Jn`Nl&^79A&>!6KJfmh+T|ZG`F2A2sYs4L2 z33PFuv#ZEzaz_NcOO0+rU({PcN0~gVQ&DRvzKZ+8x9Fjo)bTWT(07hj)zB&(&N0s` zQ0DE69T3k&cP3?NXZB50f9)`~-0E<8vTPj5*z@`W z#^jo}w)~!yB#Wyn88Yf$W6>`6U>dO2W><5He@IWW1O6UYmX(U^esI!s;sMr{pC8~F z&+MIEQI~Y$x|V(Xxo593WtXS26gR>fPODkmpX=aG=Jlc_e$Sg(_DIT2`o;Tf)sDI6 z=DorEEtyjdtT3F}WK}jLqo4+t@?wNV)tAQOSryCYn(qSToxH0ca}@J8MVM}1*;e)Y x=`Z$XeV^iJbRx~e__u$4>Y-Nu`2{=1QEb+`_p<(fvpTdsnXg)w{?AMM{U`Y~CA9zm diff --git a/src/RequestHandler/Source.cpp b/src/RequestHandler/Source.cpp deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj b/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj index 924806ae08..882330ad6f 100644 --- a/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj +++ b/test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj @@ -28,7 +28,7 @@ - + diff --git a/test/AspNetCoreModule.Test/Framework/TestUtility.cs b/test/AspNetCoreModule.Test/Framework/TestUtility.cs index 8238933fa7..dd2bd67c5b 100644 --- a/test/AspNetCoreModule.Test/Framework/TestUtility.cs +++ b/test/AspNetCoreModule.Test/Framework/TestUtility.cs @@ -13,12 +13,12 @@ using Microsoft.Extensions.Logging; using System.Collections.Generic; using System.Security.Principal; using System.Security.AccessControl; +using System.Management.Automation.Runspaces; using System.Net.Http; using System.Threading.Tasks; using System.Net; using System.Collections.ObjectModel; using System.Management.Automation; -using System.Management.Automation.Runspaces; namespace AspNetCoreModule.Test.Framework { @@ -963,4 +963,4 @@ namespace AspNetCoreModule.Test.Framework return uri.DnsSafeHost; } } -} \ 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 index 3cac8887c4..ef1ceb86c1 100644 --- a/test/AspNetCoreModule.TestSites.Standard/AspNetCoreModule.TestSites.Standard.csproj +++ b/test/AspNetCoreModule.TestSites.Standard/AspNetCoreModule.TestSites.Standard.csproj @@ -3,6 +3,6 @@ netcoreapp2.0 - +