diff --git a/.azure/pipelines/tools/SetupTestEnvironment.ps1 b/.azure/pipelines/tools/SetupTestEnvironment.ps1 index e92b76304b..0c64ea670a 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 789031bf52..8a2385174b 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 3258910582..8b002c635e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -145,7 +145,7 @@ - + $(MSBuildProjectName) $([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)$(OutDirName)\')) diff --git a/build/repo.props b/build/repo.props index 87ae71b745..eee87343c3 100644 --- a/build/repo.props +++ b/build/repo.props @@ -42,7 +42,7 @@ diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index d80a1c6a83..c9264a2afe 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -29,4 +29,8 @@ + + + + diff --git a/docs/BuildErrors.md b/docs/BuildErrors.md index be5f94a560..52fb8d25de 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/Workarounds.targets b/eng/Workarounds.targets index 923051792b..3e1a269c7d 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -25,4 +25,10 @@ BeforeTargets="PrepareForRazorComponentGenerate" DependsOnTargets="GenerateSourceLinkFile" /> + + + + false + + diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 05902d24b6..ddb80e9065 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,25 @@ 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 (-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." + } + } + # # Versions.props and Version.Details.xml # @@ -171,7 +198,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/CSharp.Common.props b/eng/targets/CSharp.Common.props index 3edac75913..d6c2383b35 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -52,6 +52,13 @@ + + + PreserveNewest + PreserveNewest + + + diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props index ace69ddd2c..faa8049b61 100644 --- a/eng/targets/Cpp.Common.props +++ b/eng/targets/Cpp.Common.props @@ -4,7 +4,10 @@ true false - $(PlatformName)\$(Configuration)\ + + + $(OutputPath) + $(IntermediateOutputPath) diff --git a/eng/tools/XplatPackageSigner/XplatPackageSigner.proj b/eng/tools/XplatPackageSigner/XplatPackageSigner.proj index 2d392b5576..493b463c48 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/Analyzers/Analyzers/test/AnalyzerTestBase.cs b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs index 85b0e4b31b..989d79d012 100644 --- a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs +++ b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs @@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Analyzers 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 59b34f4d46..f80356e535 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/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj index 29d5492b14..a1dc024b4a 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 b19c3a09d8..6216d1eae6 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 ecacc6f7ee..f6ea985b7f 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 a090fee61f..ee0ff057fa 100644 --- a/src/Components/Directory.Build.props +++ b/src/Components/Directory.Build.props @@ -1,11 +1,14 @@ + + - false + + + + - - aspnetcore;components diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 24ebd8ebf2..477e5d259d 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 + + + + + @@ -36,7 +41,7 @@ - + diff --git a/src/Components/test/E2ETest/Tests/FormsTest.cs b/src/Components/test/E2ETest/Tests/FormsTest.cs index f4c68a767c..88f2a0d9fb 100644 --- a/src/Components/test/E2ETest/Tests/FormsTest.cs +++ b/src/Components/test/E2ETest/Tests/FormsTest.cs @@ -6,6 +6,8 @@ using BasicTestApp.FormsTest; 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 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests } [Fact] + [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2511", FlakyOn.All)] public void InputDateInteractsWithEditContext_NullableDateTimeOffset() { var appElement = MountTestComponent(); 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 92b547bbed..4dca79f2fd 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/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj index d2cc2628f6..416f78e75c 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/SiteExtensions/Directory.Build.props b/src/DefaultBuilder/testassets/Directory.Build.props similarity index 52% rename from src/SiteExtensions/Directory.Build.props rename to src/DefaultBuilder/testassets/Directory.Build.props index 574418ea36..b49282fb6f 100644 --- a/src/SiteExtensions/Directory.Build.props +++ b/src/DefaultBuilder/testassets/Directory.Build.props @@ -1,7 +1,9 @@ - - true - - + + + + + + diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props index 5a05adc758..7774279828 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 fce60aafbf..7a0d9cfe80 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 cc6273e88e..bb4784bb94 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/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj index cb48955bb0..1c92dddbaa 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/Hosting/test/testassets/Directory.Build.props b/src/Hosting/test/testassets/Directory.Build.props new file mode 100644 index 0000000000..b49282fb6f --- /dev/null +++ b/src/Hosting/test/testassets/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/Http/HttpAbstractions.sln b/src/Http/HttpAbstractions.sln index f585ee6c2d..0bf3b98843 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 0b83c7d39c..3230a236b9 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/Identity/test/Identity.Test/IdentityUIScriptsTest.cs b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs index abbb1b7176..8ff722cbe3 100644 --- a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs +++ b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs @@ -83,8 +83,7 @@ namespace Microsoft.AspNetCore.Identity.Test [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 @@ namespace Microsoft.AspNetCore.Identity.Test 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 @@ namespace Microsoft.AspNetCore.Identity.Test 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 b955cc49e5..3e34340ad8 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 @@ - - + + diff --git a/src/Installers/Debian/Directory.Build.props b/src/Installers/Debian/Directory.Build.props index f235d1ee8a..d967c46c68 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 072aa6b6b3..d27e528217 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 fe67cac916..0000000000 --- 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 5df24f3a2b..404f2a3c13 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 da7c3b16b4..a900f6d5e0 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 6cda623e63..c675584f20 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 0b349bffd0..4c1ba6ae0a 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 a75af0850a..f823e017c8 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 bdc59f4f6d..0000000000 --- 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 854a4bf551..69532ea00c 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 5d55dc1c13..be17d02053 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 f327ebd6ec..0000000000 Binary files a/src/Installers/Windows/UpgradeLog.htm and /dev/null differ diff --git a/src/Middleware/CORS/samples/Directory.Build.props b/src/Middleware/CORS/samples/Directory.Build.props new file mode 100644 index 0000000000..b49282fb6f --- /dev/null +++ b/src/Middleware/CORS/samples/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj b/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.csproj similarity index 84% rename from src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj rename to src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.csproj index 3980148861..8bb04bbf54 100644 --- a/src/Middleware/CORS/test/FunctionalTests/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/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj b/src/Middleware/CORS/test/FunctionalTests/CORS.Npm.FunctionalTests.npmproj similarity index 100% rename from src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj rename to src/Middleware/CORS/test/FunctionalTests/CORS.Npm.FunctionalTests.npmproj 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 0000000000..b49282fb6f --- /dev/null +++ b/src/Middleware/CORS/test/testassets/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln index bccbab07c9..5f16259900 100644 --- a/src/Middleware/Middleware.sln +++ b/src/Middleware/Middleware.sln @@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A86E EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EchoApp", "WebSockets\samples\EchoApp\EchoApp.csproj", "{0792C20B-1D18-4D7C-9C0F-A6F45A0F378E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "WebSockets\samples\TestServer\TestServer.csproj", "{4E5F5FCC-172C-44D9-BEA0-39098A79CD0B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSockets.TestServer", "WebSockets\samples\TestServer\WebSockets.TestServer.csproj", "{4E5F5FCC-172C-44D9-BEA0-39098A79CD0B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebSockets", "WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj", "{BECAA6A1-1AA4-415E-ADF3-07C103333826}" EndProject @@ -245,7 +245,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Crypto EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "..\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{7343B4E4-C5A2-49E2-B431-4D1E6A26E424}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "CORS\test\FunctionalTests\FunctionalTests.csproj", "{E025D98E-BD85-474A-98A9-E7F44F392F8E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CORS.FunctionalTests", "CORS\test\FunctionalTests\CORS.FunctionalTests.csproj", "{E025D98E-BD85-474A-98A9-E7F44F392F8E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleDestination", "CORS\samples\SampleDestination\SampleDestination.csproj", "{52CDD110-77DD-4C4D-8C72-4570F6EF20DD}" EndProject diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/.gitignore b/src/Middleware/NodeServices/samples/NodeServicesExamples/.gitignore deleted file mode 100644 index 6330d42a2b..0000000000 --- a/src/Middleware/NodeServices/samples/NodeServicesExamples/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/node_modules/ -/Properties/launchSettings.json diff --git a/src/Middleware/NodeServices/test/Microsoft.AspNetCore.NodeServices.Tests.csproj b/src/Middleware/NodeServices/test/Microsoft.AspNetCore.NodeServices.Tests.csproj index cdca6fc253..0b8c614e31 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/Middleware/SpaServices/src/.gitignore b/src/Middleware/SpaServices/src/.gitignore deleted file mode 100644 index c6958891dd..0000000000 --- a/src/Middleware/SpaServices/src/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/node_modules/ diff --git a/src/Middleware/WebSockets/samples/TestServer/TestServer.csproj b/src/Middleware/WebSockets/samples/TestServer/WebSockets.TestServer.csproj similarity index 100% rename from src/Middleware/WebSockets/samples/TestServer/TestServer.csproj rename to src/Middleware/WebSockets/samples/TestServer/WebSockets.TestServer.csproj 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 aa61b7ef35..2edaf7b68c 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 7521110b6f..f04380cfe4 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/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj index 7e76a2edd6..df8a4a4cb0 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 b562b365e3..370646fc2b 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/Mvc/Mvc.sln b/src/Mvc/Mvc.sln index 213803a110..14972548a3 100644 --- a/src/Mvc/Mvc.sln +++ b/src/Mvc/Mvc.sln @@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{16 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicWebSite", "test\WebSites\BasicWebSite\BasicWebSite.csproj", "{34DF1487-12C6-476C-BE0A-F31DF1939AE5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoutingWebSite", "test\WebSites\RoutingWebSite\RoutingWebSite.csproj", "{42CDBF4A-E238-4C0F-A416-44588363EB4C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.RoutingWebSite", "test\WebSites\RoutingWebSite\Mvc.RoutingWebSite.csproj", "{42CDBF4A-E238-4C0F-A416-44588363EB4C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorWebSite", "test\WebSites\RazorWebSite\RazorWebSite.csproj", "{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}" EndProject diff --git a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index 9abe308b51..2a8c7e0504 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -46,7 +46,7 @@ - + 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 20836588ac..d1b1ffe43f 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -10,12 +10,16 @@ true true + + false + + - TestTemplates + TestTemplates\ $([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\template-restore\ TemplateTests.props @@ -57,7 +61,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 3b41432edc..20035ab691 100644 --- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -29,13 +29,13 @@ - <_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\**\*.*" /> - diff --git a/src/Servers/IIS/.gitignore b/src/Servers/IIS/.gitignore index 694e8789e7..1336f289f7 100644 --- a/src/Servers/IIS/.gitignore +++ b/src/Servers/IIS/.gitignore @@ -1,61 +1,3 @@ -[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 d90ff5f7bf..d53a438f03 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 9fd8d24671..fc02995961 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 3c76ed6b05..46dd0a68c4 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 2afc56dacb..75ed7c3650 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 56088b84ad..e18327851c 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 20bc6451a1..95237b7ec2 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/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj index de01039750..bf679ddbd2 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/Directory.Build.props b/src/Servers/IIS/IIS/test/Directory.Build.props index b4e83ba737..6f6f921168 100644 --- a/src/Servers/IIS/IIS/test/Directory.Build.props +++ b/src/Servers/IIS/IIS/test/Directory.Build.props @@ -2,6 +2,10 @@ + + + + true 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 483c48b8fe..edd20b3aa9 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 @@ -13,7 +13,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 97% rename from src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj rename to src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj index 3deabbaa7e..2ac833a487 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessForwardsCompatWebSite.csproj @@ -4,6 +4,7 @@ netcoreapp3.0 + InProcessWebSite InProcessForwardsCompatWebSite FORWARDCOMPAT diff --git a/src/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln index 3c2bbdac1d..b108c88420 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 0097cb4352..6d722c02e6 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 e6c366f295..f6a7360235 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 e5d8ab982c..2106b8150f 100644 --- a/src/Servers/IIS/build/native.targets +++ b/src/Servers/IIS/build/native.targets @@ -31,10 +31,10 @@ - + - + diff --git a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 index c1fb063715..20c28ae8ae 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 e434f397f3..9a561e27a1 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/Servers/test/FunctionalTests/Directory.Build.props b/src/Servers/test/FunctionalTests/Directory.Build.props index bfda02311c..248876a269 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/test/FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj index bd065805c6..de28935c52 100644 --- a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj +++ b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -2,11 +2,16 @@ netcoreapp3.0 + + false + + + - + diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/testassets/Directory.Build.props similarity index 59% rename from src/Servers/IIS/Directory.Build.props rename to src/Servers/testassets/Directory.Build.props index f4bd362993..4be9d41819 100644 --- a/src/Servers/IIS/Directory.Build.props +++ b/src/Servers/testassets/Directory.Build.props @@ -2,9 +2,9 @@ - - + + 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 bfda02311c..0000000000 --- a/src/Servers/testassets/ServerComparison.TestSites/Directory.Build.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory)obj\ - $(MSBuildThisFileDirectory)bin\ - - - - - - diff --git a/src/SignalR/SignalR.sln b/src/SignalR/SignalR.sln index 87fd94b3a9..bfe46375f3 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 4a81b0a662..eabba7738e 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/FunctionalTests.csproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTests.csproj similarity index 100% rename from src/SignalR/clients/ts/FunctionalTests/FunctionalTests.csproj rename to src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTests.csproj diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj index c24f00f47c..ad7dcd2675 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 4a3321d0d6..ef1ed135c5 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", - "test": "tsc --noEmit && yarn run test:local --", - "test:inner": "yarn run build && dotnet build FunctionalTests.csproj && yarn run test:local --", + "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: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 1fe581f4e8..a9b9b8a18b 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", 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 ece137cf38..7c5ea57101 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 = @" diff --git a/src/Tools/Directory.Build.props b/src/Tools/Directory.Build.props index 2778f5a4bb..12132ebe91 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 0000000000..f3cd4c5956 --- /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 0000000000..f3cd4c5956 --- /dev/null +++ b/src/submodules/Directory.Build.targets @@ -0,0 +1,2 @@ + +