diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2021-06-11 19:55:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 19:55:09 +0300 |
| commit | 8698d0f34506695f38824b5573b8e75bcc80684f (patch) | |
| tree | da71bb8b9518ac94668bb44240a55311a2140911 /Directory.Build.props | |
| parent | 6afe03ef71d2290ffd91b707b704a041e4edc3c3 (diff) | |
Update dotnet SDK to 6.0 Preview 4 (#53808)
* Update dotnet SDK to 6.0 Preview 4
Update the minimum and target version of the SDK to 6.0 Preview 4.
Part of https://github.com/dotnet/runtime/issues/53411
* Switch to using eng/targetingpacks.targets for redirecting runtime pack location in src/mono/sample
* Fix binder tracing tests
* Set UseMonoRuntime property so the dotnet SDK can pull the mono runtime packs
This is necessary after the changes from https://github.com/dotnet/sdk/pull/16909.
* Move UseMonoRuntimeProperty and set it to false in coreclr
Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Co-authored-by: Elinor Fung <elfung@microsoft.com>
Diffstat (limited to 'Directory.Build.props')
| -rw-r--r-- | Directory.Build.props | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index c0adfc01c64..7efd3a57291 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -226,6 +226,9 @@ <CoreLibSharedDir>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))</CoreLibSharedDir> <CoreLibProject Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject> <CoreLibProject Condition="'$(RuntimeFlavor)' == 'Mono'">$([MSBuild]::NormalizePath('$(MonoProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject> + + <!-- this property is used by the SDK to pull in mono-based runtime packs --> + <UseMonoRuntime Condition="'$(UseMonoRuntime)' == '' and '$(RuntimeFlavor)' == 'Mono'">true</UseMonoRuntime> </PropertyGroup> <!-- Packaging --> |