diff --git a/Directory.Build.props b/Directory.Build.props index 1969e3e16a2a91..b1ac2559f9ed1e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,6 +11,9 @@ all cases, rather than ordinarily where we build them during mobile or wasm build legs. This makes the manifests available on source-only builds. --> true + + false diff --git a/docs/workflow/testing/host/testing.md b/docs/workflow/testing/host/testing.md index 35c7359c411a9a..bb45307ecf46f3 100644 --- a/docs/workflow/testing/host/testing.md +++ b/docs/workflow/testing/host/testing.md @@ -77,6 +77,11 @@ The `category!=failing` is to respect the [filtering traits](../libraries/filter ### Visual Studio The [Microsoft.DotNet.CoreSetup.sln](/src/installer/Microsoft.DotNet.CoreSetup.sln) can be used to run and debug host tests through Visual Studio. When using the solution, the product should have already been [built](#building-tests) and the [test context](#test-context) set up. +If you built the runtime or libraries with a different configuration from the host, you have to specify this when starting visual studio: + +```console +build.cmd -vs Microsoft.DotNet.CoreSetup -rc Release -lc Release +``` ### Preserving test artifacts diff --git a/eng/build.ps1 b/eng/build.ps1 index be88dcb263e8d9..474e55e40f2e58 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -261,6 +261,12 @@ if ($vs) { $env:RUNTIMECONFIGURATION=$runtimeConfiguration } + if ($librariesConfiguration) + { + # Respect the LibrariesConfiguration variable for building inside VS with different libraries configurations + $env:LIBRARIESCONFIGURATION=$librariesConfiguration + } + # Respect the RuntimeFlavor variable for building inside VS with a different CoreLib and runtime if ($runtimeFlavor) { diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index cc1443588858a8..c8d1737bea1307 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -16,7 +16,6 @@ $(RepositoryEngineeringDir)BeforeTargetFrameworkInference.targets - false $(RepositoryEngineeringDir)LicenseHeader.txt