From 3c3561aa709416561aeb093b1c4654aafdd5192a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 7 May 2019 16:00:57 -0700 Subject: [PATCH 01/18] Move obj and bin directories into repo root --- .../pipelines/tools/SetupTestEnvironment.ps1 | 2 +- .gitignore | 60 +++--- Directory.Build.props | 5 +- build/repo.props | 2 +- docs/BuildErrors.md | 7 + eng/scripts/CodeCheck.ps1 | 36 +++- eng/targets/Cpp.Common.props | 3 +- .../XplatPackageSigner.proj | 1 - ...hentication.AzureAD.FunctionalTests.csproj | 4 +- src/Components/Blazor/Templates/.gitignore | 2 +- src/Components/Components.sln | 2 +- src/Components/Directory.Build.props | 7 +- ...soft.AspNetCore.Components.E2ETests.csproj | 2 +- ...er.csproj => Components.TestServer.csproj} | 0 src/DefaultBuilder/DefaultBuilder.sln | 2 +- ...csproj => DefaultBuilder.SampleApp.csproj} | 0 src/Framework/Directory.Build.props | 4 - .../ref/Microsoft.AspNetCore.App.Ref.csproj | 7 - .../Microsoft.AspNetCore.App.Runtime.csproj | 6 - src/Http/HttpAbstractions.sln | 2 +- ...proj => HttpAbstractions.SampleApp.csproj} | 0 ...AspNetCore.Identity.FunctionalTests.csproj | 10 +- src/Installers/Debian/Directory.Build.props | 6 +- src/Installers/Rpm/Directory.Build.props | 5 - src/Installers/Windows/.gitignore | 1 - .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 4 +- .../CustomAction/aspnetcoreCA.vcxproj | 4 +- .../IIS-Setup/IIS-Common/Common.sln | 2 +- ...Lib.vcxproj => IISSetup.CommonLib.vcxproj} | 0 .../IIS-Setup/IIS-Setup.sln | 2 +- .../IIS-Setup/iisca/lib/iisca.vcxproj | 2 +- .../build/copy-outputs.targets | 18 -- src/Installers/Windows/Directory.Build.props | 5 - src/Installers/Windows/Installers.sln | 2 +- src/Installers/Windows/UpgradeLog.htm | Bin 45142 -> 0 bytes ...sts.csproj => CORS.FunctionalTests.csproj} | 0 ...mproj => CORS.Npm.FunctionalTests.npmproj} | 0 src/Middleware/Middleware.sln | 4 +- .../samples/NodeServicesExamples/.gitignore | 2 - src/Middleware/NodeServices/src/.gitignore | 3 - src/Middleware/SpaServices/src/.gitignore | 2 - ...er.csproj => WebSockets.TestServer.csproj} | 0 src/Mvc/Mvc.sln | 2 +- ...soft.AspNetCore.Mvc.FunctionalTests.csproj | 2 +- ...bSite.csproj => Mvc.RoutingWebSite.csproj} | 0 .../test/ProjectTemplates.Tests.csproj | 2 +- .../AuthSamples.FunctionalTests.csproj | 23 +-- src/Servers/IIS/.gitignore | 57 ------ .../AspNetCore/AspNetCore.vcxproj | 6 +- .../CommonLib/CommonLib.vcxproj | 7 +- .../CommonLibTests/CommonLibTests.vcxproj | 22 +-- .../AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 14 +- .../RequestHandlerLib.vcxproj | 7 +- .../AspNetCoreModuleV2/gtest/gtest.vcxproj | 6 +- src/Servers/IIS/Directory.Build.props | 10 - .../IIS.Performance/IIS.Performance.csproj | 8 +- ...rwardsCompatibility.FunctionalTests.csproj | 2 +- ... => InProcessForwardsCompatWebSite.csproj} | 0 src/Servers/IIS/IISIntegration.sln | 11 -- src/Servers/IIS/build/Build.Settings | 2 - src/Servers/IIS/build/assets.props | 181 ++++++++++-------- src/Servers/IIS/build/native.targets | 29 ++- src/Servers/IIS/build/testsite.props | 2 +- .../IIS/tools/GenerateNativeAssets.ps1 | 11 +- src/Servers/Kestrel.sln | 2 +- ...pleApp.csproj => Kestrel.SampleApp.csproj} | 0 src/SignalR/SignalR.sln | 2 +- src/SignalR/clients/java/signalr/.gitignore | 3 +- ....javaproj => signalr.client.java.javaproj} | 0 .../SignalR.Client.FunctionalTests.csproj | 78 ++++++++ src/SiteExtensions/Directory.Build.props | 7 - src/Tools/Directory.Build.props | 1 - src/submodules/Directory.Build.props | 2 + src/submodules/Directory.Build.targets | 2 + 74 files changed, 336 insertions(+), 391 deletions(-) rename src/Components/test/testassets/TestServer/{TestServer.csproj => Components.TestServer.csproj} (100%) rename src/DefaultBuilder/samples/SampleApp/{SampleApp.csproj => DefaultBuilder.SampleApp.csproj} (100%) rename src/Http/samples/SampleApp/{SampleApp.csproj => HttpAbstractions.SampleApp.csproj} (100%) delete mode 100644 src/Installers/Windows/.gitignore rename src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/{CommonLib.vcxproj => IISSetup.CommonLib.vcxproj} (100%) delete mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/build/copy-outputs.targets delete mode 100644 src/Installers/Windows/UpgradeLog.htm rename src/Middleware/CORS/test/FunctionalTests/{FunctionalTests.csproj => CORS.FunctionalTests.csproj} (100%) rename src/Middleware/CORS/test/FunctionalTests/{CORS.FunctionalTests.npmproj => CORS.Npm.FunctionalTests.npmproj} (100%) delete mode 100644 src/Middleware/NodeServices/samples/NodeServicesExamples/.gitignore delete mode 100644 src/Middleware/NodeServices/src/.gitignore delete mode 100644 src/Middleware/SpaServices/src/.gitignore rename src/Middleware/WebSockets/samples/TestServer/{TestServer.csproj => WebSockets.TestServer.csproj} (100%) rename src/Mvc/test/WebSites/RoutingWebSite/{RoutingWebSite.csproj => Mvc.RoutingWebSite.csproj} (100%) delete mode 100644 src/Servers/IIS/Directory.Build.props rename src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/{InProcessWebSite.csproj => InProcessForwardsCompatWebSite.csproj} (100%) rename src/Servers/Kestrel/samples/SampleApp/{SampleApp.csproj => Kestrel.SampleApp.csproj} (100%) rename src/SignalR/clients/java/signalr/{signalr.javaproj => signalr.client.java.javaproj} (100%) create mode 100644 src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTests.csproj delete mode 100644 src/SiteExtensions/Directory.Build.props create mode 100644 src/submodules/Directory.Build.props create mode 100644 src/submodules/Directory.Build.targets diff --git a/.azure/pipelines/tools/SetupTestEnvironment.ps1 b/.azure/pipelines/tools/SetupTestEnvironment.ps1 index e92b76304b5c..0c64ea670a93 100644 --- a/.azure/pipelines/tools/SetupTestEnvironment.ps1 +++ b/.azure/pipelines/tools/SetupTestEnvironment.ps1 @@ -83,7 +83,7 @@ function Shutdown-Dumps() New-ItemProperty $werHive -Name "DontShowUI" -Value 0 -PropertyType "DWORD" -Force; - $cdb = "c:\Program Files (x86)\Windows Kits\10\Debuggers\x64\cdb.exe" + $cdb = "${env:ProgramFiles(x86)}\Windows Kits\10\Debuggers\x64\cdb.exe" if (!(Test-Path $cdb)) { $downloadedFile = [System.IO.Path]::GetTempFileName(); diff --git a/.gitignore b/.gitignore index 789031bf5238..8a2385174b34 100644 --- a/.gitignore +++ b/.gitignore @@ -1,38 +1,42 @@ +# Folders +artifacts/ bin/ obj/ +.dotnet/ +.nuget/ +.packages/ +.tools/ .vs/ .vscode/ -*.suo -*.user -_ReSharper.* -*.DS_Store -*.userprefs -*.pidb -*.vspx -*.psess -*.binlog -*.log -artifacts/ -StyleCop.Cache node_modules/ -*.snk -.nuget -.packages/ -.r -.w -.deps -msbuild.ProjectImports.zip -.env -scripts/tmp/ -.dotnet/ -.tools/ -src/**/global.json -launchSettings.json BenchmarkDotNet.Artifacts/ -korebuild-lock.txt .gradle/ src/SignalR/clients/**/dist/ modules/ -# Template config files for blazor templates is generated on-build -src/Components/**/.template.config/ +# File extensions +*.aps +*.binlog +*.dll +*.DS_Store +*.exe +*.idb +*.lib +*.log +*.pch +*.pdb +*.pidb +*.psess +*.res +*.snk +*.suo +*.tlog +*.user +*.userprefs +*.vspx + +# Specific files, typically generated by tools +launchSettings.json +msbuild.ProjectImports.zip +StyleCop.Cache +UpgradeLog.htm diff --git a/Directory.Build.props b/Directory.Build.props index da12b272ad8c..67825f296aa9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -55,6 +55,8 @@ $(WarningsNotAsErrors);CS1591 $(WarningsNotAsErrors);xUnit1004 + + false @@ -144,13 +146,14 @@ - + $(MSBuildProjectName) $([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)$(OutDirName)\')) $(BaseOutputPath)$(Configuration)\ $(BaseOutputPath)$(PlatformName)\$(Configuration)\ + $([System.IO.Path]::GetFullPath('$(ArtifactsObjDir)$(OutDirName)\')) $(BaseIntermediateOutputPath)$(Configuration)\ $(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\ diff --git a/build/repo.props b/build/repo.props index 53ad94228896..1958337a8b56 100644 --- a/build/repo.props +++ b/build/repo.props @@ -42,7 +42,7 @@ diff --git a/docs/BuildErrors.md b/docs/BuildErrors.md index be5f94a56082..36c206f84c56 100644 --- a/docs/BuildErrors.md +++ b/docs/BuildErrors.md @@ -15,3 +15,10 @@ in a previous release of this assembly. See <./ReferenceResolution.md> for how t > error BUILD002: Package references changed since the last release... Similar to BUILD001, but this error is not suppressable. This error only appears in servicing builds, which should not change references between assemblies or packages. + +### Error BUILD003 + +> error BUILD003: Multiple project files named 'Banana.csproj' exist. Project files should have a unique name to avoid conflicts in build output. + +This repo uses a common output directory (artifacts/bin/$ProjectName and artifacts/obj/ProjectName). To avoid confllicts in build output, each +project file should have a unique name. diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 05902d24b66e..bd79f36f9377 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -19,17 +19,25 @@ function LogError { param( [Parameter(Mandatory = $true, Position = 0)] [string]$message, - [string]$FilePath + [string]$FilePath, + [string]$Code ) if ($env:TF_BUILD) { $prefix = "##vso[task.logissue type=error" if ($FilePath) { $prefix = "${prefix};sourcepath=$FilePath" } + if ($Code) { + $prefix = "${prefix};code=$Code" + } Write-Host "${prefix}]${message}" } - Write-Host -f Red "error: $message" - $script:errors += $message + $fullMessage = "error ${Code}: $message" + if ($FilePath) { + $fullMessage += " [$FilePath]" + } + Write-Host -f Red $fullMessage + $script:errors += $fullMessage } try { @@ -38,6 +46,26 @@ try { & $repoRoot/build.ps1 -ci -norestore /t:InstallDotNet } + # + # Duplicate .csproj files can cause issues with a shared build output folder + # + + $projectFileNames = New-Object 'System.Collections.Generic.HashSet[string]' + + # Ignore duplicates in submodules. These should be isolated from the rest of the build. + # Ignore duplicates in the .ref folder. This is expected. + Get-ChildItem -Recurse "$repoRoot/src/*.*proj" ` + | ? { $_.FullName -notmatch 'submodules' } ` + | ? { (Split-Path -Leaf (Split-Path -Parent $_)) -ne 'ref' } ` + | % { + $fileName = [io.path]::GetFileNameWithoutExtension($_) + if ($projectFileNames.Contains($fileName)) { + LogError -code 'BUILD003' -filepath $_ ` + "Multiple project files named '$fileName' exist. Project files should have a unique name to avoid conflicts in build output." + } + $projectFileNames.Add($fileName) | Out-Null + } + # # Versions.props and Version.Details.xml # @@ -171,7 +199,7 @@ finally { Write-Host "" foreach ($err in $errors) { - Write-Host -f Red "error : $err" + Write-Host -f Red $err } if ($errors) { diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props index ace69ddd2c8f..b76e5ac164b7 100644 --- a/eng/targets/Cpp.Common.props +++ b/eng/targets/Cpp.Common.props @@ -4,7 +4,8 @@ true false - $(PlatformName)\$(Configuration)\ + $(OutputPath) + $(IntermediateOutputPath) diff --git a/eng/tools/XplatPackageSigner/XplatPackageSigner.proj b/eng/tools/XplatPackageSigner/XplatPackageSigner.proj index 2d392b5576a2..493b463c481d 100644 --- a/eng/tools/XplatPackageSigner/XplatPackageSigner.proj +++ b/eng/tools/XplatPackageSigner/XplatPackageSigner.proj @@ -8,7 +8,6 @@ $([MSBuild]::ValueOrDefault($(SignType),'real')) - true diff --git a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj index 29d5492b14ff..a1dc024b4a30 100644 --- a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj +++ b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj @@ -19,7 +19,7 @@ - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\testassets\AzureAD.WebSite\bin\$(Configuration)\netcoreapp3.0\AzureAD.WebSite.deps.json" /> + <_PublishFiles Include="$(ArtifactsBinDir)AzureAD.WebSite\$(Configuration)\netcoreapp3.0\AzureAD.WebSite.deps.json" /> - + diff --git a/src/Components/Blazor/Templates/.gitignore b/src/Components/Blazor/Templates/.gitignore index b19c3a09d84e..6216d1eae654 100644 --- a/src/Components/Blazor/Templates/.gitignore +++ b/src/Components/Blazor/Templates/.gitignore @@ -1,3 +1,3 @@ # We only track the .template.config.src items in source control # The .template.config files are generated on build -content/**/.template.config/ \ No newline at end of file +src/content/**/.template.config/ diff --git a/src/Components/Components.sln b/src/Components/Components.sln index ecacc6f7ee94..f6ea985b7f71 100644 --- a/src/Components/Components.sln +++ b/src/Components/Components.sln @@ -71,7 +71,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.Server", "tes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestContentPackage", "test\testassets\TestContentPackage\TestContentPackage.csproj", "{423CCF23-C0B4-4D21-896C-16DC98689DB5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServer", "test\testassets\TestServer\TestServer.csproj", "{D6AEB328-EBC0-40B1-8936-301597883DFA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components.TestServer", "test\testassets\TestServer\Components.TestServer.csproj", "{D6AEB328-EBC0-40B1-8936-301597883DFA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "..\Antiforgery\src\Microsoft.AspNetCore.Antiforgery.csproj", "{6BA2DCAA-CB68-4AE2-BBBE-746A728D30E0}" EndProject diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props index a090fee61f5f..1fde2f43387a 100644 --- a/src/Components/Directory.Build.props +++ b/src/Components/Directory.Build.props @@ -1,9 +1,4 @@ - - - false - - @@ -12,7 +7,7 @@ $(MSBuildThisFileDirectory)Shared\ - $(MSBuildThisFileDirectory)Blazor\Build\src\bin\$(Configuration)\netcoreapp3.0\ + $(ArtifactsBinDir)Microsoft.AspNetCore.Blazor.Build\$(Configuration)\netcoreapp3.0\ diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 24ebd8ebf268..9eccfc3e29ed 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -36,7 +36,7 @@ - + diff --git a/src/Components/test/testassets/TestServer/TestServer.csproj b/src/Components/test/testassets/TestServer/Components.TestServer.csproj similarity index 100% rename from src/Components/test/testassets/TestServer/TestServer.csproj rename to src/Components/test/testassets/TestServer/Components.TestServer.csproj diff --git a/src/DefaultBuilder/DefaultBuilder.sln b/src/DefaultBuilder/DefaultBuilder.sln index 92b547bbedce..4dca79f2fd41 100644 --- a/src/DefaultBuilder/DefaultBuilder.sln +++ b/src/DefaultBuilder/DefaultBuilder.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{C19108F8-667B-4CF9-B227-CDD2290224BC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DefaultBuilder.SampleApp", "samples\SampleApp\DefaultBuilder.SampleApp.csproj", "{C19108F8-667B-4CF9-B227-CDD2290224BC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Tests", "test\Microsoft.AspNetCore.Tests\Microsoft.AspNetCore.Tests.csproj", "{1CD49F15-D381-4C7E-8E12-A85E7753B110}" EndProject diff --git a/src/DefaultBuilder/samples/SampleApp/SampleApp.csproj b/src/DefaultBuilder/samples/SampleApp/DefaultBuilder.SampleApp.csproj similarity index 100% rename from src/DefaultBuilder/samples/SampleApp/SampleApp.csproj rename to src/DefaultBuilder/samples/SampleApp/DefaultBuilder.SampleApp.csproj diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props index 5a05adc758a6..777427982880 100644 --- a/src/Framework/Directory.Build.props +++ b/src/Framework/Directory.Build.props @@ -1,8 +1,4 @@ - - true - - diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index fce60aafbfa9..7a0d9cfe80d9 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -1,11 +1,4 @@ - - - true - - <_DisableRestoreFromLocalPackages>true - - diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index 7af695b6c201..0dfb237ae718 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -1,10 +1,4 @@ - - true - - <_DisableRestoreFromLocalPackages>true - - diff --git a/src/Http/HttpAbstractions.sln b/src/Http/HttpAbstractions.sln index f585ee6c2d26..0bf3b98843dd 100644 --- a/src/Http/HttpAbstractions.sln +++ b/src/Http/HttpAbstractions.sln @@ -51,7 +51,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Owin.T EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{391FBA36-BEEB-411A-A588-3F83901C0C1A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{2378049E-ABE9-4843-AAC7-A6C9E704463D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpAbstractions.SampleApp", "samples\SampleApp\HttpAbstractions.SampleApp.csproj", "{2378049E-ABE9-4843-AAC7-A6C9E704463D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebUtilities", "WebUtilities", "{80A090C8-ED02-4DE3-875A-30DCCDBD84BA}" EndProject diff --git a/src/Http/samples/SampleApp/SampleApp.csproj b/src/Http/samples/SampleApp/HttpAbstractions.SampleApp.csproj similarity index 100% rename from src/Http/samples/SampleApp/SampleApp.csproj rename to src/Http/samples/SampleApp/HttpAbstractions.SampleApp.csproj diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index 0b83c7d39c3c..3230a236b94b 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -26,9 +26,9 @@ - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\UI\src\bin\$(Configuration)\netcoreapp3.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" /> - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\testassets\Identity.DefaultUI.WebSite\bin\$(Configuration)\netcoreapp3.0\Identity.DefaultUI.WebSite.deps.json" /> - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\testassets\Identity.DefaultUI.WebSite\bin\$(Configuration)\netcoreapp3.0\Identity.DefaultUI.WebSite.deps.json" /> + <_PublishFiles Include="$(ArtifactsBinDir)Microsoft.AspNetCore.Identity.UI\$(Configuration)\netcoreapp3.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" /> + <_PublishFiles Include="$(ArtifactsBinDir)Identity.DefaultUI.WebSite\$(Configuration)\netcoreapp3.0\Identity.DefaultUI.WebSite.deps.json" /> + <_PublishFiles Include="$(ArtifactsBinDir)Identity.DefaultUI.WebSite\$(Configuration)\netcoreapp3.0\Identity.DefaultUI.WebSite.deps.json" /> <_wwwrootFiles Include="$(MSBuildThisFileDirectory)..\..\testassets\Identity.DefaultUI.WebSite\wwwroot\**\*.*" /> <_PagesFiles Include="$(MSBuildThisFileDirectory)..\..\testassets\Identity.DefaultUI.WebSite\Pages\**\*.*" /> @@ -46,7 +46,7 @@ File="$(PublishDir)\contentroot.sln" Lines="Ignored" Overwrite="true" - Encoding="Unicode"/> + Encoding="Unicode"/> - + diff --git a/src/Installers/Debian/Directory.Build.props b/src/Installers/Debian/Directory.Build.props index f235d1ee8a65..d967c46c6802 100644 --- a/src/Installers/Debian/Directory.Build.props +++ b/src/Installers/Debian/Directory.Build.props @@ -1,14 +1,10 @@ - - true - true - - + true $(InstallersOutputPath) $(IntermediateOutputPath)$(TargetRuntimeIdentifier)\ diff --git a/src/Installers/Rpm/Directory.Build.props b/src/Installers/Rpm/Directory.Build.props index 072aa6b6b332..d27e528217fb 100644 --- a/src/Installers/Rpm/Directory.Build.props +++ b/src/Installers/Rpm/Directory.Build.props @@ -2,11 +2,6 @@ Common properties for building RPM installers. --> - - - true - - diff --git a/src/Installers/Windows/.gitignore b/src/Installers/Windows/.gitignore deleted file mode 100644 index fe67cac91620..000000000000 --- a/src/Installers/Windows/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ancm/ diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 1186611de327..404f2a3c139e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -57,8 +57,8 @@ Condition=" '$(IsProductInstaller)' == 'true' " AfterTargets="Build"> - - + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index da7c3b16b46b..a900f6d5e0ce 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -84,7 +84,7 @@ {7324770c-0871-4d73-be3d-5e2f3e9e1b1e} - + {b54a8f61-60de-4ad9-87ca-d102f230678e} @@ -95,7 +95,5 @@ - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln index 6cda623e6344..c675584f2059 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/Common.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "lib\CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISSetup.CommonLib", "lib\IISSetup.CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reftrace", "reftrace\reftrace.vcxproj", "{A2599642-CBE5-4230-8511-3DC2D81874BE}" EndProject diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj similarity index 100% rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj rename to src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln index 0b349bffd018..4c1ba6ae0a3c 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Setup.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "iisca\lib\iisca.vcxproj", "{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "IIS-Common\lib\CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISSetup.CommonLib", "IIS-Common\lib\IISSetup.CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj index a75af0850a69..f823e017c869 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj @@ -61,7 +61,7 @@ - + {b54a8f61-60de-4ad9-87ca-d102f230678e} diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/copy-outputs.targets b/src/Installers/Windows/AspNetCoreModule-Setup/build/copy-outputs.targets deleted file mode 100644 index bdc59f4f6d2a..000000000000 --- a/src/Installers/Windows/AspNetCoreModule-Setup/build/copy-outputs.targets +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - $(Configuration)\$(PlatformShortname)\ - - - - - - - \ No newline at end of file diff --git a/src/Installers/Windows/Directory.Build.props b/src/Installers/Windows/Directory.Build.props index 854a4bf55123..69532ea00c1c 100644 --- a/src/Installers/Windows/Directory.Build.props +++ b/src/Installers/Windows/Directory.Build.props @@ -1,9 +1,4 @@ - - - true - - diff --git a/src/Installers/Windows/Installers.sln b/src/Installers/Windows/Installers.sln index 5d55dc1c136b..be17d02053c7 100644 --- a/src/Installers/Windows/Installers.sln +++ b/src/Installers/Windows/Installers.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aspnetcoreCA", "AspNetCoreM EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "AspNetCoreModule-Setup\IIS-Setup\iisca\lib\iisca.vcxproj", "{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "AspNetCoreModule-Setup\IIS-Setup\IIS-Common\lib\CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISSetup.CommonLib", "AspNetCoreModule-Setup\IIS-Setup\IIS-Common\lib\IISSetup.CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "AncmIISExpressV2", "AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj", "{17C76489-4C09-4E14-B81C-7A86CD937144}" EndProject diff --git a/src/Installers/Windows/UpgradeLog.htm b/src/Installers/Windows/UpgradeLog.htm deleted file mode 100644 index f327ebd6ec8c9266607c164392462b8d434be9e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45142 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 - + diff --git a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/src/Mvc/test/WebSites/RoutingWebSite/Mvc.RoutingWebSite.csproj similarity index 100% rename from src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj rename to src/Mvc/test/WebSites/RoutingWebSite/Mvc.RoutingWebSite.csproj diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 3040b847c7ef..51ccdd49ef12 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -57,7 +57,7 @@ - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)$([MSBuild]::EnsureTrailingSlash('$(OutputPath)$(TestTemplateCreationFolder)'))')) + $([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)')) $(TestTemplateCreationFolder)$(TestTemplateTestsProps) $(TestTemplateCreationFolder)\Hives\$([System.Guid]::NewGuid())\.templateengine diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index 1633ad516c77..89ec36a9c618 100644 --- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -26,16 +26,16 @@ - + - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\samples\ClaimsTransformation\bin\$(Configuration)\netcoreapp3.0\ClaimsTransformation.deps.json" /> - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\samples\Cookies\bin\$(Configuration)\netcoreapp3.0\Cookies.deps.json" /> - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\samples\CustomPolicyProvider\bin\$(Configuration)\netcoreapp3.0\CustomPolicyProvider.deps.json" /> - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\samples\DynamicSchemes\bin\$(Configuration)\netcoreapp3.0\DynamicSchemes.deps.json" /> - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\samples\Identity.ExternalClaims\bin\$(Configuration)\netcoreapp3.0\Identity.ExternalClaims.deps.json" /> - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\samples\PathSchemeSelection\bin\$(Configuration)\netcoreapp3.0\PathSchemeSelection.deps.json" /> - <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\samples\StaticFilesAuth\bin\$(Configuration)\netcoreapp3.0\StaticFilesAuth.deps.json" /> + <_PublishFiles Include="$(ArtifactsBinDir)ClaimsTransformation\$(Configuration)\netcoreapp3.0\ClaimsTransformation.deps.json" /> + <_PublishFiles Include="$(ArtifactsBinDir)Cookies\$(Configuration)\netcoreapp3.0\Cookies.deps.json" /> + <_PublishFiles Include="$(ArtifactsBinDir)CustomPolicyProvider\$(Configuration)\netcoreapp3.0\CustomPolicyProvider.deps.json" /> + <_PublishFiles Include="$(ArtifactsBinDir)DynamicSchemes\$(Configuration)\netcoreapp3.0\DynamicSchemes.deps.json" /> + <_PublishFiles Include="$(ArtifactsBinDir)Identity.ExternalClaims\$(Configuration)\netcoreapp3.0\Identity.ExternalClaims.deps.json" /> + <_PublishFiles Include="$(ArtifactsBinDir)PathSchemeSelection\$(Configuration)\netcoreapp3.0\PathSchemeSelection.deps.json" /> + <_PublishFiles Include="$(ArtifactsBinDir)StaticFilesAuth\$(Configuration)\netcoreapp3.0\StaticFilesAuth.deps.json" /> <_claimsWwwrootFiles Include="$(MSBuildThisFileDirectory)..\..\samples\ClaimsTransformation\wwwroot\**\*.*" /> <_cookiesWwwrootFiles Include="$(MSBuildThisFileDirectory)..\..\samples\Cookies\wwwroot\**\*.*" /> <_customProviderFiles Include="$(MSBuildThisFileDirectory)..\..\samples\CustomPolicyProvider\**\*.*" /> @@ -44,9 +44,6 @@ <_pathWwwrootFiles Include="$(MSBuildThisFileDirectory)..\..\samples\PathSchemeSelection\wwwroot\**\*.*" /> <_staticFiles Include="$(MSBuildThisFileDirectory)..\..\samples\StaticFilesAuth\**\*.*" /> - @@ -76,7 +73,7 @@ File="$(PublishDir)\contentroot.sln" Lines="Ignored" Overwrite="true" - Encoding="Unicode"/> + Encoding="Unicode"/> - + diff --git a/src/Servers/IIS/.gitignore b/src/Servers/IIS/.gitignore index 694e8789e79e..7f685c82cbeb 100644 --- a/src/Servers/IIS/.gitignore +++ b/src/Servers/IIS/.gitignore @@ -1,61 +1,4 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -BenchmarkDotNet.Artifacts/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -project.lock.json -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.vscode/ -*.nuget.props -*.nuget.targets -*.bin -*.vs/ -.testPublish/ -*.obj -*.tlog -*.CppClean.log -*msbuild.log -gtest.log -Debug/ -x64/Debug/ -Release/ -x64/Release/ -x64/ -*vcxproj.filters -*.aps -*.pdb -*.lib -*.idb -*.res -*.pch aspnetcoremodule.h aspnetcore_msg.h aspnetcore_msg.rc version.h -test/*/Debug -test/*/Release -.build -*.VC.*db -global.json -msbuild.binlog \ No newline at end of file diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index d90ff5f7bf7e..d53a438f036d 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -26,6 +26,7 @@ aspnetcorev2 false 10.0.17134.0 + AspNetCoreModuleShim @@ -74,9 +75,6 @@ - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - Level4 @@ -316,4 +314,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 9fd8d246712d..fc02995961af 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -75,20 +75,15 @@ true - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ true - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false - C:\AspNetCoreModule\src\IISLib;$(IncludePath) - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ @@ -282,4 +277,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 3c76ed6b0597..46dd0a68c42c 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -34,18 +34,6 @@ - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - @@ -102,7 +90,7 @@ true Console - ..\InProcessRequestHandler\Win32\$(Configuration)\; + $(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 @@ -129,7 +117,7 @@ true Console - ..\InProcessRequestHandler\x64\$(Configuration)\; + $(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 @@ -158,7 +146,7 @@ /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true true - ..\InProcessRequestHandler\Win32\$(Configuration)\; + $(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 @@ -187,7 +175,7 @@ /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) true true - ..\InProcessRequestHandler\x64\$(Configuration)\; + $(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 @@ -199,4 +187,4 @@ true - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 2afc56dacbc0..75ed7c365077 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -71,18 +71,6 @@ - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - - - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - @@ -206,4 +194,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index 56088b84ad8d..e18327851c74 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -75,20 +75,15 @@ true - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ true - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false - C:\AspNetCoreModule\src\IISLib;$(IncludePath) - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ @@ -224,4 +219,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj index 20bc6451a140..95237b7ec2f3 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj @@ -84,25 +84,21 @@ true $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_SourcePath); - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ true $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_SourcePath); - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_SourcePath); - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ false $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_SourcePath); - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ @@ -183,4 +179,4 @@ - \ No newline at end of file + diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props deleted file mode 100644 index f4bd362993a5..000000000000 --- a/src/Servers/IIS/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj index 973614b639cf..d36371de700b 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -16,10 +16,10 @@ - - - - + + + + diff --git a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj index 2ae2fe539b90..f98d98f6a908 100644 --- a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj @@ -14,7 +14,7 @@ - + False diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj similarity index 100% rename from src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj rename to src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj diff --git a/src/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln index 3c2bbdac1d98..b108c8842035 100644 --- a/src/Servers/IIS/IISIntegration.sln +++ b/src/Servers/IIS/IISIntegration.sln @@ -3,14 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.0.0 MinimumVisualStudioVersion = 16.0.0.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - NuGet.Config = NuGet.Config - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{8B3446E8-E6A8-4591-AA63-A95837C6E97C}" ProjectSection(ProjectDependencies) = postProject {46A8612B-418B-4D70-B3A7-A21DD0627473} = {46A8612B-418B-4D70-B3A7-A21DD0627473} @@ -23,11 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E build\assets.props = build\assets.props build\Build.Settings = build\Build.Settings build\Config.Definitions.Props = build\Config.Definitions.Props - build\Key.snk = build\Key.snk build\launchSettings.json = build\launchSettings.json build\native.targets = build\native.targets - build\repo.props = build\repo.props - build\repo.targets = build\repo.targets build\testsite.props = build\testsite.props EndProjectSection EndProject diff --git a/src/Servers/IIS/build/Build.Settings b/src/Servers/IIS/build/Build.Settings index 0097cb4352bb..6d722c02e61f 100644 --- a/src/Servers/IIS/build/Build.Settings +++ b/src/Servers/IIS/build/Build.Settings @@ -5,8 +5,6 @@ Debug Win32 v142 - $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ - $(OutputPath) aspnetcore diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props index e6c366f29515..f6a7360235ad 100644 --- a/src/Servers/IIS/build/assets.props +++ b/src/Servers/IIS/build/assets.props @@ -9,200 +9,215 @@ - $(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2.dll - $(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_inprocess.dll - $(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\$(NativeVCPlatform)\aspnetcorev2_outofprocess.dll + $(ArtifactsBinDir)AspNetCoreModuleShim\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2.dll + $(ArtifactsBinDir)InProcessRequestHandler\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2_inprocess.dll + $(ArtifactsBinDir)OutOfProcessRequestHandler\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2_outofprocess.dll diff --git a/src/Servers/IIS/build/native.targets b/src/Servers/IIS/build/native.targets index e5d8ab982c7a..5dc36ed998be 100644 --- a/src/Servers/IIS/build/native.targets +++ b/src/Servers/IIS/build/native.targets @@ -16,25 +16,24 @@ - - - - - - - - - - - - - + + + +#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreMinorVersion),$(AssemblyBuild),$(AspNetCorePatchVersion) +#define FileVersionStr "$(AspNetCoreModuleVersionMajor).$(AspNetCoreMinorVersion).$(AssemblyBuild).$(AspNetCorePatchVersion)\0" +#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreMinorVersion),$(AssemblyBuild),$(AspNetCorePatchVersion) +#define ProductVersionStr "$(AspNetCoreModuleVersionMajor).$(AspNetCoreMinorVersion).$(AssemblyBuild).$(AspNetCorePatchVersion)\0" +#define PlatformToolset "$(PlatformToolset)\0" +#define CommitHash "$(SourceRevisionId)\0" + ]]> + - + - + diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index 4e6b020b3f40..4a62be59bff3 100644 --- a/src/Servers/IIS/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -50,7 +50,7 @@ - $(MSBuildThisFileDirectory)..\IIS\test\testassets\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks + $(ArtifactsBinDir)TestTasks\$(Configuration)\$(TargetFramework)\TestTasks diff --git a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 index c1fb0637150c..20c28ae8ae2b 100644 --- a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 +++ b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 @@ -14,7 +14,8 @@ $srcDir = "`$(MSBuildThisFileDirectory).."; $projects = @( @{ ProjectDirectory = "$srcDir\AspNetCoreModuleV2\AspNetCore"; - ProjectName = "`AspNetCore.vcxproj"; + ProjectName = "AspNetCore.vcxproj"; + OutDirName = "AspNetCoreModuleShim"; NativeAsset = "aspnetcorev2"; BaseOutputPath = "AspNetCoreModuleV2" PropetyName = "AspNetCoreModuleV2Shim" @@ -22,6 +23,7 @@ $projects = @( @{ ProjectDirectory = "$srcDir\AspNetCoreModuleV2\InProcessRequestHandler"; ProjectName = "InProcessRequestHandler.vcxproj"; + OutDirName = "InProcessRequestHandler"; NativeAsset = "aspnetcorev2_inprocess"; BaseOutputPath = "AspNetCoreModuleV2"; PropetyName = "AspNetCoreModuleV2InProcessHandler" @@ -29,6 +31,7 @@ $projects = @( @{ ProjectDirectory = "$srcDir\AspNetCoreModuleV2\OutOfProcessRequestHandler"; ProjectName = "OutOfProcessRequestHandler.vcxproj"; + OutDirName = "OutOfProcessRequestHandler"; NativeAsset = "aspnetcorev2_outofprocess"; BaseOutputPath = "AspNetCoreModuleV2"; PackageSubPath = "`$(AspNetCoreModuleOutOfProcessVersion)\"; @@ -76,8 +79,8 @@ function New-Component($project, $platform) CopyProperties -from $project -to $component; CopyProperties -from @{ Include = "$($project.ProjectDirectory)\$($project.ProjectName)"; - DllLocation = "$($project.ProjectDirectory)\bin\`$(Configuration)\$($platform.VCPlatform)\$($project.NativeAsset).dll"; - PdbLocation = "$($project.ProjectDirectory)\bin\`$(Configuration)\$($platform.VCPlatform)\$($project.NativeAsset).pdb"; + DllLocation = "`$(ArtifactsBinDir)$($project.OutDirName)\$($platform.VCPlatform)\`$(Configuration)\$($project.NativeAsset).dll"; + PdbLocation = "`$(ArtifactsBinDir)$($project.OutDirName)\$($platform.VCPlatform)\`$(Configuration)\$($project.NativeAsset).pdb"; } -to $component; return $component; @@ -102,7 +105,7 @@ foreach ($project in $projects) $properties += @{ Name = "$($project.PropetyName)Dll"; - Value = "$($project.ProjectDirectory)\bin\`$(Configuration)\`$(NativeVCPlatform)\$($project.NativeAsset).dll"; + Value = "`$(ArtifactsBinDir)$($project.OutDirName)\`$(NativeVCPlatform)\`$(Configuration)\$($project.NativeAsset).dll"; }; $runComponent = New-Component $project $currentPlatform; diff --git a/src/Servers/Kestrel.sln b/src/Servers/Kestrel.sln index e434f397f3df..9a561e27a1a5 100644 --- a/src/Servers/Kestrel.sln +++ b/src/Servers/Kestrel.sln @@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LargeResponseApp", "Kestrel EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlaintextApp", "Kestrel\samples\PlaintextApp\PlaintextApp.csproj", "{0710F560-A741-4139-BC1F-BFF1895F1274}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "Kestrel\samples\SampleApp\SampleApp.csproj", "{F9D090D2-0568-403D-ADBA-9E079397B584}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.SampleApp", "Kestrel\samples\SampleApp\Kestrel.SampleApp.csproj", "{F9D090D2-0568-403D-ADBA-9E079397B584}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SystemdTestApp", "Kestrel\samples\SystemdTestApp\SystemdTestApp.csproj", "{01D031FC-61A5-45BD-BE11-57FA00BE1BCD}" EndProject diff --git a/src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj b/src/Servers/Kestrel/samples/SampleApp/Kestrel.SampleApp.csproj similarity index 100% rename from src/Servers/Kestrel/samples/SampleApp/SampleApp.csproj rename to src/Servers/Kestrel/samples/SampleApp/Kestrel.SampleApp.csproj diff --git a/src/SignalR/SignalR.sln b/src/SignalR/SignalR.sln index 87fd94b3a967..bfe46375f32a 100644 --- a/src/SignalR/SignalR.sln +++ b/src/SignalR/SignalR.sln @@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSocketSample", "samples\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtClientSample", "samples\JwtClientSample\JwtClientSample.csproj", "{1A953296-E869-4DE2-A693-FD5FCDE27057}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "clients\ts\FunctionalTests\FunctionalTests.csproj", "{D0C7B22E-B0B6-4D62-BF7D-79EE4AAF1981}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalR.Client.FunctionalTests", "clients\ts\FunctionalTests\SignalR.Client.FunctionalTests.csproj", "{D0C7B22E-B0B6-4D62-BF7D-79EE4AAF1981}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{3AC35C9A-3344-4BBB-B789-06CEE2CD093E}" EndProject diff --git a/src/SignalR/clients/java/signalr/.gitignore b/src/SignalR/clients/java/signalr/.gitignore index 4a81b0a66252..eabba7738ec1 100644 --- a/src/SignalR/clients/java/signalr/.gitignore +++ b/src/SignalR/clients/java/signalr/.gitignore @@ -2,7 +2,6 @@ .gradletasknamecache .gradle/ build/ -bin/ .settings/ out/ *.class @@ -10,4 +9,4 @@ out/ .project .classpath # We need the gradle-wrapper.jar file so that others can use the gradle wrapper -!gradle/wrapper/gradle-wrapper.jar \ No newline at end of file +!gradle/wrapper/gradle-wrapper.jar diff --git a/src/SignalR/clients/java/signalr/signalr.javaproj b/src/SignalR/clients/java/signalr/signalr.client.java.javaproj similarity index 100% rename from src/SignalR/clients/java/signalr/signalr.javaproj rename to src/SignalR/clients/java/signalr/signalr.client.java.javaproj diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTests.csproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTests.csproj new file mode 100644 index 000000000000..b6aaa7f555ca --- /dev/null +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTests.csproj @@ -0,0 +1,78 @@ + + + + netcoreapp3.0 + True + 2.8 + + + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SiteExtensions/Directory.Build.props b/src/SiteExtensions/Directory.Build.props deleted file mode 100644 index 574418ea3666..000000000000 --- a/src/SiteExtensions/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - true - - - - diff --git a/src/Tools/Directory.Build.props b/src/Tools/Directory.Build.props index 2778f5a4bba0..12132ebe9114 100644 --- a/src/Tools/Directory.Build.props +++ b/src/Tools/Directory.Build.props @@ -1,6 +1,5 @@ - true $(MSBuildThisFileDirectory)Shared\ true diff --git a/src/submodules/Directory.Build.props b/src/submodules/Directory.Build.props new file mode 100644 index 000000000000..634b9cd57379 --- /dev/null +++ b/src/submodules/Directory.Build.props @@ -0,0 +1,2 @@ + + diff --git a/src/submodules/Directory.Build.targets b/src/submodules/Directory.Build.targets new file mode 100644 index 000000000000..634b9cd57379 --- /dev/null +++ b/src/submodules/Directory.Build.targets @@ -0,0 +1,2 @@ + + From 6a12e2a7971981f82ed7f63a989e1d68d2126083 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 7 May 2019 17:34:27 -0700 Subject: [PATCH 02/18] fixup! Move obj and bin directories into repo root --- Directory.Build.props | 1 - docs/BuildErrors.md | 2 +- eng/targets/Cpp.Common.props | 2 + src/Servers/IIS/.gitignore | 1 - .../ts/FunctionalTests/FunctionalTests.csproj | 78 ------------------- 5 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 src/SignalR/clients/ts/FunctionalTests/FunctionalTests.csproj diff --git a/Directory.Build.props b/Directory.Build.props index 67825f296aa9..8478d0d63434 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -153,7 +153,6 @@ $(BaseOutputPath)$(Configuration)\ $(BaseOutputPath)$(PlatformName)\$(Configuration)\ - $([System.IO.Path]::GetFullPath('$(ArtifactsObjDir)$(OutDirName)\')) $(BaseIntermediateOutputPath)$(Configuration)\ $(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\ diff --git a/docs/BuildErrors.md b/docs/BuildErrors.md index 36c206f84c56..52fb8d25de66 100644 --- a/docs/BuildErrors.md +++ b/docs/BuildErrors.md @@ -20,5 +20,5 @@ Similar to BUILD001, but this error is not suppressable. This error only appears > error BUILD003: Multiple project files named 'Banana.csproj' exist. Project files should have a unique name to avoid conflicts in build output. -This repo uses a common output directory (artifacts/bin/$ProjectName and artifacts/obj/ProjectName). To avoid confllicts in build output, each +This repo uses a common output directory (artifacts/bin/$(ProjectName) and artifacts/obj/$(ProjectName)). To avoid confllicts in build output, each project file should have a unique name. diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props index b76e5ac164b7..faa8049b616c 100644 --- a/eng/targets/Cpp.Common.props +++ b/eng/targets/Cpp.Common.props @@ -4,6 +4,8 @@ true false + + $(OutputPath) $(IntermediateOutputPath) diff --git a/src/Servers/IIS/.gitignore b/src/Servers/IIS/.gitignore index 7f685c82cbeb..1336f289f759 100644 --- a/src/Servers/IIS/.gitignore +++ b/src/Servers/IIS/.gitignore @@ -1,4 +1,3 @@ aspnetcoremodule.h aspnetcore_msg.h aspnetcore_msg.rc -version.h diff --git a/src/SignalR/clients/ts/FunctionalTests/FunctionalTests.csproj b/src/SignalR/clients/ts/FunctionalTests/FunctionalTests.csproj deleted file mode 100644 index b6aaa7f555ca..000000000000 --- a/src/SignalR/clients/ts/FunctionalTests/FunctionalTests.csproj +++ /dev/null @@ -1,78 +0,0 @@ - - - - netcoreapp3.0 - True - 2.8 - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From c8a554d8c71c682bda4537a774bde8b636d6f3b4 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 7 May 2019 17:37:35 -0700 Subject: [PATCH 03/18] fixup! Move obj and bin directories into repo root --- src/Servers/IIS/build/native.targets | 27 +++++++++++++------------- src/submodules/Directory.Build.props | 2 +- src/submodules/Directory.Build.targets | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/Servers/IIS/build/native.targets b/src/Servers/IIS/build/native.targets index 5dc36ed998be..2106b8150fb7 100644 --- a/src/Servers/IIS/build/native.targets +++ b/src/Servers/IIS/build/native.targets @@ -16,24 +16,25 @@ - - - -#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreMinorVersion),$(AssemblyBuild),$(AspNetCorePatchVersion) -#define FileVersionStr "$(AspNetCoreModuleVersionMajor).$(AspNetCoreMinorVersion).$(AssemblyBuild).$(AspNetCorePatchVersion)\0" -#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreMinorVersion),$(AssemblyBuild),$(AspNetCorePatchVersion) -#define ProductVersionStr "$(AspNetCoreModuleVersionMajor).$(AspNetCoreMinorVersion).$(AssemblyBuild).$(AspNetCorePatchVersion)\0" -#define PlatformToolset "$(PlatformToolset)\0" -#define CommitHash "$(SourceRevisionId)\0" - ]]> - + + + + + + + + + + + + + - + diff --git a/src/submodules/Directory.Build.props b/src/submodules/Directory.Build.props index 634b9cd57379..f3cd4c5956b4 100644 --- a/src/submodules/Directory.Build.props +++ b/src/submodules/Directory.Build.props @@ -1,2 +1,2 @@ - + diff --git a/src/submodules/Directory.Build.targets b/src/submodules/Directory.Build.targets index 634b9cd57379..f3cd4c5956b4 100644 --- a/src/submodules/Directory.Build.targets +++ b/src/submodules/Directory.Build.targets @@ -1,2 +1,2 @@ - + From 7c211da7c99571cc49419d3771a5420d364b76e4 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 7 May 2019 18:06:39 -0700 Subject: [PATCH 04/18] fixup! Move obj and bin directories into repo root --- Directory.Build.props | 2 -- eng/Workarounds.targets | 6 ++++++ .../src/Microsoft.Extensions.ApiDescription.Client.csproj | 1 + .../src/Microsoft.Extensions.ApiDescription.Client.nuspec | 4 ++-- src/Servers/test/FunctionalTests/Directory.Build.props | 6 ------ .../ServerComparison.TestSites/Directory.Build.props | 6 ------ 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 8478d0d63434..8bb50eba5c0a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -55,8 +55,6 @@ $(WarningsNotAsErrors);CS1591 $(WarningsNotAsErrors);xUnit1004 - - false diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index 923051792bd3..3e1a269c7dda 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -25,4 +25,10 @@ BeforeTargets="PrepareForRazorComponentGenerate" DependsOnTargets="GenerateSourceLinkFile" /> + + + + false + + diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj index aa61b7ef3507..2edaf7b68cfc 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj +++ b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj @@ -33,6 +33,7 @@ id=$(PackageId); authors=$(Authors); + baseOutputPath=$(BaseOutputPath); configuration=$(Configuration); copyright=$(Copyright); description=$(PackageDescription); diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec index 7521110b6f85..f04380cfe4c5 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec +++ b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec @@ -19,7 +19,7 @@ - - + + diff --git a/src/Servers/test/FunctionalTests/Directory.Build.props b/src/Servers/test/FunctionalTests/Directory.Build.props index bfda02311c1f..248876a2696a 100644 --- a/src/Servers/test/FunctionalTests/Directory.Build.props +++ b/src/Servers/test/FunctionalTests/Directory.Build.props @@ -1,12 +1,6 @@ - - - $(MSBuildThisFileDirectory)obj\ - $(MSBuildThisFileDirectory)bin\ - - diff --git a/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props b/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props index bfda02311c1f..248876a2696a 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props +++ b/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props @@ -1,12 +1,6 @@ - - - $(MSBuildThisFileDirectory)obj\ - $(MSBuildThisFileDirectory)bin\ - - From ab087df978201fb19244da72b27fb45647debfdc Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 9 May 2019 14:25:10 -0700 Subject: [PATCH 05/18] Fix Microsoft.AspNetCore.Identity.Test --- eng/targets/CSharp.Common.props | 7 +++++ .../Identity.Test/IdentityUIScriptsTest.cs | 26 +++---------------- .../Microsoft.AspNetCore.Identity.Test.csproj | 4 +-- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props index 3edac7591350..d6c2383b3546 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -52,6 +52,13 @@ + + + PreserveNewest + PreserveNewest + + + diff --git a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs index abbb1b717629..8ff722cbe32d 100644 --- a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs +++ b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs @@ -83,8 +83,7 @@ public static IEnumerable ScriptWithFallbackSrcData [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2267", FlakyOn.AzP.macOS)] public async Task IdentityUI_ScriptTags_FallbackSourceContent_Matches_CDNContent(ScriptTag scriptTag) { - var slnDir = GetSolutionDir(); - var wwwrootDir = Path.Combine(slnDir, "UI", "src", "wwwroot", scriptTag.Version); + var wwwrootDir = Path.Combine(AppContext.BaseDirectory, "UI", "src", "wwwroot", scriptTag.Version); var cdnContent = await _httpClient.GetStringAsync(scriptTag.Src); var fallbackSrcContent = File.ReadAllText( @@ -109,9 +108,8 @@ public override string ToString() private static List GetScriptTags() { - var slnDir = GetSolutionDir(); - var uiDirV3 = Path.Combine(slnDir, "UI", "src", "Areas", "Identity", "Pages", "V3"); - var uiDirV4 = Path.Combine(slnDir, "UI", "src", "Areas", "Identity", "Pages", "V4"); + var uiDirV3 = Path.Combine(AppContext.BaseDirectory, "UI", "src", "Areas", "Identity", "Pages", "V3"); + var uiDirV4 = Path.Combine(AppContext.BaseDirectory, "UI", "src", "Areas", "Identity", "Pages", "V4"); var cshtmlFiles = GetRazorFiles(uiDirV3).Concat(GetRazorFiles(uiDirV4)); var scriptTags = new List(); @@ -155,24 +153,6 @@ private static List GetScriptTags(string cshtmlFile) return scriptTags; } - private static string GetSolutionDir() - { - var dir = new DirectoryInfo(AppContext.BaseDirectory); - // On helix we use the published copy - if (!SkipOnHelixAttribute.OnHelix()) - { - while (dir != null) - { - if (File.Exists(Path.Combine(dir.FullName, "Identity.sln"))) - { - break; - } - dir = dir.Parent; - } - } - return dir.FullName; - } - private static string RemoveLineEndings(string originalString) { return originalString.Replace("\r\n", "").Replace("\n", ""); diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj index b955cc49e505..3e34340ad8d7 100644 --- a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj +++ b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj @@ -7,8 +7,8 @@ - - + + From f93c3e2dd43ae8ddbfccf3f63e19ac333f225fb5 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 10 May 2019 08:59:26 -0700 Subject: [PATCH 06/18] Workaround test failures caused by changing output directory --- src/Analyzers/Analyzers/test/AnalyzerTestBase.cs | 2 +- .../test/Microsoft.AspNetCore.Analyzers.Test.csproj | 5 +++++ .../Microsoft.AspNetCore.Components.E2ETests.csproj | 5 +++++ .../Microsoft.AspNetCore.FunctionalTests.csproj | 5 +++++ src/DefaultBuilder/testassets/Directory.Build.props | 9 +++++++++ .../Microsoft.AspNetCore.Hosting.FunctionalTests.csproj | 5 +++++ .../test/FunctionalTests/CORS.FunctionalTests.csproj | 5 +++++ .../test/Microsoft.AspNetCore.NodeServices.Tests.csproj | 5 +++++ src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj | 7 ++++++- .../Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj | 7 ++++++- src/ProjectTemplates/test/ProjectTemplates.Tests.csproj | 4 ++++ .../ServerComparison.FunctionalTests.csproj | 7 ++++++- 12 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 src/DefaultBuilder/testassets/Directory.Build.props diff --git a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs index 85b0e4b31b57..989d79d0129a 100644 --- a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs +++ b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs @@ -45,7 +45,7 @@ public Task CreateCompilationAsync(string source) private static string GetProjectDirectory() { - // On helix we use the published test files + // On helix we use the published test files if (SkipOnHelixAttribute.OnHelix()) { return AppContext.BaseDirectory; diff --git a/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj b/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj index 59b34f4d466e..f80356e535f7 100644 --- a/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj +++ b/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj @@ -4,8 +4,13 @@ netcoreapp3.0 true Microsoft.AspNetCore.Analyzers + + false + + + diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 9eccfc3e29ed..477e5d259dd6 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -13,6 +13,11 @@ true false + + + + + diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj index bc1d97c7ccf8..c06e3e49d02e 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj @@ -2,8 +2,13 @@ netcoreapp3.0 + + false + + + diff --git a/src/DefaultBuilder/testassets/Directory.Build.props b/src/DefaultBuilder/testassets/Directory.Build.props new file mode 100644 index 000000000000..b49282fb6f94 --- /dev/null +++ b/src/DefaultBuilder/testassets/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj index f4f340b347f4..bf9e0cb0de0c 100644 --- a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj +++ b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj @@ -2,8 +2,13 @@ netcoreapp3.0 + + false + + + diff --git a/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.csproj b/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.csproj index 4e7b9c97504f..21ae5a14b5b1 100644 --- a/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.csproj +++ b/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.csproj @@ -4,8 +4,13 @@ netcoreapp3.0 Cors.FunctionalTests $(DefaultItemExcludes);node_modules\**\* + + false + + + diff --git a/src/Middleware/NodeServices/test/Microsoft.AspNetCore.NodeServices.Tests.csproj b/src/Middleware/NodeServices/test/Microsoft.AspNetCore.NodeServices.Tests.csproj index cdca6fc2538f..0b8c614e3127 100644 --- a/src/Middleware/NodeServices/test/Microsoft.AspNetCore.NodeServices.Tests.csproj +++ b/src/Middleware/NodeServices/test/Microsoft.AspNetCore.NodeServices.Tests.csproj @@ -2,8 +2,13 @@ netcoreapp3.0 + + false + + + diff --git a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj index 7e76a2edd6da..df8a4a4cb0b5 100644 --- a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj +++ b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj @@ -4,8 +4,13 @@ netcoreapp3.0 true Microsoft.AspNetCore.Mvc.Analyzers - + + + false + + + diff --git a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj index b562b365e3a0..370646fc2b93 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj +++ b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj @@ -3,8 +3,13 @@ netcoreapp3.0 Microsoft.AspNetCore.Mvc.Api.Analyzers - + + + false + + + diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 51ccdd49ef12..d6ceaf663ef7 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -10,8 +10,12 @@ true true + + false + + diff --git a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj index 791e6986277f..380fb6e8ed67 100644 --- a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj +++ b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -2,11 +2,16 @@ netcoreapp3.0 + + false + + + - + From 99438a52350df795e3c6e27c09e02a3c3431fcab Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 10 May 2019 10:57:00 -0700 Subject: [PATCH 07/18] More workarounds for obj/bin dir move --- build/tasks/RepoTasks.csproj | 4 ++++ .../test/ProjectTemplates.Tests.csproj | 2 +- src/Servers/testassets/Directory.Build.props | 10 ++++++++++ .../ServerComparison.TestSites/Directory.Build.props | 7 ------- 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 src/Servers/testassets/Directory.Build.props delete mode 100644 src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index d80a1c6a8373..c9264a2afecf 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -29,4 +29,8 @@ + + + + diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index d6ceaf663ef7..e685741c539c 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -19,7 +19,7 @@ - TestTemplates + TestTemplates\ $([MSBuild]::EnsureTrailingSlash('$(RepositoryRoot)'))obj\template-restore\ TemplateTests.props diff --git a/src/Servers/testassets/Directory.Build.props b/src/Servers/testassets/Directory.Build.props new file mode 100644 index 000000000000..4be9d4181909 --- /dev/null +++ b/src/Servers/testassets/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props b/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props deleted file mode 100644 index 248876a2696a..000000000000 --- a/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - From a7ce724fa249e695f6c2856b60cad58d1b63cf80 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 10 May 2019 12:33:15 -0700 Subject: [PATCH 08/18] Add more workarounds --- src/Components/Directory.Build.props | 9 +++++++++ src/Hosting/test/testassets/Directory.Build.props | 9 +++++++++ .../CORS/test/testassets/Directory.Build.props | 9 +++++++++ 3 files changed, 27 insertions(+) create mode 100644 src/Hosting/test/testassets/Directory.Build.props create mode 100644 src/Middleware/CORS/test/testassets/Directory.Build.props diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props index 1fde2f43387a..c199817ced53 100644 --- a/src/Components/Directory.Build.props +++ b/src/Components/Directory.Build.props @@ -1,6 +1,15 @@ + + + + + + + + + aspnetcore;components diff --git a/src/Hosting/test/testassets/Directory.Build.props b/src/Hosting/test/testassets/Directory.Build.props new file mode 100644 index 000000000000..b49282fb6f94 --- /dev/null +++ b/src/Hosting/test/testassets/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/Middleware/CORS/test/testassets/Directory.Build.props b/src/Middleware/CORS/test/testassets/Directory.Build.props new file mode 100644 index 000000000000..b49282fb6f94 --- /dev/null +++ b/src/Middleware/CORS/test/testassets/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + + + + + From 7c5f497e4d477f0f7904345989f2258aba82b850 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 10 May 2019 13:06:06 -0700 Subject: [PATCH 09/18] fixup! Add more workarounds --- src/Components/Directory.Build.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props index c199817ced53..ee0ff057fa40 100644 --- a/src/Components/Directory.Build.props +++ b/src/Components/Directory.Build.props @@ -9,14 +9,13 @@ - aspnetcore;components $(MSBuildThisFileDirectory)Shared\ - $(ArtifactsBinDir)Microsoft.AspNetCore.Blazor.Build\$(Configuration)\netcoreapp3.0\ + $(MSBuildThisFileDirectory)Blazor\Build\src\bin\$(Configuration)\netcoreapp3.0\ From f21d58c26e629b9a0982c8955bee4bc99784f9af Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 10 May 2019 13:54:46 -0700 Subject: [PATCH 10/18] fixup! fixup! Add more workarounds --- src/Middleware/CORS/samples/Directory.Build.props | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/Middleware/CORS/samples/Directory.Build.props diff --git a/src/Middleware/CORS/samples/Directory.Build.props b/src/Middleware/CORS/samples/Directory.Build.props new file mode 100644 index 000000000000..b49282fb6f94 --- /dev/null +++ b/src/Middleware/CORS/samples/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + + + + + From 0b6209784cefe1a68df1f1d90a16a955ce3dfdc3 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 10 May 2019 15:39:44 -0700 Subject: [PATCH 11/18] fixup! fixup! fixup! Add more workarounds --- src/SignalR/clients/ts/FunctionalTests/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SignalR/clients/ts/FunctionalTests/package.json b/src/SignalR/clients/ts/FunctionalTests/package.json index 4a3321d0d687..e120d3a91150 100644 --- a/src/SignalR/clients/ts/FunctionalTests/package.json +++ b/src/SignalR/clients/ts/FunctionalTests/package.json @@ -42,9 +42,9 @@ "build": "yarn run build:lint && yarn run build:webpack", "build:lint": "node ../common/node_modules/tslint/bin/tslint -c ../tslint.json -p ./tsconfig.json", "build:webpack": "node ../common/node_modules/webpack-cli/bin/cli.js", - "pretest": "yarn run build && dotnet build FunctionalTests.csproj", + "pretest": "yarn run build && dotnet build SignalR.Client.FunctionalTests.csproj", "test": "tsc --noEmit && yarn run test:local --", - "test:inner": "yarn run build && dotnet build FunctionalTests.csproj && yarn run test:local --", + "test:inner": "yarn run build && dotnet build SignalR.Client.FunctionalTests.csproj && yarn run test:local --", "test:local": "yarn run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts", "test:all": "yarn run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts --all-browsers", "test:sauce": "yarn run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts --sauce", From 74f62dae6e573d70aad999540162a523391cf378 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 10 May 2019 16:36:28 -0700 Subject: [PATCH 12/18] Mark InputDateInteractsWithEditContext_NullableDateTimeOffset as flaky --- src/Components/test/E2ETest/Tests/FormsTest.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Components/test/E2ETest/Tests/FormsTest.cs b/src/Components/test/E2ETest/Tests/FormsTest.cs index f4c68a767cab..88f2a0d9fbf9 100644 --- a/src/Components/test/E2ETest/Tests/FormsTest.cs +++ b/src/Components/test/E2ETest/Tests/FormsTest.cs @@ -6,6 +6,8 @@ using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using Microsoft.AspNetCore.E2ETesting; +using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; using OpenQA.Selenium; using OpenQA.Selenium.Support.UI; using System; @@ -198,6 +200,7 @@ public void InputDateInteractsWithEditContext_NonNullableDateTime() } [Fact] + [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2511", FlakyOn.All)] public void InputDateInteractsWithEditContext_NullableDateTimeOffset() { var appElement = MountTestComponent(); From aa7719bf856f61ec3343c585969fcf544d5dc47e Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 10 May 2019 16:45:08 -0700 Subject: [PATCH 13/18] Fix signalr functional tests --- src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts index 1fe581f4e8ca..3139e9d05d40 100644 --- a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts @@ -232,7 +232,7 @@ function runJest(httpsUrl: string, httpUrl: string) { (async () => { try { - const serverPath = path.resolve(__dirname, "..", "bin", configuration, "netcoreapp3.0", "FunctionalTests.dll"); + const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTests", "netcoreapp3.0", configuration, "SignalR.Client.FunctionalTests.dll"); debug(`Launching Functional Test Server: ${serverPath}`); let desiredServerUrl = "https://127.0.0.1:0;http://127.0.0.1:0"; From 5323709be4b1b1feeffb01efb5f1cf46a938ceb7 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 10 May 2019 17:56:44 -0700 Subject: [PATCH 14/18] Remove -- --- .../FunctionalTests/SignalR.Npm.FunctionalTests.npmproj | 8 ++++---- src/SignalR/clients/ts/FunctionalTests/package.json | 4 ++-- .../clients/ts/FunctionalTests/scripts/run-tests.ts | 2 +- src/SignalR/publish-apps.ps1 | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj index de2f1a4b3bf6..0a8992aa9ded 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj @@ -7,11 +7,11 @@ sauce.local <_TestSauceArgs>--verbose --no-color --configuration $(Configuration) --sauce-user "$(SauceUser)" --sauce-key "$(SauceKey)" <_TestSauceArgs Condition="'$(BrowserTestHostName)' != ''">$(_TestSauceArgs) --use-hostname "$(BrowserTestHostName)" - run test:local -- --no-color --configuration $(Configuration) + run test:local --no-color --configuration $(Configuration) - + @@ -27,7 +27,7 @@ - @@ -37,7 +37,7 @@ <_TestSauceArgs Condition="'$(BrowserTestHostName)' != ''">$(_TestSauceArgs) --use-hostname "$(BrowserTestHostName)" - diff --git a/src/SignalR/clients/ts/FunctionalTests/package.json b/src/SignalR/clients/ts/FunctionalTests/package.json index e120d3a91150..ef1ed135c5c7 100644 --- a/src/SignalR/clients/ts/FunctionalTests/package.json +++ b/src/SignalR/clients/ts/FunctionalTests/package.json @@ -43,8 +43,8 @@ "build:lint": "node ../common/node_modules/tslint/bin/tslint -c ../tslint.json -p ./tsconfig.json", "build:webpack": "node ../common/node_modules/webpack-cli/bin/cli.js", "pretest": "yarn run build && dotnet build SignalR.Client.FunctionalTests.csproj", - "test": "tsc --noEmit && yarn run test:local --", - "test:inner": "yarn run build && dotnet build SignalR.Client.FunctionalTests.csproj && yarn run test:local --", + "test": "tsc --noEmit && yarn run test:local", + "test:inner": "yarn run build && dotnet build SignalR.Client.FunctionalTests.csproj && yarn run test:local", "test:local": "yarn run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts", "test:all": "yarn run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts --all-browsers", "test:sauce": "yarn run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts --sauce", diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts index 3139e9d05d40..a9b9b8a18b96 100644 --- a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts @@ -232,7 +232,7 @@ function runJest(httpsUrl: string, httpUrl: string) { (async () => { try { - const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTests", "netcoreapp3.0", configuration, "SignalR.Client.FunctionalTests.dll"); + const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTests", configuration, "netcoreapp3.0", "SignalR.Client.FunctionalTests.dll"); debug(`Launching Functional Test Server: ${serverPath}`); let desiredServerUrl = "https://127.0.0.1:0;http://127.0.0.1:0"; diff --git a/src/SignalR/publish-apps.ps1 b/src/SignalR/publish-apps.ps1 index ece137cf3893..7c5ea57101e0 100644 --- a/src/SignalR/publish-apps.ps1 +++ b/src/SignalR/publish-apps.ps1 @@ -20,7 +20,7 @@ $ClientsTsDir = Join-Path $ClientsDir "ts" # The list of apps to publish $Apps = @{ "SignalRSamples"= (Join-Path $SamplesDir "SignalRSamples") - "FunctionalTests"= (Join-Path $ClientsTsDir "FunctionalTests") + "FunctionalTests"= (Join-Path $ClientsTsDir "FunctionalTests/SignalR.Client.FunctionalTests.csproj") } $BuildMetadataContent = @" From 586c7726f7400c1f83302a23069d60a1b6ef8a6c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 14 May 2019 09:11:33 -0700 Subject: [PATCH 15/18] PR feedback --- eng/scripts/CodeCheck.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index bd79f36f9377..ddb80e906500 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -59,11 +59,10 @@ try { | ? { (Split-Path -Leaf (Split-Path -Parent $_)) -ne 'ref' } ` | % { $fileName = [io.path]::GetFileNameWithoutExtension($_) - if ($projectFileNames.Contains($fileName)) { + if (-not ($projectFileNames.Add($fileName))) { LogError -code 'BUILD003' -filepath $_ ` "Multiple project files named '$fileName' exist. Project files should have a unique name to avoid conflicts in build output." } - $projectFileNames.Add($fileName) | Out-Null } # From a0650a2886bfbd090c90a92c3541affeb7104881 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 14 May 2019 11:21:44 -0700 Subject: [PATCH 16/18] More workarounds for IIS --- .../InProcessForwardsCompatWebSite.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj index 3deabbaa7eb6..2ac833a48772 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj @@ -4,6 +4,7 @@ netcoreapp3.0 + InProcessWebSite InProcessForwardsCompatWebSite FORWARDCOMPAT From 3cadb5e1d7d2f726590e899818075fb5e067f838 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 14 May 2019 11:22:38 -0700 Subject: [PATCH 17/18] More workarounds for IIS tests --- src/Servers/IIS/IIS/test/Directory.Build.props | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/Servers/IIS/IIS/test/Directory.Build.props diff --git a/src/Servers/IIS/IIS/test/Directory.Build.props b/src/Servers/IIS/IIS/test/Directory.Build.props new file mode 100644 index 000000000000..4be9d4181909 --- /dev/null +++ b/src/Servers/IIS/IIS/test/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + + + + + + From 58c165d2920e7341e2c9ba233a8e94f50e2c3d82 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 14 May 2019 11:26:30 -0700 Subject: [PATCH 18/18] fixup! More workarounds for IIS tests --- src/Servers/IIS/build/testsite.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index 4a62be59bff3..4e6b020b3f40 100644 --- a/src/Servers/IIS/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -50,7 +50,7 @@ - $(ArtifactsBinDir)TestTasks\$(Configuration)\$(TargetFramework)\TestTasks + $(MSBuildThisFileDirectory)..\IIS\test\testassets\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks