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 3a6973bab1..bca79c6a18 100644 Binary files a/src/AspNetCore/aspnetcoremodule.rc and b/src/AspNetCore/aspnetcoremodule.rc differ diff --git a/src/AspNetCore/resource.h b/src/AspNetCore/resource.h index 86bcb80dc4..f31973012a 100644 Binary files a/src/AspNetCore/resource.h and b/src/AspNetCore/resource.h differ diff --git a/src/CommonLib/stdafx.cpp b/src/CommonLib/stdafx.cpp index 18b5b37fe1..6850f4cb6e 100644 Binary files a/src/CommonLib/stdafx.cpp and b/src/CommonLib/stdafx.cpp differ diff --git a/src/CommonLib/stdafx.h b/src/CommonLib/stdafx.h index 89eb66cdc4..5b40fe3fbc 100644 Binary files a/src/CommonLib/stdafx.h and b/src/CommonLib/stdafx.h differ diff --git a/src/CommonLib/targetver.h b/src/CommonLib/targetver.h index 567cd346ef..617620b372 100644 Binary files a/src/CommonLib/targetver.h and b/src/CommonLib/targetver.h differ 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 0241f12cce..caf820af68 100644 Binary files a/src/RequestHandler/Resource.rc and b/src/RequestHandler/Resource.rc differ 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 - +