diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index c3487a06fe7c..a2f1d77683d5 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -11,7 +11,7 @@ DynamicLibrary - + _USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions) @@ -24,13 +24,11 @@ ..\Commonlib - NotUsing - diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp index 5a3439c85bc2..cebab9aa06e4 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp @@ -63,7 +63,8 @@ HostFxrResolver::GetHostFxrParameters( if (dotnetExePath.empty()) { // need to find dotnet for get_host_fxr_path when dotnet is launched from the path - if (!equals_ignore_case(expandedProcessPath, L"dotnet.exe")) { + if (!equals_ignore_case(expandedProcessPath, L"dotnet.exe")) + { fs::path expandedProcessPathParent = expandedProcessPath.parent_path(); gotHostFxrPath = TryGetHostFxrPath(hostFxrDllPath, expandedProcessPathParent, applicationPhysicalPath); } @@ -72,7 +73,8 @@ HostFxrResolver::GetHostFxrParameters( LOG_INFOF(L"get_hostfxr_path skipped due to expandedProcessPath being dotnet.exe"); } - if (gotHostFxrPath) { + if (gotHostFxrPath) + { dotnetExePath = GetAbsolutePathToDotnetFromHostfxr(hostFxrDllPath); } else @@ -88,7 +90,8 @@ HostFxrResolver::GetHostFxrParameters( LOG_INFOF(L"Trying get_hostfxr_path with dotnet path as dotnet root"); fs::path dotnetExePathParent = dotnetExePath.parent_path(); gotHostFxrPath = TryGetHostFxrPath(hostFxrDllPath, dotnetExePathParent, applicationPhysicalPath); - if (!gotHostFxrPath) { + if (!gotHostFxrPath) + { throw InvalidOperationException(format(L"get_hostfxr_path failed")); } } @@ -157,7 +160,8 @@ HostFxrResolver::GetHostFxrParameters( } fs::path dotnetExePathParent = dotnetExePath.parent_path(); - if (!TryGetHostFxrPath(hostFxrDllPath, dotnetExePathParent, applicationPhysicalPath)) { + if (!TryGetHostFxrPath(hostFxrDllPath, dotnetExePathParent, applicationPhysicalPath)) + { throw InvalidOperationException(format(L"get_hostfxr_path failed")); } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 84bbd8a0d876..b5fdfb8064c7 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -2,7 +2,8 @@ false - + + Debug Win32 @@ -103,13 +104,15 @@ PreserveNewest - - + NotUsing Disabled - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + ;NDEBUG;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions) + _WIN64;%(PreprocessorDefinitions) + WIN32;%(PreprocessorDefinitions) $(IntDir)$(TargetName).pch stdafx.h EnableFastChecks @@ -122,161 +125,19 @@ true - true - Console - $(ArtifactsObjDir)InProcessRequestHandler\Win32\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) - UseLinkTimeCodeGeneration - - - - - - - - - NotUsing - Disabled - X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - EnableFastChecks - MultiThreaded - Level3 - true - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\;;C:\Github\aspnetcore\.dotnet\packs\Microsoft.NETCore.App.Host.win-x64\7.0.0-alpha.1.21612.5\runtimes\win-x64\native - /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - stdcpp17 - true - - - true - Console - $(ArtifactsObjDir)InProcessRequestHandler\x64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) - UseLinkTimeCodeGeneration - - - - - - - - - NotUsing - Disabled - X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - EnableFastChecks - MultiThreaded - Level3 - true - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\ - /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - stdcpp17 - true - - - true - Console - $(ArtifactsObjDir)InProcessRequestHandler\ARM64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) - UseLinkTimeCodeGeneration - - - - - - - - - NotUsing - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - MultiThreaded - Level3 - true - ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\;$(LibNetHostPath) - /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - stdcpp17 - true - - - true Console /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib /ignore:4099 %(AdditionalOptions) - true - true - $(ArtifactsObjDir)InProcessRequestHandler\Win32\$(Configuration)\;$(LibNetHostPath) + $(ArtifactsObjDir)InProcessRequestHandler\$(Platform)\$(Configuration)\;$(LibNetHostPath) kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;$(LibNetHostPath)\libnethost.lib;%(AdditionalDependencies) UseLinkTimeCodeGeneration - - - - - - - - NotUsing - X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - MultiThreaded - Level3 - true - ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\;$(LibNetHostPath) - /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - stdcpp17 - true - - - true - Console - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib /ignore:4099 %(AdditionalOptions) - true - true - $(ArtifactsObjDir)InProcessRequestHandler\x64\$(Configuration)\;$(LibNetHostPath) - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;$(LibNetHostPath)\libnethost.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) - UseLinkTimeCodeGeneration - - - - - - - - NotUsing - X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h - MultiThreaded - Level3 - true - ProgramDatabase - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\ - /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - stdcpp17 - true - + - true - Console - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib /ignore:4099 %(AdditionalOptions) true true - $(ArtifactsObjDir)InProcessRequestHandler\ARM64\$(Configuration)\; - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) - UseLinkTimeCodeGeneration - - - - + + \ No newline at end of file diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 97fdaa4a2e4d..70918feda3a3 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -8,7 +8,7 @@ DynamicLibrary - + aspnetcorev2_inprocess diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index e10123fa59c0..5b4f89c3a576 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -8,7 +8,7 @@ DynamicLibrary - + aspnetcorev2_outofprocess diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props index edc5ee12e1a5..e167d783b593 100644 --- a/src/Servers/IIS/Directory.Build.props +++ b/src/Servers/IIS/Directory.Build.props @@ -6,7 +6,7 @@ $(Platform) x86 x64 - $(NetCoreTargetingPackRoot)\Microsoft.NETCore.App.Host.win-$(HostArch)\$(LibNetHostAppPackVersion)\runtimes\win-$(HostArch)\native + $(NetCoreTargetingPackRoot)Microsoft.NETCore.App.Host.win-$(HostArch)\$(LibNetHostAppPackVersion)\runtimes\win-$(HostArch)\native v142 diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs index c98460db0b14..5650fa36ddcd 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LoggingTests.cs @@ -29,7 +29,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests; #endif [Collection(PublishedSitesCollection.Name)] -[SkipNonHelix("https://github.com/dotnet/aspnetcore/issues/25107")] public class LoggingTests : IISFunctionalTestBase { public LoggingTests(PublishedSitesFixture fixture) : base(fixture) diff --git a/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs index b2599611d70c..eacb178f601a 100644 --- a/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs +++ b/src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs @@ -209,6 +209,7 @@ public async Task StartsWithPortableAndBootstraperExe() // We need the right dotnet on the path in IIS deploymentParameters.EnvironmentVariables["PATH"] = Path.GetDirectoryName(DotNetCommands.GetDotNetExecutable(deploymentParameters.RuntimeArchitecture)); + // ReferenceTestTasks is workaround for https://github.com/dotnet/sdk/issues/2482 var deploymentResult = await DeployAsync(deploymentParameters); Assert.True(File.Exists(Path.Combine(deploymentResult.ContentRoot, "InProcessWebSite.exe"))); diff --git a/src/Servers/IIS/IIS/test/FunctionalTest.props b/src/Servers/IIS/IIS/test/FunctionalTest.props index d39d31098ae6..82be004c70dd 100644 --- a/src/Servers/IIS/IIS/test/FunctionalTest.props +++ b/src/Servers/IIS/IIS/test/FunctionalTest.props @@ -1,4 +1,5 @@ + @@ -16,15 +17,18 @@ BuildInParallel="True"> + + + - + <_FilesToCopy Include="%(PublishedTestAsset.Path)\**\*"> $(PublishDir)\%(PublishedTestAsset.Identity)\ - + + - + + \ No newline at end of file diff --git a/src/Servers/IIS/IIS/test/testassets/Directory.Build.targets b/src/Servers/IIS/IIS/test/testassets/Directory.Build.targets index 045983437fdf..d1c86dc48f4b 100644 --- a/src/Servers/IIS/IIS/test/testassets/Directory.Build.targets +++ b/src/Servers/IIS/IIS/test/testassets/Directory.Build.targets @@ -41,7 +41,7 @@ + Properties="PublishDir=$(PublishDir);TestAssetProfile=%(TestAssetPublishProfile.Identity);ReferenceTestTasks=false;%(TestAssetPublishProfile.Properties)"> diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index fc765d46f863..267860b5d1da 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -11,11 +11,7 @@ - - - + @@ -63,13 +59,4 @@ - - - - - diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj index 2f207433c596..cb6d6071a056 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -1,4 +1,5 @@ + @@ -8,11 +9,7 @@ - - - + @@ -35,12 +32,4 @@ - - - - diff --git a/src/Servers/IIS/build/Build.Common.Settings b/src/Servers/IIS/build/Build.Common.Settings index 193e5bc5ebeb..c2fd4ce192af 100644 --- a/src/Servers/IIS/build/Build.Common.Settings +++ b/src/Servers/IIS/build/Build.Common.Settings @@ -1,76 +1,90 @@ - - - - Debug - Win32 - - - Debug - x64 - - - Debug - ARM64 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - Release - ARM64 - - - Release - x64 - - + - - <_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000)) - <_ThreeDigitDayOfYear>$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, '0')) - $(_TwoDigitYear)$(_ThreeDigitDayOfYear) - + + + + <_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000)) + <_ThreeDigitDayOfYear>$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, '0')) + $(_TwoDigitYear)$(_ThreeDigitDayOfYear) + - Debug - 15.0 - 14.29.30133 - Win32Proj - Win32 - v142 - $(PlatformToolsetVersion) - 10.0.18362.0 - Unicode + $(MSBuildThisFileDirectory)..\ + Debug + 15.0 + 14.29.30133 + Win32Proj + x64 + v142 + $(PlatformToolsetVersion) + 10.0.18362.0 + Unicode - - false - false - + + + false + false + - - false - true - + + false + true + - + - - - + + + - - - + + + + + + Use + stdafx.h + $(IntDir)$(TargetName).pch + stdafx.h + true + Level4 + MultiThreaded + false + true + stdcpp17 + CompileAsCpp + + + + /ignore:4099 %(AdditionalOptions) + Windows + + + + + + Disabled + ProgramDatabase + + + true + + + + + + MaxSpeed + true + true + + + false + true + true + + + diff --git a/src/Servers/IIS/build/Build.Dll.Settings b/src/Servers/IIS/build/Build.Dll.Settings new file mode 100644 index 000000000000..70bfd9bbd3ff --- /dev/null +++ b/src/Servers/IIS/build/Build.Dll.Settings @@ -0,0 +1,64 @@ + + + + + aspnetcore + DynamicLibrary + + + + + + + true + false + Guard + SyncCThrow + 8Bytes + false + true + true + + + $(LibNetHostPath) + $(OutDir)$(TargetName).pdb + $(OutDir)$(TargetName).pub.pdb + true + true + Source.def + UseLinkTimeCodeGeneration + + + + + + + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + + + + + _WIN64;NDEBUG;%(PreprocessorDefinitions) + + + + + + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + true + + + + + + _WIN64;NDEBUG;%(PreprocessorDefinitions) + + + true + + + diff --git a/src/Servers/IIS/build/Build.Lib.Settings b/src/Servers/IIS/build/Build.Lib.Settings index 6eef1d630062..0dcba8c2011a 100644 --- a/src/Servers/IIS/build/Build.Lib.Settings +++ b/src/Servers/IIS/build/Build.Lib.Settings @@ -1,60 +1,17 @@ - + + StaticLibrary - - true - - - false - - - Use - Level4 - true false _LIB;%(PreprocessorDefinitions) - $(IntDir)$(TargetName).pch - stdafx.h true - MultiThreaded - false - true - stdcpp17 - stdafx.h - - - Windows - true - - - - - - Disabled - _LIB;%(PreprocessorDefinitions) - ProgramDatabase - - - - MaxSpeed - true - true - _LIB;%(PreprocessorDefinitions) - - - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - - - - + diff --git a/src/Servers/IIS/build/Build.Settings b/src/Servers/IIS/build/Build.Settings deleted file mode 100644 index 0368a4916903..000000000000 --- a/src/Servers/IIS/build/Build.Settings +++ /dev/null @@ -1,99 +0,0 @@ - - - - $(MSBuildThisFileDirectory)..\ - Win32Proj - aspnetcore - - - - - - - Use - Level4 - true - true - Guard - stdafx.h - $(IntDir)$(TargetName).pch - false - SyncCThrow - 8Bytes - false - true - MultiThreaded - true - CompileAsCpp - stdcpp17 - stdafx.h - true - - - Windows - /ignore:4099 %(AdditionalOptions) - $(LibNetHostPath) - $(OutDir)$(TargetName).pdb - $(OutDir)$(TargetName).pub.pdb - true - true - Source.def - UseLinkTimeCodeGeneration - - - - - - ProgramDatabase - Disabled - - - true - - - - - - MaxSpeed - true - true - - - false - true - - - - - - - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - - - - - - - _WIN64;NDEBUG;%(PreprocessorDefinitions) - - - - - - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - - - true - - - - - - _WIN64;NDEBUG;%(PreprocessorDefinitions) - - - true - - - -