diff --git a/eng/Subsets.props b/eng/Subsets.props index ef7ed6207ee1b8..af31b4c424ed47 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -58,8 +58,10 @@ libraries-installer-coreclr-mono - libraries-mono + libraries-installer-mono + libraries-mono corehost-managed-depproj-pkgproj-bundle-installers-test + depproj-pkgproj all runtime-linuxdac-corelib-nativecorelib-tools-packages @@ -218,7 +220,8 @@ - + + diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 7161aaba95a0a5..ae179866f37dd3 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -78,10 +78,11 @@ x64 - - + + + - + $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)')) + Returns="@(RuntimeFiles)" + DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" /> + Returns="@(RuntimeFiles)" + DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" /> osx-$(TargetArchitecture) linux-$(TargetArchitecture) freebsd-$(TargetArchitecture) + ios-$(TargetArchitecture) @@ -127,6 +128,7 @@ false + true true $(AssetOutputPath)sharedfx_$(OutputRid)_$(Configuration)_version_badge.svg @@ -162,6 +164,7 @@ false false + false false false false @@ -186,6 +189,12 @@ true + + + true + true + + true @@ -319,7 +328,7 @@ lib .so .dll - .dylib + .dylib lib .a .lib @@ -329,7 +338,7 @@ .map .ni.pdb - + diff --git a/src/installer/pkg/packaging/osx/package.targets b/src/installer/pkg/packaging/osx/package.targets index fd039da10a6e7e..1256a20d89bc8c 100644 --- a/src/installer/pkg/packaging/osx/package.targets +++ b/src/installer/pkg/packaging/osx/package.targets @@ -5,13 +5,13 @@ + Condition="'$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'iOS'"> diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets index 24e1366e33487c..665fcbfc76f2d5 100644 --- a/src/installer/pkg/projects/Directory.Build.targets +++ b/src/installer/pkg/projects/Directory.Build.targets @@ -14,6 +14,18 @@ $(Version) + + + + true + + + + + true + true + - - + + diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj index 3193f1211170d7..405fa17fe295da 100644 --- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj +++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj @@ -57,15 +57,24 @@ - + - + runtimes/$(PackageRID)/native - + - + tools - + + + + runtimes/$(PackageRID)/native/cross + + + runtimes/$(PackageRID)/native/include/%(RecursiveDir) + runtimes/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native @@ -79,7 +88,7 @@ tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - + diff --git a/src/installer/test/Directory.Build.props b/src/installer/test/Directory.Build.props index 060df327ad8c77..54393a357d7412 100644 --- a/src/installer/test/Directory.Build.props +++ b/src/installer/test/Directory.Build.props @@ -15,7 +15,7 @@ nonwindowstests nonlinuxtests - nonosxtests + nonosxtests nonfreebsdtests nonnetbsdtests diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj index 0b8925ef083335..18a776f969b074 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj @@ -74,27 +74,27 @@ - - - + + + - + - +