From 169ff47eb616cb1803d1378a9fc58e452a12cd86 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 7 Feb 2023 17:46:00 -0500 Subject: [PATCH 1/3] We can't pass source-build properties externally, they need to come via SourceBuild.props --- eng/SourceBuild.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 4b4ba966025676..124d33750895dd 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -49,6 +49,7 @@ $(InnerBuildArgs) /p:EnableNgenOptimization=false $(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS) $(InnerBuildArgs) /p:EnablePackageValidation=false + $(InnerBuildArgs) /p:ForceBuildMobileManifests=true $(InnerBuildArgs) /p:ApiCompatValidateAssemblies=false $(InnerBuildArgs) /p:PrimaryRuntimeFlavor=Mono /p:RuntimeFlavor=Mono From 4827deb551bae4a180d64e7c54d7a504fa1813a0 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 7 Feb 2023 17:47:20 -0500 Subject: [PATCH 2/3] Indicate that we can consume emsdk manifest via source-build --- eng/Version.Details.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7241547ec5826..2d15cf6e65590d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,6 +93,7 @@ https://github.com/dotnet/emsdk 3ae16c4a4f58bdeb6621b9a9eec832fb3b56d470 + From 89c643c3ae2845e305a06f7ce36d37e5f3279134 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 8 Feb 2023 13:03:51 -0500 Subject: [PATCH 3/3] Do this another way, then --- Directory.Build.props | 4 ++++ eng/SourceBuild.props | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index e0a179b7423175..bc99842e857e23 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,6 +7,10 @@ For offline builds we still set OfficialBuildId but we need to build all the packages for a single leg only, so we also take DotNetBuildFromSource into account. --> true + + true diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 124d33750895dd..4b4ba966025676 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -49,7 +49,6 @@ $(InnerBuildArgs) /p:EnableNgenOptimization=false $(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS) $(InnerBuildArgs) /p:EnablePackageValidation=false - $(InnerBuildArgs) /p:ForceBuildMobileManifests=true $(InnerBuildArgs) /p:ApiCompatValidateAssemblies=false $(InnerBuildArgs) /p:PrimaryRuntimeFlavor=Mono /p:RuntimeFlavor=Mono