From 6c612402cb8c741ec89612a6d1d7649f416df173 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 24 Mar 2020 20:35:10 -0400 Subject: [PATCH 01/20] Add build configuration to generate runtime packs for iOS This adds support for generating iOS runtime packs, which is intended to be consumed by the Xamarin iOS SDK. --- eng/Subsets.props | 23 +++++++++++++++--- eng/liveBuilds.targets | 21 ++++++++++++---- eng/pipelines/installer/jobs/base-job.yml | 1 - eng/referenceFromRuntime.targets | 2 +- src/installer/Directory.Build.props | 24 ++++++++++++------- .../pkg/packaging/osx/package.targets | 4 ++-- .../projects/netcoreapp/Directory.Build.props | 1 + .../pkg/Microsoft.NETCore.App.Runtime.pkgproj | 4 ++-- .../netcoreapp/src/netcoreapp.depproj | 2 +- src/installer/test/Directory.Build.props | 2 +- src/libraries/restore/runtime/runtime.depproj | 4 ++-- 11 files changed, 62 insertions(+), 26 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index ef7ed6207ee1b..63e4bf515dd3a 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 + managed-depproj-pkgproj-bundle-test all runtime-linuxdac-corelib-nativecorelib-tools-packages @@ -218,15 +220,30 @@ - + + - + + + + + + + + + diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 7161aaba95a0a..7ef4c0de0237f 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -78,10 +78,11 @@ x64 - - + + + - + $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)')) - true + true $(AssetOutputPath)sharedfx_$(OutputRid)_$(Configuration)_version_badge.svg @@ -146,10 +147,10 @@ - internal - $(SharedHostInstallerStart)$(InstallerStartSuffix)- - $(HostFxrInstallerStart)$(InstallerStartSuffix)- - $(SharedFrameworkInstallerStart)$(InstallerStartSuffix)- + internal + $(SharedHostInstallerStart)$(InstallerStartSuffix)- + $(HostFxrInstallerStart)$(InstallerStartSuffix)- + $(SharedFrameworkInstallerStart)$(InstallerStartSuffix)- @@ -162,6 +163,7 @@ false false + false false false false @@ -186,6 +188,12 @@ true + + + true + true + + true @@ -275,7 +283,7 @@ .zip .tar.gz .msi - .pkg + .pkg .deb .rpm .exe @@ -319,7 +327,7 @@ lib .so .dll - .dylib + .dylib lib .a .lib @@ -329,7 +337,7 @@ .map .ni.pdb - + diff --git a/src/installer/pkg/packaging/osx/package.targets b/src/installer/pkg/packaging/osx/package.targets index fd039da10a6e7..a914105ecfde5 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/netcoreapp/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/Directory.Build.props index 844980466d10e..d09f6f336a427 100644 --- a/src/installer/pkg/projects/netcoreapp/Directory.Build.props +++ b/src/installer/pkg/projects/netcoreapp/Directory.Build.props @@ -9,6 +9,7 @@ Windows_NT Linux OSX + iOS FreeBSD $(CoreCLRTargetOS) diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj index 7e68f22adbf44..3e55046f6a597 100644 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj +++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj @@ -4,7 +4,7 @@ Include HostPolicy and HostResolver based on legacy packages. This can be collapsed once the legacy packages are no longer used. --> - - + + diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj index 3193f1211170d..2c307a260fbac 100644 --- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj +++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj @@ -57,7 +57,7 @@ - + runtimes/$(PackageRID)/native diff --git a/src/installer/test/Directory.Build.props b/src/installer/test/Directory.Build.props index 060df327ad8c7..54393a357d741 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 0b8925ef08333..e720b4c8d8080 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj @@ -74,7 +74,7 @@ @@ -94,7 +94,7 @@ - + From f88d464f91ae04a27e62488edd60cc9118fb3c3c Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 25 Mar 2020 11:26:25 -0400 Subject: [PATCH 02/20] Take away unnecessary subsets / fix syntax error --- eng/Subsets.props | 2 +- src/installer/pkg/packaging/osx/package.targets | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 63e4bf515dd3a..96f1abf079c68 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -61,7 +61,7 @@ libraries-installer-mono libraries-mono corehost-managed-depproj-pkgproj-bundle-installers-test - managed-depproj-pkgproj-bundle-test + depproj-pkgproj all runtime-linuxdac-corelib-nativecorelib-tools-packages diff --git a/src/installer/pkg/packaging/osx/package.targets b/src/installer/pkg/packaging/osx/package.targets index a914105ecfde5..1256a20d89bc8 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'"> From f7a6dd7e766d1004d2b707ef5192def187961abd Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 25 Mar 2020 15:03:09 -0400 Subject: [PATCH 03/20] Addressed some feedback --- eng/liveBuilds.targets | 36 +++++++------------ eng/pipelines/installer/jobs/base-job.yml | 3 -- eng/referenceFromRuntime.targets | 11 +++--- src/installer/Directory.Build.props | 13 +++---- .../pkg/Microsoft.NETCore.App.Runtime.pkgproj | 12 +++++-- .../netcoreapp/src/netcoreapp.depproj | 12 +++---- src/libraries/restore/runtime/runtime.depproj | 14 ++++---- 7 files changed, 48 insertions(+), 53 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 7ef4c0de0237f..6dcf51520f178 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -78,7 +78,7 @@ x64 - + @@ -97,25 +97,25 @@ - + - - + + true - + <_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll" Condition="Exists('$(CoreCLRArtifactsPath)System.Private.CoreLib.dll')" /> <_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll" Condition="Exists('$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll') and '@(_systemPrivateCoreLib)' == ''" /> - - + - - - - + + true - + - - - - - - - - - - - + diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 9896975e51908..a8eae94bba4b0 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -170,9 +170,6 @@ jobs: - name: _PortableBuild value: ${{ eq(parameters.osSubgroup, '') }} - - name: _DisableCrossgen - value: false - - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}: # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to # lowercase for RID format. (Detection normally converts, but we're preventing it.) diff --git a/eng/referenceFromRuntime.targets b/eng/referenceFromRuntime.targets index fef22b9bfddf6..1bd740a0dd035 100644 --- a/eng/referenceFromRuntime.targets +++ b/eng/referenceFromRuntime.targets @@ -33,8 +33,7 @@ - - + @@ -44,13 +43,13 @@ --> + Returns="@(VMFiles)" + DependsOnTargets="ResolveVMFilesFromLocalBuild" /> + Returns="@(VMFiles)" + DependsOnTargets="ResolveVMFilesFromLocalBuild" /> false + true - true + true $(AssetOutputPath)sharedfx_$(OutputRid)_$(Configuration)_version_badge.svg @@ -147,10 +148,10 @@ - internal - $(SharedHostInstallerStart)$(InstallerStartSuffix)- - $(HostFxrInstallerStart)$(InstallerStartSuffix)- - $(SharedFrameworkInstallerStart)$(InstallerStartSuffix)- + internal + $(SharedHostInstallerStart)$(InstallerStartSuffix)- + $(HostFxrInstallerStart)$(InstallerStartSuffix)- + $(SharedFrameworkInstallerStart)$(InstallerStartSuffix)- @@ -283,7 +284,7 @@ .zip .tar.gz .msi - .pkg + .pkg .deb .rpm .exe diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj index 3e55046f6a597..fef454ee946e1 100644 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj +++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj @@ -1,10 +1,18 @@ + + + true + true + - - + + diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj index 2c307a260fbac..4a6b0edcd6e3b 100644 --- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj +++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj @@ -57,15 +57,15 @@ - + - + runtimes/$(PackageRID)/native - + - + tools - + runtimes/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native @@ -79,7 +79,7 @@ tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - + diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj index e720b4c8d8080..aaa53024b514a 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj @@ -74,27 +74,27 @@ - - - + + + - + - + From 013d727b77e0b51da8d5b163046e27a01acc8ab9 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 25 Mar 2020 18:41:24 -0400 Subject: [PATCH 04/20] Attempt to add iOS installer lanes --- eng/pipelines/runtime.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 8f909825a4311..32711e297a336 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -481,6 +481,18 @@ jobs: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} +- template: /eng/pipelines/installer/installer-matrix.yml + parameters: + buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} + runtimeFlavor: mono + platforms: + - iOS_arm + - iOS_arm64 + - iOS_x64 + jobParameters: + liveRuntimeBuildConfig: release + liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} + # # Libraries Test Build # Only when CoreCLR, Mono or Libraries is changed From ff4c0873b75db86b41455e7f8c007bc9bd51308d Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 25 Mar 2020 19:30:28 -0400 Subject: [PATCH 05/20] Trying a single platform to see if it'll work --- eng/pipelines/runtime.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 32711e297a336..ce68b514c6af6 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -486,8 +486,6 @@ jobs: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} runtimeFlavor: mono platforms: - - iOS_arm - - iOS_arm64 - iOS_x64 jobParameters: liveRuntimeBuildConfig: release From b997ec47e4cec1183b43d92367a8b81ec5311558 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 25 Mar 2020 20:47:57 -0400 Subject: [PATCH 06/20] I guess there's one already? --- eng/pipelines/runtime.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index ce68b514c6af6..8f909825a4311 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -481,16 +481,6 @@ jobs: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} -- template: /eng/pipelines/installer/installer-matrix.yml - parameters: - buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} - runtimeFlavor: mono - platforms: - - iOS_x64 - jobParameters: - liveRuntimeBuildConfig: release - liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} - # # Libraries Test Build # Only when CoreCLR, Mono or Libraries is changed From bb866f80c69947929a069225271827a309908782 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Thu, 26 Mar 2020 09:27:40 -0400 Subject: [PATCH 07/20] Adding ios installer ci back in. It's gonna fail --- eng/pipelines/runtime.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 8f909825a4311..1da15b0acfc71 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -481,6 +481,18 @@ jobs: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} +- template: /eng/pipelines/installer/installer-matrix.yml + parameters: + buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} + runtimeFlavor: mono + platforms: + - iOS_x64 + - iOS_arm + - iOS_arm64 + jobParameters: + liveRuntimeBuildConfig: release + liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} + # # Libraries Test Build # Only when CoreCLR, Mono or Libraries is changed From a7e7237ef9eb3397c0803bec6719d7b761664930 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 27 Mar 2020 14:40:47 -0400 Subject: [PATCH 08/20] Tweaked platform matrix for ios_arm & ios_arm64 so that they do not repeat iOS_x64. This was causing the installer leg creation to fail --- eng/pipelines/common/platform-matrix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index bd5743482969b..7f30eed0c88e2 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -227,7 +227,7 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: iOS archType: arm - platform: iOS_x64 + platform: iOS_arm jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -247,7 +247,7 @@ jobs: helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} osGroup: iOS archType: arm64 - platform: iOS_x64 + platform: iOS_arm64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} From 5fa7c8f759b1e95f4361469741b69f410a7699bd Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 27 Mar 2020 16:06:51 -0400 Subject: [PATCH 09/20] Added iOS as part of the base job check --- eng/pipelines/installer/jobs/base-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index a8eae94bba4b0..0b731a7670a1d 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -112,7 +112,7 @@ jobs: $(CommonMSBuildArgs) $(MsbuildSigningArguments) - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if or(eq(parameters.osGroup, 'OSX'), eq(parameters.osGroup, 'iOS')) }}: - name: CommonMSBuildArgs value: >- From 4eff34f8bb400368ddbb9cfab5e411531c413c95 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 27 Mar 2020 17:06:42 -0400 Subject: [PATCH 10/20] Added os and archType to the ios installer args --- eng/pipelines/installer/jobs/base-job.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 0b731a7670a1d..1215062e5dce2 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -112,7 +112,7 @@ jobs: $(CommonMSBuildArgs) $(MsbuildSigningArguments) - - ${{ if or(eq(parameters.osGroup, 'OSX'), eq(parameters.osGroup, 'iOS')) }}: + - ${{ if eq(parameters.osGroup, 'OSX') }}: - name: CommonMSBuildArgs value: >- @@ -127,6 +127,24 @@ jobs: $(CommonMSBuildArgs) $(OfficialBuildArg) + - ${{ if eq(parameters.osGroup, 'iOS') }}: + + - name: CommonMSBuildArgs + value: >- + /p:PortableBuild=true + /p:SkipTests=$(SkipTests) + + - name: BaseJobBuildCommand + value: >- + $(Build.SourcesDirectory)/installer.sh --restore --build --ci --test + -configuration $(_BuildConfig) + -os $(parameters.osGroup) + -arch $(parameters.archType) + /p:StripSymbols=true + $(LiveOverridePathArgs) + $(CommonMSBuildArgs) + $(OfficialBuildArg) + - ${{ if eq(parameters.osGroup, 'Linux') }}: # Preserve the NuGet authentication env vars into the Docker container. From 2479df05608576d82e012854114a6ed22d804ea1 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 27 Mar 2020 17:11:08 -0400 Subject: [PATCH 11/20] yml syntax :-( --- eng/pipelines/installer/jobs/base-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 1215062e5dce2..bd867c525aa64 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -127,7 +127,7 @@ jobs: $(CommonMSBuildArgs) $(OfficialBuildArg) - - ${{ if eq(parameters.osGroup, 'iOS') }}: + - ${{ if eq(parameters.osGroup, 'iOS') }}: - name: CommonMSBuildArgs value: >- From 5c6f78fd6f7803d8930f10531818589bde7acd14 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 27 Mar 2020 18:09:26 -0400 Subject: [PATCH 12/20] Yml syntax --- eng/pipelines/installer/jobs/base-job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index bd867c525aa64..274928cb31fda 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -138,8 +138,8 @@ jobs: value: >- $(Build.SourcesDirectory)/installer.sh --restore --build --ci --test -configuration $(_BuildConfig) - -os $(parameters.osGroup) - -arch $(parameters.archType) + -os ${{ parameters.osGroup }} + -arch ${{ parameters.archType }} /p:StripSymbols=true $(LiveOverridePathArgs) $(CommonMSBuildArgs) From f3b3b0ada27d60869cb07f0beaa33c8949dfdb3d Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 31 Mar 2020 17:35:30 -0400 Subject: [PATCH 13/20] Pushed skipping unnecessary pkgproj into installer/pkg area Added cross and include into the native part of the runtime pack Addressed feedback --- eng/Subsets.props | 16 +--------- eng/liveBuilds.targets | 31 +++++++++++-------- eng/pipelines/runtime-official.yml | 17 ++++++++++ eng/referenceFromRuntime.targets | 10 +++--- src/installer/Directory.Build.props | 6 ++-- .../Microsoft.NETCore.DotNetAppHost.pkgproj | 9 ++++-- .../Microsoft.NETCore.DotNetAppHost.props | 2 +- .../Microsoft.NETCore.DotNetHost.pkgproj | 8 ++++- ...Microsoft.NETCore.DotNetHostPolicy.pkgproj | 8 ++++- ...crosoft.NETCore.DotNetHostResolver.pkgproj | 8 ++++- .../Microsoft.NETCore.App.Crossgen2.pkgproj | 6 ++++ .../pkg/Microsoft.NETCore.App.Host.pkgproj | 5 +++ .../pkg/Microsoft.NETCore.App.Ref.pkgproj | 6 ++++ .../netcoreapp/src/netcoreapp.depproj | 21 +++++++++---- src/libraries/restore/runtime/runtime.depproj | 14 ++++----- 15 files changed, 112 insertions(+), 55 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 96f1abf079c68..af31b4c424ed4 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -225,25 +225,11 @@ - + - - - - - - - - diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 6dcf51520f178..ae179866f37dd 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -78,7 +78,7 @@ x64 - + @@ -97,25 +97,25 @@ - + - - + + true - + <_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll" Condition="Exists('$(CoreCLRArtifactsPath)System.Private.CoreLib.dll')" /> <_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll" Condition="Exists('$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll') and '@(_systemPrivateCoreLib)' == ''" /> - - + - - - - + + true - + + + + - + diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index a49a4b1bbda73..631171322b0b1 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -161,6 +161,23 @@ stages: - Windows_NT_arm - Windows_NT_arm64 + # + # Installer Build for platforms using Mono + # + - template: /eng/pipelines/installer/installer-matrix.yml + parameters: + jobParameters: + liveRuntimeBuildConfig: release + liveLibrariesBuildConfig: Release + isOfficialBuild: ${{ variables.isOfficialBuild }} + useOfficialAllConfigurations: true + buildFullPlatformManifest: true + runtimeFlavor: mono + platforms: + - iOS_arm + - iOS_arm64 + - iOS_x64 + - ${{ if eq(variables.isOfficialBuild, true) }}: - template: /eng/pipelines/official/stages/publish.yml parameters: diff --git a/eng/referenceFromRuntime.targets b/eng/referenceFromRuntime.targets index 1bd740a0dd035..873e7e5ff4019 100644 --- a/eng/referenceFromRuntime.targets +++ b/eng/referenceFromRuntime.targets @@ -33,7 +33,7 @@ - + @@ -43,13 +43,13 @@ --> + Returns="@(RuntimeFiles)" + DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" /> + Returns="@(RuntimeFiles)" + DependsOnTargets="ResolveRuntimeFilesFromLocalBuild" /> osx-$(TargetArchitecture) linux-$(TargetArchitecture) freebsd-$(TargetArchitecture) - iOS-$(TargetArchitecture) + ios-$(TargetArchitecture) @@ -130,7 +130,7 @@ false true - true + true $(AssetOutputPath)sharedfx_$(OutputRid)_$(Configuration)_version_badge.svg @@ -189,7 +189,7 @@ true - + true true diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj index b66c8079ba324..d77afe102bcd3 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj @@ -1,9 +1,14 @@ - AppHostVersion - + + + + + true + + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props index cdf7d9647bd6a..d16a703297053 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props @@ -2,7 +2,7 @@ diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj index 4e2bfe3bf0fe8..2e6b33d40481c 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj @@ -47,6 +47,12 @@ - + + + true + + + + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj index 751acd352df88..d806dd1b967b9 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj @@ -8,6 +8,12 @@ - + + + + + true + + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj index e9df60e584594..6c6944327eb22 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj @@ -45,6 +45,12 @@ - + + + true + + + + diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj index ce1ab049241bc..d2f56d0352276 100644 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj +++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj @@ -87,6 +87,12 @@ + + + true + + + diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj index f3c19837bd7af..98b1b7f93e5b4 100644 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj +++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj @@ -26,4 +26,9 @@ + + + true + + \ No newline at end of file diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj index ece93f9b65d3f..a1ccd9435733e 100644 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj +++ b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj @@ -5,4 +5,10 @@ + + + true + + + diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj index 4a6b0edcd6e3b..405fa17fe295d 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/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj index aaa53024b514a..18a776f969b07 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj @@ -74,27 +74,27 @@ - - - + + + - + - + From b8f457b878db99b5abe259a0229198f8c095a0f0 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 31 Mar 2020 20:24:43 -0400 Subject: [PATCH 14/20] Adjusted skip props for host pkgproj --- src/installer/pkg/projects/Directory.Build.props | 1 + src/installer/pkg/projects/Directory.Build.targets | 11 +++++++++++ .../Microsoft.NETCore.DotNetAppHost.pkgproj | 8 +------- .../Microsoft.NETCore.DotNetHost.pkgproj | 7 +------ .../Microsoft.NETCore.DotNetHostPolicy.pkgproj | 8 +------- .../Microsoft.NETCore.DotNetHostResolver.pkgproj | 7 +------ .../pkg/Microsoft.NETCore.App.Crossgen2.pkgproj | 7 +------ .../netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj | 8 +++----- .../netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj | 9 +++------ 9 files changed, 23 insertions(+), 43 deletions(-) diff --git a/src/installer/pkg/projects/Directory.Build.props b/src/installer/pkg/projects/Directory.Build.props index d62f9f540dd57..1cc4680adaa85 100644 --- a/src/installer/pkg/projects/Directory.Build.props +++ b/src/installer/pkg/projects/Directory.Build.props @@ -5,6 +5,7 @@ AnyCPU + false true $(PackageOutputPath) diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets index 24e1366e33487..9c0ec457fda14 100644 --- a/src/installer/pkg/projects/Directory.Build.targets +++ b/src/installer/pkg/projects/Directory.Build.targets @@ -14,6 +14,17 @@ $(Version) + + + + true + + + true From da25949f5b3bc3d9d4778a7c9622cf36eaa9cf2f Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 1 Apr 2020 11:11:56 -0400 Subject: [PATCH 16/20] More feedback --- src/installer/pkg/projects/Directory.Build.targets | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets index 9c0ec457fda14..8485a9690ac92 100644 --- a/src/installer/pkg/projects/Directory.Build.targets +++ b/src/installer/pkg/projects/Directory.Build.targets @@ -18,8 +18,9 @@ For mobile targets, we do not need the host, so allow depproj's to opt in in order to skip building. --> - + true From 0d7f48bbe29584e5c6e1e10f8313d11ea184a11b Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 1 Apr 2020 11:37:53 -0400 Subject: [PATCH 17/20] More feedback --- .../Microsoft.NETCore.DotNetAppHost.pkgproj | 2 +- .../Microsoft.NETCore.DotNetAppHost.props | 2 +- .../Microsoft.NETCore.DotNetHost.pkgproj | 4 +++- .../Microsoft.NETCore.DotNetHostPolicy.pkgproj | 2 +- .../Microsoft.NETCore.DotNetHostPolicy.props | 2 +- .../Microsoft.NETCore.DotNetHostResolver.pkgproj | 2 +- .../Microsoft.NETCore.DotNetHostResolver.props | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj index 917513efa5b05..a363542fa6251 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj @@ -4,5 +4,5 @@ true - + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props index d16a703297053..27384cefe6a6a 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props @@ -2,7 +2,7 @@ diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj index 0aad50509c53f..002cc4ca93cb3 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj @@ -48,6 +48,8 @@ - + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj index 11ba41df90dd1..ccca328154d66 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj @@ -9,5 +9,5 @@ - + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props index cdf7d9647bd6a..27384cefe6a6a 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props @@ -2,7 +2,7 @@ diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj index db1f8e372f060..bb16d54c5bce2 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj @@ -46,6 +46,6 @@ - + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props index cdf7d9647bd6a..27384cefe6a6a 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props @@ -2,7 +2,7 @@ From 84e2f594e696d007e9c60be758a4067de573add9 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 1 Apr 2020 14:43:25 -0400 Subject: [PATCH 18/20] yml syntax in runtime official --- eng/pipelines/runtime-official.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 631171322b0b1..de0ee2f9f591a 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -164,19 +164,19 @@ stages: # # Installer Build for platforms using Mono # - - template: /eng/pipelines/installer/installer-matrix.yml - parameters: - jobParameters: - liveRuntimeBuildConfig: release - liveLibrariesBuildConfig: Release - isOfficialBuild: ${{ variables.isOfficialBuild }} - useOfficialAllConfigurations: true - buildFullPlatformManifest: true - runtimeFlavor: mono - platforms: - - iOS_arm - - iOS_arm64 - - iOS_x64 + - template: /eng/pipelines/installer/installer-matrix.yml + parameters: + jobParameters: + liveRuntimeBuildConfig: release + liveLibrariesBuildConfig: Release + isOfficialBuild: ${{ variables.isOfficialBuild }} + useOfficialAllConfigurations: true + buildFullPlatformManifest: true + runtimeFlavor: mono + platforms: + - iOS_arm + - iOS_arm64 + - iOS_x64 - ${{ if eq(variables.isOfficialBuild, true) }}: - template: /eng/pipelines/official/stages/publish.yml From db8b257a462a9e61eec29442f5c22de438c43a7a Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 1 Apr 2020 15:07:06 -0400 Subject: [PATCH 19/20] Last bit of nits --- src/installer/pkg/projects/Directory.Build.props | 1 - src/installer/pkg/projects/Directory.Build.targets | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/installer/pkg/projects/Directory.Build.props b/src/installer/pkg/projects/Directory.Build.props index 1cc4680adaa85..d62f9f540dd57 100644 --- a/src/installer/pkg/projects/Directory.Build.props +++ b/src/installer/pkg/projects/Directory.Build.props @@ -5,7 +5,6 @@ AnyCPU - false true $(PackageOutputPath) diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets index 8485a9690ac92..665fcbfc76f2d 100644 --- a/src/installer/pkg/projects/Directory.Build.targets +++ b/src/installer/pkg/projects/Directory.Build.targets @@ -16,10 +16,10 @@ true From d0dafc3c38582f46b74ddf39eb035d7fc83eb2d9 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Thu, 2 Apr 2020 08:32:31 -0400 Subject: [PATCH 20/20] Disabled useOfficialAllConfigurations and buildFullPlatformManifest on the official build. --- eng/pipelines/runtime-official.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index de0ee2f9f591a..8d7403d537ccc 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -170,8 +170,8 @@ stages: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: Release isOfficialBuild: ${{ variables.isOfficialBuild }} - useOfficialAllConfigurations: true - buildFullPlatformManifest: true + useOfficialAllConfigurations: false + buildFullPlatformManifest: false runtimeFlavor: mono platforms: - iOS_arm