From 1f624c19a0cecf808ea156c0c4b6ddc5df6a6f95 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 30 Jan 2023 16:21:59 -0500 Subject: [PATCH 1/8] Add emsdk Manifest-only build to VMR We want to be sure that VMR builds include our baseline manifests - for WASM support, that means brining in the emsdk repo and building the manifest nupkgs from there (but not the "full" build, which right now isn't truly from source anyway) --- .../content/repo-projects/emsdk.proj | 31 +++++++++++++++++++ .../content/repo-projects/known-good.proj | 1 + src/VirtualMonoRepo/source-mappings.json | 4 +++ 3 files changed, 36 insertions(+) create mode 100644 src/SourceBuild/content/repo-projects/emsdk.proj diff --git a/src/SourceBuild/content/repo-projects/emsdk.proj b/src/SourceBuild/content/repo-projects/emsdk.proj new file mode 100644 index 000000000..012688752 --- /dev/null +++ b/src/SourceBuild/content/repo-projects/emsdk.proj @@ -0,0 +1,31 @@ + + + + + $(TargetRid) + osx-$(Platform) + freebsd-$(Platform) + win-$(Platform) + + <_platformIndex>$(OverrideTargetRid.LastIndexOf('-')) + $(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex))) + $(NETCoreSdkPortableRuntimeIdentifier.Substring($(_platformIndex))) + + $(StandardSourceBuildArgs) + $(BuildCommandArgs) /p:PackageRid=$(OverrideTargetRid) + $(BuildCommandArgs) /p:AssetManifestOS=$(TargetOS) + $(BuildCommandArgs) /p:PlatformName=$(TargetArch) + $(BuildCommandArgs) /p:ForceBuildManifestOnly=true + $(StandardSourceBuildCommand) $(BuildCommandArgs) + + $(ProjectDirectory)global.json + $(ProjectDirectory)NuGet.config + false + + + + + + + + diff --git a/src/SourceBuild/content/repo-projects/known-good.proj b/src/SourceBuild/content/repo-projects/known-good.proj index bfac7141f..6b5adbf75 100644 --- a/src/SourceBuild/content/repo-projects/known-good.proj +++ b/src/SourceBuild/content/repo-projects/known-good.proj @@ -34,6 +34,7 @@ + diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 95c8f5f00..ac3819425 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -75,6 +75,10 @@ "name": "diagnostics", "defaultRemote": "https://github.com/dotnet/diagnostics" }, + { + "name": "emsdk", + "defaultRemote": "https://github.com/dotnet/emsdk" + }, { "name": "format", "defaultRemote": "https://github.com/dotnet/format" From ea949e9c3d141ef53b9143004480c83343557a34 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 30 Jan 2023 17:23:04 -0500 Subject: [PATCH 2/8] Add SB references to Version.Details.xml (thanks Michael) --- eng/Version.Details.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82367408d..08ead60fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -170,10 +170,12 @@ https://github.com/dotnet/emsdk ff2362091c3ce19e09606a7de927670ba5d1cb81 + https://github.com/dotnet/emsdk ff2362091c3ce19e09606a7de927670ba5d1cb81 + https://github.com/dotnet/deployment-tools From d8e40f05759476c7eed5a5dde360060601cae0ad Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 30 Jan 2023 17:26:39 -0500 Subject: [PATCH 3/8] Update eng/Version.Details.xml Co-authored-by: Michael Simons --- eng/Version.Details.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08ead60fe..9566f662f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -175,7 +175,6 @@ https://github.com/dotnet/emsdk ff2362091c3ce19e09606a7de927670ba5d1cb81 - https://github.com/dotnet/deployment-tools From aee7ed43b0cb7cd00f95d75e0c5df63998f318d2 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 31 Jan 2023 12:33:55 -0500 Subject: [PATCH 4/8] Add an installer dep on emsdk --- src/SourceBuild/content/repo-projects/installer.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj index d41b97b78..6713b700b 100644 --- a/src/SourceBuild/content/repo-projects/installer.proj +++ b/src/SourceBuild/content/repo-projects/installer.proj @@ -60,6 +60,7 @@ + From b227afbc703cbe074e950ccea6b4b334455c8e6d Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 31 Jan 2023 13:00:47 -0500 Subject: [PATCH 5/8] Bump to new SB-enabled(?) version of emsdk --- eng/Version.Details.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6a7cf1c9..33c483021 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,18 +167,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 0fe864fc71191ff4ee18e59ef0af2929ca367a11 + 1d9df3320ccdb0bbc40a31314641e1100369745b - + https://github.com/dotnet/emsdk - 0fe864fc71191ff4ee18e59ef0af2929ca367a11 + 1d9df3320ccdb0bbc40a31314641e1100369745b - + https://github.com/dotnet/emsdk - 0fe864fc71191ff4ee18e59ef0af2929ca367a11 + 1d9df3320ccdb0bbc40a31314641e1100369745b https://github.com/dotnet/runtime From 0b508c8c0f09bee0c2ce8545a3f459f76d43de43 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 31 Jan 2023 14:32:49 -0500 Subject: [PATCH 6/8] fix --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33c483021..1114da9aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,16 +167,16 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk 1d9df3320ccdb0bbc40a31314641e1100369745b - + https://github.com/dotnet/emsdk 1d9df3320ccdb0bbc40a31314641e1100369745b - + https://github.com/dotnet/emsdk 1d9df3320ccdb0bbc40a31314641e1100369745b From 4ebb2c636eb9e80af1fd71e9ac596ae01266ce1f Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 31 Jan 2023 15:18:07 -0500 Subject: [PATCH 7/8] fix? --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3f6ef088c..ad25a4749 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -200,9 +200,9 @@ 12.3.2372 16.0.1478 - 8.0.0-alpha.1.23077.4 - 8.0.0-alpha.1.23077.4 - 8.0.0-alpha.1.23077.4 + 8.0.0-preview.2.23081.3 + 8.0.0-preview.2.23081.3 + 8.0.0-preview.2.23081.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version) 8.0.0-alpha.1.23078.5 From 23fd3c04ac1aa9b18923705a1563e1fecee6750f Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 31 Jan 2023 15:37:04 -0500 Subject: [PATCH 8/8] Steal changes from https://github.com/dotnet/installer/pull/15381 to try and fix --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 16 ++++++++-------- src/redist/targets/BundledManifests.targets | 1 - 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1114da9aa..6449521eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,15 +180,15 @@ https://github.com/dotnet/emsdk 1d9df3320ccdb0bbc40a31314641e1100369745b - + https://github.com/dotnet/runtime dfe1076090adad6990747e6abed8bf6699371877 - + https://github.com/dotnet/runtime dfe1076090adad6990747e6abed8bf6699371877 - + https://github.com/dotnet/runtime dfe1076090adad6990747e6abed8bf6699371877 diff --git a/eng/Versions.props b/eng/Versions.props index ad25a4749..ea8fad8f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -200,15 +200,15 @@ 12.3.2372 16.0.1478 - 8.0.0-preview.2.23081.3 - 8.0.0-preview.2.23081.3 - 8.0.0-preview.2.23081.3 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version) + 8.0.0-preview.2.23081.3 + 8.0.0-preview.2.23081.3 + 8.0.0-preview.2.23081.3 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version) - 8.0.0-alpha.1.23078.5 - 8.0.0-alpha.1.23078.5 - 8.0.0-alpha.1.23078.5 - $(MicrosoftNETWorkloadMonoToolchainCurrentManifest80100alpha1Version) + 8.0.0-alpha.1.23078.5 + 8.0.0-alpha.1.23078.5 + 8.0.0-alpha.1.23078.5 + $(MicrosoftNETWorkloadMonoToolchainCurrentManifest80100preview1Version) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 839b4cf46..cb958cc6e 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,6 +1,5 @@ - 8.0.100-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) 8.0.100