diff --git a/Directory.Build.props b/Directory.Build.props index 3113a74709..3258910582 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -59,11 +59,11 @@ - $(MSBuildThisFileDirectory) + $(MSBuildThisFileDirectory) https://github.com/aspnet/AspNetCore git $(MSBuildThisFileDirectory)src\Shared\ - $(RepositoryRoot)src\submodules\googletest\ + $(RepoRoot)src\submodules\googletest\ true @@ -159,15 +159,15 @@ - $(RepositoryRoot).dotnet\$(TargetArchitecture)\ - $(RepositoryRoot).dotnet\ + $(RepoRoot).dotnet\$(TargetArchitecture)\ + $(RepoRoot).dotnet\ $(LocalDotNetRoot)packs\ - $([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectDirectory))) + $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory))) true true diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets index 90961cf1f4..3992669300 100644 --- a/build/AzureIntegration.targets +++ b/build/AzureIntegration.targets @@ -7,7 +7,7 @@ AspNetUniverseBuildOffline=true; - RepositoryRoot=$(AzureIntegrationProjectRoot); + RepoRoot=$(AzureIntegrationProjectRoot); VersionSuffix=$(VersionSuffix); BuildNumberSuffix=$(BuildNumberSuffix); Configuration=$(Configuration); diff --git a/build/SharedFx.targets b/build/SharedFx.targets index f89f2eb879..b1841de154 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -5,13 +5,13 @@ - - + + - - + + - + diff --git a/build/repo.props b/build/repo.props index 500a42773e..87ae71b745 100644 --- a/build/repo.props +++ b/build/repo.props @@ -20,12 +20,12 @@ $(ArtifactsDir)installers\$(Configuration)\ $(ArtifactsDir)VSSetup\$(Configuration)\ - $(RepositoryRoot)eng\signcheck.exclusions.txt + $(RepoRoot)eng\signcheck.exclusions.txt true - $(RepositoryRoot)src\Shared\ + $(RepoRoot)src\Shared\ @@ -40,33 +40,33 @@ - + @@ -75,7 +75,7 @@ - + false @@ -83,36 +83,36 @@ - - + + - - - - + + + + - - + + - - + + - - + + - + - + + Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)"> Platform=x64 Platform=Win32 @@ -122,9 +122,9 @@ @@ -132,7 +132,7 @@ - @@ -143,39 +143,39 @@ the entire pattern will silently fail to evaluate correctly. --> + $(RepoRoot)**\node_modules\**\*; + $(RepoRoot)**\bin\**\*; + $(RepoRoot)**\obj\**\*;" /> diff --git a/build/repo.targets b/build/repo.targets index 1528a91ec7..e9e3a0a780 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -80,8 +80,8 @@ --> - @(_ProjectReferenceProvider->'', '%0A ') - @(_ProjectReferenceProviderWithRefAssembly->'', '%0A ') + @(_ProjectReferenceProvider->'', '%0A ') + @(_ProjectReferenceProviderWithRefAssembly->'', '%0A ') ]]> diff --git a/dockerbuild.sh b/dockerbuild.sh index 9d5d6ace11..315a8a832a 100755 --- a/dockerbuild.sh +++ b/dockerbuild.sh @@ -143,5 +143,4 @@ docker run \ ${docker_args[@]+"${docker_args[@]}"} \ $tagname \ ./build.sh \ - ${build_args[@]+"${build_args[@]}"} \ - "-p:HostMachineRepositoryRoot=$DIR" + ${build_args[@]+"${build_args[@]}"} diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index e0f67e2974..067ba79788 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -5,131 +5,131 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 0b3788bf4c..ddb30fe93c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ $(KoreBuildVersion) - 3.0.0-build-20190430.1 + 3.0.0-build-20190515.1 1.0.0-preview.1 15.9.0 1.0.0-beta2-18618-05 diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index f547b96039..ebd707e1dc 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -36,10 +36,10 @@ - - - - + + + + diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index c33a6d4b54..b2f297fe63 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -28,7 +28,7 @@ - + diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index 9e29c6cd05..a219ffc54c 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -4,7 +4,7 @@ Condition="'$(IsServicingBuild)' == 'true' AND '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)'" BeforeTargets="BeforeBuild"> + See $(RepoRoot)eng\tools\BaselineGenerator\README.md for instructions on updating this baseline." /> diff --git a/eng/targets/ReferenceAssembly.targets b/eng/targets/ReferenceAssembly.targets index 6b46dc7c84..cbe21a8976 100644 --- a/eng/targets/ReferenceAssembly.targets +++ b/eng/targets/ReferenceAssembly.targets @@ -60,8 +60,8 @@ <_GenAPICmd>$(_GenAPICmd) "$(TargetPath)" <_GenAPICmd>$(_GenAPICmd) --lib-path "@(_ReferencePathDirectories)" <_GenAPICmd>$(_GenAPICmd) --out "$(_RefSourceFileOutputPath)" - <_GenAPICmd>$(_GenAPICmd) --header-file "$(RepositoryRoot)/eng/LicenseHeader.txt" - <_GenAPICmd>$(_GenAPICmd) --exclude-api-list "$(RepositoryRoot)/eng/GenAPI.exclusions.txt" + <_GenAPICmd>$(_GenAPICmd) --header-file "$(RepoRoot)/eng/LicenseHeader.txt" + <_GenAPICmd>$(_GenAPICmd) --exclude-api-list "$(RepoRoot)/eng/GenAPI.exclusions.txt" diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 386bd0b882..848c95c8b2 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -232,7 +232,7 @@ $(MSBuildProjectDirectory)/../ref/ - $([MSBuild]::MakeRelative($(RepositoryRoot), '$(ReferenceAssemblyDirectory)$(MSBuildProjectFile)')) + $([MSBuild]::MakeRelative($(RepoRoot), '$(ReferenceAssemblyDirectory)$(MSBuildProjectFile)')) @@ -242,7 +242,7 @@ $([MSBuild]::ValueOrDefault($(IsAspNetCoreApp),'false')) $([MSBuild]::ValueOrDefault($(IsShippingPackage),'false')) - $([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectFullPath))) + $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectFullPath))) $(ReferenceAssemblyProjectFileRelativePath) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 43ce1017d3..04df499b68 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-build-20190502.5 -commithash:4889b4d995a0c0fddf132332540bcb2ccc6e90f1 +version:3.0.0-build-20190515.1 +commithash:ec244eafdc277b29813c81e19e9e9768cad8839a diff --git a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj index 43ff92d6fa..d79ec9bc63 100644 --- a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj +++ b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj @@ -114,7 +114,7 @@ Content\THIRD-PARTY-NOTICES.txt - + Content\LICENSE.txt diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj index af75650cb1..91715412db 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/Components/Blazor/Build/src/ReferenceFromSource.props b/src/Components/Blazor/Build/src/ReferenceFromSource.props index c98b209ff8..2eed23ef3f 100644 --- a/src/Components/Blazor/Build/src/ReferenceFromSource.props +++ b/src/Components/Blazor/Build/src/ReferenceFromSource.props @@ -11,7 +11,7 @@ true - $(RepositoryRoot)src\Components\Browser.JS\dist\$(Configuration)\blazor.*.js.* + $(RepoRoot)src\Components\Browser.JS\dist\$(Configuration)\blazor.*.js.* diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj index ffafb4e262..1d2eb08cb1 100644 --- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj @@ -22,15 +22,15 @@ - $(RepositoryRoot)src\submodules\MessagePack-CSharp\src\MessagePack\ + $(RepoRoot)src\submodules\MessagePack-CSharp\src\MessagePack\ - - - + + + diff --git a/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj b/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj index e25bf9b83d..bf4040312e 100644 --- a/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj +++ b/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj @@ -10,7 +10,7 @@ - $(RepositoryRoot)src\SignalR\common\SignalR.Common\test\Internal\Protocol\ + $(RepoRoot)src\SignalR\common\SignalR.Common\test\Internal\Protocol\ 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 bc1d97c7cc..d2cc2628f6 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj b/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj index c95cdbdc94..25248775e9 100644 --- a/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj +++ b/src/DefaultBuilder/testassets/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj @@ -1,6 +1,6 @@  - + Exe diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index e81541b1de..cc6273e88e 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -126,7 +126,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - + Platform=$(TargetArchitecture) Platform=Win32 @@ -376,7 +376,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - + diff --git a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj index f4f340b347..cb48955bb0 100644 --- a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj +++ b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 1186611de3..5df24f3a2b 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/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props index 574eeeea8c..d08b147e4a 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props @@ -23,14 +23,14 @@ 2.0.0 - $(RepositoryRoot)src\Installers\Windows\AspNetCoreModule-Setup\ + $(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\ $(AspNetCoreSetupRoot)IIS-Setup\ $(IIS-Setup)IIS-Common\ $(AspNetCoreSetupRoot)build\ - <_ServerIISBasePath>$(RepositoryRoot)\src\Servers\IIS\ + <_ServerIISBasePath>$(RepoRoot)\src\Servers\IIS\ BLDVERMAJOR=$(BLDVERMAJOR);BLDVERMINOR=$(BLDVERMINOR);BLDNUMMAJOR=$(BLDNUMMAJOR);BLDNUMMINOR=$(BLDNUMMINOR);$(DefineConstants) ANCMMsiVersion=$(ANCMMsiVersion);ANCMFolderVersion=$(ANCMFolderVersion);ANCMOutOfProcessNugetPackageHandlerVersion=$(ANCMOutOfProcessNugetPackageHandlerVersion);$(DefineConstants) diff --git a/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj b/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj index 4e7b9c9750..3980148861 100644 --- a/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj +++ b/src/Middleware/CORS/test/FunctionalTests/FunctionalTests.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj index ee5ff33e91..e6c8278b30 100644 --- a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj +++ b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj b/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj index 2925fd746a..518742a102 100644 --- a/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj +++ b/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj index 879ed1707b..42aefeaebd 100644 --- a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj +++ b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj index 682cc74754..d91f54cd3c 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -1,6 +1,6 @@ - + Music store application on ASP.NET Core diff --git a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj index 13182d0a2a..5a2d81e394 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj +++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index b18c56df2f..c138d59d9f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -26,14 +26,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj index 35e8b8c4a0..ff584492e7 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj @@ -22,12 +22,12 @@ - - - - - - + + + + + + diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index d52ebe5026..20836588ac 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -16,7 +16,7 @@ TestTemplates - $([MSBuild]::EnsureTrailingSlash('$(RepositoryRoot)'))obj\template-restore\ + $([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\template-restore\ TemplateTests.props @@ -32,11 +32,11 @@ - + false true - + diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index 1633ad516c..3b41432edc 100644 --- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -9,7 +9,7 @@ - + @@ -26,7 +26,7 @@ - + <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\samples\ClaimsTransformation\bin\$(Configuration)\netcoreapp3.0\ClaimsTransformation.deps.json" /> @@ -76,7 +76,7 @@ File="$(PublishDir)\contentroot.sln" Lines="Ignored" Overwrite="true" - Encoding="Unicode"/> + Encoding="Unicode"/> - + diff --git a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj index 77499f443a..afa3ec8934 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj +++ b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj @@ -16,8 +16,8 @@ - - + + 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 973614b639..de01039750 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj @@ -34,7 +34,7 @@ False - + diff --git a/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj index a4b0011593..7bc7433b75 100644 --- a/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj +++ b/src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj b/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj index 0af2ce5bf6..371d843931 100644 --- a/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj +++ b/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj @@ -7,7 +7,7 @@ - + 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 f0691feabc..483c48b8fe 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 @@ -11,7 +11,7 @@ - + False diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 6e583f4d60..4cc4457514 100644 --- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -12,8 +12,8 @@ - - + + False diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj index fc7147e4f0..11b1a3b784 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 80704a53b0..97fb951acb 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -13,8 +13,8 @@ - - + + False diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj index 42353c00db..efd3c18b4c 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj @@ -48,8 +48,8 @@ - - + + diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index 4e6b020b3f..d130ec70f8 100644 --- a/src/Servers/IIS/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -33,7 +33,7 @@ aspnetcorev2_inprocess.dll - $(RepositoryRoot).dotnet\$(NativePlatform)\dotnet.exe + $(RepoRoot).dotnet\$(NativePlatform)\dotnet.exe diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj index c17725d54b..814c905495 100644 --- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj +++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj @@ -13,11 +13,6 @@ - - - <_Parameter1>RepositoryRoot - <_Parameter2>$(RepositoryRoot) - diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj b/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj index 2cf09c60d0..9f9270d232 100644 --- a/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj +++ b/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj index 791e698627..bd065805c6 100644 --- a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj +++ b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj index fca29b58a1..73eec76d86 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj @@ -1,6 +1,6 @@ - + netcoreapp3.0 diff --git a/src/Shared/E2ETesting/E2ETesting.props b/src/Shared/E2ETesting/E2ETesting.props index be17de8132..5231b25072 100644 --- a/src/Shared/E2ETesting/E2ETesting.props +++ b/src/Shared/E2ETesting/E2ETesting.props @@ -2,7 +2,7 @@ <_DefaultProjectFilter>$(MSBuildProjectDirectory)\..\.. $(DefaultItemExcludes);node_modules\** - $([MSBuild]::EnsureTrailingSlash('$(RepositoryRoot)'))obj\selenium\ + $([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\selenium\ true true diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj index de2f1a4b3b..c24f00f47c 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj @@ -29,7 +29,7 @@ + WorkingDirectory="$(RepoRoot)src/SignalR/clients/ts/FunctionalTests" /> sauce.local @@ -39,7 +39,7 @@ + WorkingDirectory="$(RepoRoot)src/SignalR/clients/ts/FunctionalTests" /> diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj index c439e70ddd..6a640ad70c 100644 --- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj +++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj @@ -30,8 +30,8 @@ true - - + +