From ff79b587b401e8b361c5a8abeccd6d1e2b81ab1d Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 25 Apr 2023 13:14:08 -0400 Subject: [PATCH 01/58] Add dependencies on various Microsoft-built versions of packages --- NuGet.config | 2 ++ eng/Version.Details.xml | 80 +++++++++++++++++++++++++++++++++++++++++ eng/Versions.props | 20 +++++++++++ eng/emsdk.proj | 60 +++++++++++++++++++++++++++---- 4 files changed, 156 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a3888f9d4..8366d7f1ca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28132e62e8..a51e780bac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,86 @@ + + https://github.com/dotnet/binaryen + a85dd05d1cba42294590c5a40b2e24303f0b56e3 + + + https://github.com/dotnet/binaryen + a85dd05d1cba42294590c5a40b2e24303f0b56e3 + + + https://github.com/dotnet/binaryen + a85dd05d1cba42294590c5a40b2e24303f0b56e3 + + + https://github.com/dotnet/binaryen + a85dd05d1cba42294590c5a40b2e24303f0b56e3 + + + https://github.com/dotnet/binaryen + a85dd05d1cba42294590c5a40b2e24303f0b56e3 + + + https://github.com/dotnet/binaryen + a85dd05d1cba42294590c5a40b2e24303f0b56e3 + + + https://github.com/dotnet/cpython + 39b17253329cb3e967da38bf2c98d2d3f0566c0b + + + https://github.com/dotnet/cpython + 39b17253329cb3e967da38bf2c98d2d3f0566c0b + + + https://github.com/dotnet/cpython + 39b17253329cb3e967da38bf2c98d2d3f0566c0b + + + https://github.com/dotnet/cpython + 39b17253329cb3e967da38bf2c98d2d3f0566c0b + + + https://github.com/dotnet/node + 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + + + https://github.com/dotnet/node + 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + + + https://github.com/dotnet/node + 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + + + https://github.com/dotnet/node + 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + + + https://github.com/dotnet/llvm-project + 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + + + https://github.com/dotnet/llvm-project + 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + + + https://github.com/dotnet/llvm-project + 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + + + https://github.com/dotnet/llvm-project + 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + + + https://github.com/dotnet/llvm-project + 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + + + https://github.com/dotnet/llvm-project + 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + diff --git a/eng/Versions.props b/eng/Versions.props index a46be2b020..5c0d9b2b0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,6 +11,26 @@ 3.1.12 7.0.5 6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11)) + 8.0.0-preview.4.23219.2 + 8.0.0-preview.4.23219.2 + 8.0.0-preview.4.23219.2 + 8.0.0-preview.4.23219.2 + 8.0.0-preview.4.23219.2 + 8.0.0-preview.4.23219.2 + 8.0.0-preview.4.23224.1 + 8.0.0-preview.4.23224.1 + 8.0.0-preview.4.23224.1 + 8.0.0-preview.4.23224.1 + 8.0.0-preview.4.23220.1 + 8.0.0-preview.4.23220.1 + 8.0.0-preview.4.23220.1 + 8.0.0-preview.4.23220.1 + 14.0.0-alpha.1.23221.2 + 14.0.0-alpha.1.23221.2 + 14.0.0-alpha.1.23221.2 + 14.0.0-alpha.1.23221.2 + 14.0.0-alpha.1.23221.2 + 14.0.0-alpha.1.23221.2 false diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 18de4d0a59..643091cf8e 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -1,6 +1,57 @@ - - - + + + linux + osx + win + $(runtimelinuxx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion) + $(runtimewinx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion) + $(runtimeosxx64MicrosoftNETCoreRuntimeWasmLLVMTransportVersion) + $(runtimelinuxx64MicrosoftNETCoreRuntimeWasmBinaryenTransportVersion) + $(runtimewinx64MicrosoftNETCoreRuntimeWasmBinaryenTransportVersion) + $(runtimeosxx64MicrosoftNETCoreRuntimeWasmBinaryenTransportVersion) + $(runtimewinx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion) + $(runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion) + $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion) + $(runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion) + + + + + + + + + + + + <_PackageReferenceDeduplicated Include="@(PackageReference->Distinct())" /> + + + @@ -183,8 +234,6 @@ - - @@ -209,5 +258,4 @@ Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" /> - From dffe3347df2dcc714060c307494445ce9c3ec657 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 25 Apr 2023 13:34:43 -0400 Subject: [PATCH 02/58] Use standardized build.sh etc, instead of modded repo version --- build.cmd | 2 +- build.sh | 42 ++++------ eng/azure-pipelines.yml | 6 +- eng/build.ps1 | 132 +++++++++++++++++++++++++++++++ eng/build.sh | 170 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 323 insertions(+), 29 deletions(-) create mode 100644 eng/build.ps1 create mode 100644 eng/build.sh diff --git a/build.cmd b/build.cmd index b686365c1c..9474e960d7 100755 --- a/build.cmd +++ b/build.cmd @@ -4,5 +4,5 @@ setlocal set _args=%* if "%~1"=="-?" set _args=-help -powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0eng\common\build.ps1" -restore -build -pack %_args% +powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0eng\build.ps1" %_args% exit /b %ERRORLEVEL% diff --git a/build.sh b/build.sh index f5aa1815bb..da2ba1a158 100755 --- a/build.sh +++ b/build.sh @@ -2,6 +2,15 @@ source="${BASH_SOURCE[0]}" +function is_cygwin_or_mingw() +{ + case $(uname -s) in + CYGWIN*) return 0;; + MINGW*) return 0;; + *) return 1;; + esac +} + # resolve $SOURCE until the file is no longer a symlink while [[ -h $source ]]; do scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" @@ -12,30 +21,13 @@ while [[ -h $source ]]; do [[ $source != /* ]] && source="$scriptroot/$source" done -usage() -{ - echo "Common settings:" - echo " --help Print help and exit (short: -h)" - echo "" -} - -inner_args= -properties= - -while [[ $# > 0 ]]; do - opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" - case "$opt" in - -help|-h) - usage - exit 0 - ;; - *) - inner_args="$inner_args $1" - ;; - esac - shift -done - scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -"$scriptroot/eng/common/build.sh" --restore --build --pack $inner_args $properties +if is_cygwin_or_mingw; then + # if bash shell running on Windows (not WSL), + # pass control to powershell build script. + scriptroot=$(cygpath -d "$scriptroot") + powershell -c "$scriptroot\\build.cmd" $@ +else + "$scriptroot/eng/build.sh" $@ +fi diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 13b4f65245..9850e5411c 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -44,7 +44,7 @@ stages: vmImage: macOS-11 steps: - bash: | - ./build.sh -ci -configuration $(_BuildConfig) /p:PackageRID=osx-x64 /p:AssetManifestOS=osx /p:PlatformName=x64 $(_InternalBuildArgs) $(_NonWindowsInternalPublishArg) + ./build.sh --arch x64 --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=osx-x64 /p:AssetManifestOS=osx /p:PlatformName=x64 $(_InternalBuildArgs) $(_NonWindowsInternalPublishArg) displayName: Build - publish: artifacts/packages artifact: Packages_macOS @@ -86,7 +86,7 @@ stages: demands: ImageOverride -equals build.ubuntu.2204.amd64 steps: - bash: | - ./build.sh -ci -configuration $(_BuildConfig) /p:PackageRID=linux-x64 /p:AssetManifestOS=linux /p:PlatformName=x64 $(_InternalBuildArgs) $(_NonWindowsInternalPublishArg) + ./build.sh --arch x64 --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=linux-x64 /p:AssetManifestOS=linux /p:PlatformName=x64 $(_InternalBuildArgs) $(_NonWindowsInternalPublishArg) displayName: Build - publish: artifacts/packages artifact: Packages_Linux @@ -156,7 +156,7 @@ stages: displayName: Fetch storage.googleapis.com certificate condition: eq(variables['System.TeamProject'], 'internal') - script: | - .\build.cmd -ci -configuration $(_BuildConfig) -sign -publish /p:PackageRID=win-x64 /p:AssetManifestOS=win /p:PlatformName=x64 /p:workloadPackagesPath=$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\Shipping $(_InternalBuildArgs) + .\build.cmd -arch x64 -restore -build -pack -ci -configuration $(_BuildConfig) -sign -publish /p:PackageRID=win-x64 /p:AssetManifestOS=win /p:PlatformName=x64 /p:workloadPackagesPath=$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\Shipping $(_InternalBuildArgs) displayName: Build and Publish - publish: artifacts/packages artifact: Packages_Windows diff --git a/eng/build.ps1 b/eng/build.ps1 new file mode 100644 index 0000000000..bc12cebbdc --- /dev/null +++ b/eng/build.ps1 @@ -0,0 +1,132 @@ +[CmdletBinding(PositionalBinding=$false)] +Param( + [switch][Alias('h')]$help, + [switch][Alias('b')]$build, + [switch][Alias('t')]$test, + [switch]$buildtests, + [string][Alias('c')]$configuration = "Debug", + [string][Alias('f')]$framework, + [string]$vs, + [string]$os, + [switch]$allconfigurations, + [switch]$coverage, + [string]$testscope, + [string]$arch, + [string]$runtimeConfiguration, + [string]$librariesConfiguration, + [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties +) + +function Get-Help() { + Write-Host "Common settings:" + Write-Host " -os Build operating system: Windows_NT or Unix" + Write-Host " -arch Build platform: x86, x64, arm or arm64" + Write-Host " -configuration Build configuration: Debug or Release (short: -c)" + Write-Host " -verbosity MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" + Write-Host " -binaryLog Output binary log (short: -bl)" + Write-Host " -help Print help and exit (short: -h)" + Write-Host "" + + Write-Host "Actions (defaults to -restore -build):" + Write-Host " -restore Restore dependencies (short: -r)" + Write-Host " -build Build all source projects (short: -b)" + Write-Host " -buildtests Build all test projects" + Write-Host " -rebuild Rebuild all source projects" + Write-Host " -test Run all unit tests (short: -t)" + Write-Host " -pack Package build outputs into NuGet packages" + Write-Host " -sign Sign build outputs" + Write-Host " -publish Publish artifacts (e.g. symbols)" + Write-Host " -clean Clean the solution" + Write-Host "" + + Write-Host "Libraries settings:" + Write-Host " -vs Open the solution with VS for Test Explorer support. Path or solution name (ie -vs Microsoft.CSharp)" + Write-Host " -framework Build framework: netcoreapp5.0 or net472 (short: -f)" + Write-Host " -coverage Collect code coverage when testing" + Write-Host " -testscope Scope tests, allowed values: innerloop, outerloop, all" + Write-Host " -allconfigurations Build packages for all build configurations" + Write-Host "" + + Write-Host "Command-line arguments not listed above are passed thru to msbuild." + Write-Host "The above arguments can be shortened as much as to be unambiguous (e.g. -con for configuration, -t for test, etc.)." +} + +if ($help -or (($null -ne $properties) -and ($properties.Contains('/help') -or $properties.Contains('/?')))) { + Get-Help + exit 0 +} + +# VS Test Explorer support for libraries +if ($vs) { + . $PSScriptRoot\common\tools.ps1 + + # Microsoft.DotNet.CoreSetup.sln is special - hosting tests are currently meant to run on the + # bootstrapped .NET Core, not on the live-built runtime. + if ([System.IO.Path]::GetFileName($vs) -ieq "Microsoft.DotNet.CoreSetup.sln") { + if (-Not (Test-Path $vs)) { + $vs = Join-Path "$PSScriptRoot\..\src\installer" $vs + } + + # This tells .NET Core to use the bootstrapped runtime to run the tests + $env:DOTNET_ROOT=InitializeDotNetCli -install:$false + } + else { + if (-Not (Test-Path $vs)) { + $vs = Join-Path "$PSScriptRoot\..\src\libraries" $vs | Join-Path -ChildPath "$vs.sln" + } + + $archTestHost = if ($arch) { $arch } else { "x64" } + + # This tells .NET Core to use the same dotnet.exe that build scripts use + $env:DOTNET_ROOT="$PSScriptRoot\..\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-$configuration-$archTestHost"; + $env:DEVPATH="$PSScriptRoot\..\artifacts\bin\testhost\net472-Windows_NT-$configuration-$archTestHost"; + } + + # This tells MSBuild to load the SDK from the directory of the bootstrapped SDK + $env:DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=InitializeDotNetCli -install:$false + + # This tells .NET Core not to go looking for .NET Core in other places + $env:DOTNET_MULTILEVEL_LOOKUP=0; + + # Put our local dotnet.exe on PATH first so Visual Studio knows which one to use + $env:PATH=($env:DOTNET_ROOT + ";" + $env:PATH); + + # Launch Visual Studio with the locally defined environment variables + ."$vs" + + exit 0 +} + +# Check if an action is passed in +$actions = "r","restore","b","build","buildtests","rebuild","t","test","pack","sign","publish","clean" +$actionPassedIn = @(Compare-Object -ReferenceObject @($PSBoundParameters.Keys) -DifferenceObject $actions -ExcludeDifferent -IncludeEqual).Length -ne 0 +if ($null -ne $properties -and $actionPassedIn -ne $true) { + $actionPassedIn = @(Compare-Object -ReferenceObject $properties -DifferenceObject $actions.ForEach({ "-" + $_ }) -ExcludeDifferent -IncludeEqual).Length -ne 0 +} + +if (!$actionPassedIn) { + $arguments = "-restore -build" +} + +$possibleDirToBuild = if($properties.Length -gt 0) { $properties[0]; } else { $null } + +foreach ($argument in $PSBoundParameters.Keys) +{ + switch($argument) + { + "build" { $arguments += " -build" } + "buildtests" { if ($build -eq $true) { $arguments += " /p:BuildTests=true" } else { $arguments += " -build /p:BuildTests=only" } } + "test" { $arguments += " -test" } + "configuration" { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " /p:ConfigurationGroup=$configuration -configuration $configuration" } + "runtimeConfiguration" { $arguments += " /p:RuntimeConfiguration=$((Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])))" } + "framework" { $arguments += " /p:BuildTargetFramework=$($PSBoundParameters[$argument].ToLowerInvariant())" } + "os" { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" } + "allconfigurations" { $arguments += " /p:BuildAllConfigurations=true" } + "arch" { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" } + "properties" { $arguments += " " + $properties } + default { $arguments += " /p:$argument=$($PSBoundParameters[$argument])" } + } +} + +Invoke-Expression "& `"$PSScriptRoot/common/build.ps1`" $arguments" +exit $lastExitCode diff --git a/eng/build.sh b/eng/build.sh new file mode 100644 index 0000000000..becb206742 --- /dev/null +++ b/eng/build.sh @@ -0,0 +1,170 @@ +#!/usr/bin/env bash + +set -ue + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +usage() +{ + echo "Common settings:" + echo " --os Build operating system: Windows_NT or Unix" + echo " --arch Build platform: x86, x64, arm or arm64" + echo " --configuration Build configuration: Debug or Release (short: -c)" + echo " --verbosity MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" + echo " --binaryLog Output binary log (short: -bl)" + echo " --cross Optional argument to signify cross compilation" + echo " --help Print help and exit (short: -h)" + echo "" + + echo "Actions (defaults to --restore --build):" + echo " --restore Restore dependencies (short: -r)" + echo " --build Build all source projects (short: -b)" + echo " --buildtests Build all test projects" + echo " --rebuild Rebuild all source projects" + echo " --test Run all unit tests (short: -t)" + echo " --pack Package build outputs into NuGet packages" + echo " --sign Sign build outputs" + echo " --publish Publish artifacts (e.g. symbols)" + echo " --clean Clean the solution" + echo "" + + echo "Libraries settings:" + echo " --framework Build framework: netcoreapp or net472 (short: -f)" + echo " --coverage Collect code coverage when testing" + echo " --testscope Test scope, allowed values: innerloop, outerloop, all" + echo " --allconfigurations Build packages for all build configurations" + echo "" + + echo "Native build settings:" + echo " --clang Optional argument to build using clang in PATH (default)" + echo " --clangx.y Optional argument to build using clang version x.y" + echo " --cmakeargs User-settable additional arguments passed to CMake." + echo " --gcc Optional argument to build using gcc in PATH (default)" + echo " --gccx.y Optional argument to build using gcc version x.y" + + echo "Command line arguments starting with '/p:' are passed through to MSBuild." + echo "Arguments can also be passed in with a single hyphen." +} + +arguments='' +cmakeargs='' +extraargs='' +build=false +buildtests=false +checkedPossibleDirectoryToBuild=false + +# Check if an action is passed in +declare -a actions=("r" "restore" "b" "build" "buildtests" "rebuild" "t" "test" "pack" "sign" "publish" "clean") +actInt=($(comm -12 <(printf '%s\n' "${actions[@]/#/-}" | sort) <(printf '%s\n' "${@/#--/-}" | sort))) + +while [[ $# > 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -help|-h) + usage + exit 0 + ;; + -arch) + arguments="$arguments /p:ArchGroup=$2 /p:TargetArchitecture=$2" + shift 2 + ;; + -configuration|-c) + val="$(tr '[:lower:]' '[:upper:]' <<< ${2:0:1})${2:1}" + arguments="$arguments /p:ConfigurationGroup=$val -configuration $val" + shift 2 + ;; + -framework|-f) + val="$(echo "$2" | awk '{print tolower($0)}')" + arguments="$arguments /p:BuildTargetFramework=$val" + shift 2 + ;; + -os) + arguments="$arguments /p:OSGroup=$2" + shift 2 + ;; + -allconfigurations) + arguments="$arguments /p:BuildAllConfigurations=true" + shift 1 + ;; + -build) + build=true + arguments="$arguments -build" + shift 1 + ;; + -buildtests) + buildtests=true + shift 1 + ;; + -testscope) + arguments="$arguments /p:TestScope=$2" + shift 2 + ;; + -coverage) + arguments="$arguments /p:Coverage=true" + shift 1 + ;; + -stripsymbols) + arguments="$arguments /p:BuildNativeStripSymbols=true" + shift 1 + ;; + -runtimeconfiguration) + val="$(tr '[:lower:]' '[:upper:]' <<< ${2:0:1})${2:1}" + arguments="$arguments /p:RuntimeConfiguration=$val" + shift 2 + ;; + -librariesconfiguration) + arguments="$arguments /p:LibrariesConfiguration=$2" + shift 2 + ;; + -cross) + arguments="$arguments /p:CrossBuild=True" + shift 1 + ;; + -clang*) + arguments="$arguments /p:Compiler=$opt" + shift 1 + ;; + -cmakeargs) + cmakeargs="${cmakeargs} ${opt} $2" + shift 2 + ;; + -gcc*) + arguments="$arguments /p:Compiler=$opt" + shift 1 + ;; + *) + ea=$1 + + extraargs="$extraargs $ea" + shift 1 + ;; + esac +done + +if [[ "$buildtests" == true ]]; then + if [[ "$build" == true ]]; then + arguments="$arguments /p:BuildTests=true" + else + arguments="$arguments -build /p:BuildTests=only" + fi +fi + +if [ ${#actInt[@]} -eq 0 ]; then + arguments="-restore -build $arguments" +fi + +# URL-encode space (%20) to avoid quoting issues until the msbuild call in /eng/common/tools.sh. +# In *proj files (XML docs), URL-encoded string are rendered in their decoded form. +cmakeargs="${cmakeargs// /%20}" +arguments="$arguments /p:CMakeArgs=\"$cmakeargs\" $extraargs" +"$scriptroot/common/build.sh" $arguments From f9a1c95d7a817c3f884adb52d81538af99586ca8 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 25 Apr 2023 13:35:11 -0400 Subject: [PATCH 03/58] Fix SDK inclusion --- global.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index ce36b21ac6..5bafea0625 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,7 @@ }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23224.1" + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23224.1", + "Microsoft.Build.Traversal": "2.0.34" } } From eb8392de94a3710772c2e50968f9ce9080be80a8 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 25 Apr 2023 13:39:52 -0400 Subject: [PATCH 04/58] Ensure we ignore packages dir --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ead4006514..89301137c2 100644 --- a/.gitignore +++ b/.gitignore @@ -40,5 +40,7 @@ __pycache__ /spidermonkey /binaryen +# MSFT ignores /artifacts /.dotnet +/.packages From 2e55f2eaacb4fbf840cf11a910030b1e4fdd45ed Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 25 Apr 2023 15:06:05 -0400 Subject: [PATCH 05/58] Mostly get emsdk recognising msft-built directories --- Directory.Build.props | 27 +++ emsdk.py | 4 +- emsdk_manifest.json | 427 +++++------------------------------------- eng/emsdk.proj | 49 +++++ 4 files changed, 122 insertions(+), 385 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index defa3f038b..9d33031669 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,4 +10,31 @@ $(VersionPrefix) + + + + + <__ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory) + $(__ProjectDir)\ + $(ProjectDir) + $(MSBuildThisFileDirectory) + + $(RootRepoDir)artifacts\obj\$(PlatformConfigPathPart)\ + + $(__SourceDir)\ + $(ProjectDir)src\ + + $(__RootBinDir)\ + $(RootRepoDir)artifacts\ + + $(__BinDir)\ + $(RootBinDir)bin\$(PlatformConfigPathPart)\ + + + + $(ProjectDir)\binaryen\$(VersionPrefix) + $(ProjectDir)\node\$(VersionPrefix) + $(ProjectDir)\python\$(VersionPrefix) + $(ProjectDir)\llvm\$(VersionPrefix) + diff --git a/emsdk.py b/emsdk.py index 6788120d32..6ba8681c8f 100644 --- a/emsdk.py +++ b/emsdk.py @@ -1719,7 +1719,9 @@ def is_installed(self, skip_version_check=False): content_exists = False if hasattr(self, 'custom_is_installed_script'): - if self.custom_is_installed_script == 'is_optimizer_installed': + if self.custom_is_installed_script == 'lie_and_say_yes': + return True + elif self.custom_is_installed_script == 'is_optimizer_installed': return is_optimizer_installed(self) elif self.custom_is_installed_script == 'is_binaryen_installed': return is_binaryen_installed(self) diff --git a/emsdk_manifest.json b/emsdk_manifest.json index b14385b655..b867ec1760 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -1,34 +1,16 @@ { "tools": [ { - "id": "llvm-git", - "version": "main", - "bitness": 32, - "install_path": "llvm/git", - "git_branch": "main", - "url": "https://github.com/llvm/llvm-project.git", - "custom_install_script": "build_llvm", - "only_supports_wasm": true, - "activated_path": "%installation_dir%/%llvm_build_bin_dir%", - "activated_cfg": "LLVM_ROOT='%installation_dir%/%llvm_build_bin_dir%'", - "activated_env": "LLVM_ROOT=%installation_dir%/%llvm_build_bin_dir%;EMCC_WASM_BACKEND=1", - "cmake_build_type": "Release" - }, - { - "id": "llvm-git", - "version": "main", - "bitness": 64, - "install_path": "llvm/git", - "git_branch": "main", - "url": "https://github.com/llvm/llvm-project.git", - "custom_install_script": "build_llvm", + "id": "llvm", + "version": "8.0.0", + "url": "https://github.com/dotnet/llvm-project.git", + "custom_is_installed_script": "lie_and_say_yes", "only_supports_wasm": true, - "activated_path": "%installation_dir%/%llvm_build_bin_dir%", - "activated_cfg": "LLVM_ROOT='%installation_dir%/%llvm_build_bin_dir%'", - "activated_env": "LLVM_ROOT=%installation_dir%/%llvm_build_bin_dir%;EMCC_WASM_BACKEND=1", + "activated_path": "%installation_dir%/bin", + "activated_cfg": "LLVM_ROOT='%installation_dir%/bin'", + "activated_env": "LLVM_ROOT=%installation_dir%/bin;EMCC_WASM_BACKEND=1", "cmake_build_type": "Release" }, - { "id": "releases", "version": "%releases-tag%", @@ -56,301 +38,20 @@ "activated_cfg": "LLVM_ROOT='%installation_dir%/bin';BINARYEN_ROOT='%installation_dir%';EMSCRIPTEN_ROOT='%installation_dir%/emscripten'", "emscripten_releases_hash": "%releases-tag%" }, - { "id": "node", - "version": "8.9.1", - "bitness": 32, - "arch": "x86", - "windows_url": "node-v8.9.1-win-x86.zip", - "linux_url": "node-v8.9.1-linux-x86.tar.xz", + "version": "8.0.0", "activated_path": "%installation_dir%/bin", "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%", - "is_old": true - }, - { - "id": "node", - "version": "8.9.1", - "arch": "arm", - "bitness": 32, - "linux_url": "https://nodejs.org/dist/v8.9.1/node-v8.9.1-linux-armv7l.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%", - "is_old": true - }, - { - "id": "node", - "version": "8.9.1", - "bitness": 64, - "arch": "x86_64", - "macos_url": "node-v8.9.1-darwin-x64.tar.gz", - "windows_url": "node-v8.9.1-win-x64.zip", - "linux_url": "node-v8.9.1-linux-x64.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%", - "is_old": true - }, - { - "id": "node", - "version": "8.9.1", - "arch": "aarch64", - "bitness": 64, - "linux_url": "node-v8.9.1-linux-arm64.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%", - "is_old": true - }, - { - "id": "node", - "version": "12.18.1", - "bitness": 32, - "arch": "x86", - "windows_url": "node-v12.18.1-win-x86.zip", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%", - "is_old": true - }, - { - "id": "node", - "version": "12.18.1", - "arch": "arm", - "bitness": 32, - "linux_url": "node-v12.18.1-linux-armv7l.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%", - "is_old": true - }, - { - "id": "node", - "version": "12.18.1", - "bitness": 64, - "arch": "x86_64", - "macos_url": "node-v12.18.1-darwin-x64.tar.gz", - "windows_url": "node-v12.18.1-win-x64.zip", - "linux_url": "node-v12.18.1-linux-x64.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%", - "is_old": true - }, - { - "id": "node", - "version": "12.18.1", - "arch": "aarch64", - "bitness": 64, - "linux_url": "node-v12.18.1-linux-arm64.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%", - "is_old": true - }, - - - { - "id": "node", - "version": "14.18.2", - "bitness": 32, - "arch": "x86", - "windows_url": "node-v14.18.2-win-x86.zip", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" - }, - { - "id": "node", - "version": "14.18.2", - "arch": "arm", - "bitness": 32, - "linux_url": "node-v14.18.2-linux-armv7l.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" - }, - { - "id": "node", - "version": "14.18.2", - "bitness": 64, - "arch": "x86_64", - "macos_url": "node-v14.18.2-darwin-x64.tar.gz", - "windows_url": "node-v14.18.2-win-x64.zip", - "linux_url": "node-v14.18.2-linux-x64.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" - }, - { - "id": "node", - "version": "14.18.2", - "arch": "aarch64", - "bitness": 64, - "macos_url": "node-v14.18.2-darwin-x64.tar.gz", - "linux_url": "node-v14.18.2-linux-arm64.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" - }, - - - { - "id": "node", - "version": "14.15.5", - "bitness": 32, - "arch": "x86", - "windows_url": "node-v14.15.5-win-x86.zip", - "activated_path": "%installation_dir%/bin", - "activated_path_skip": "node", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" - }, - { - "id": "node", - "version": "14.15.5", - "arch": "arm", - "bitness": 32, - "linux_url": "node-v14.15.5-linux-armv7l.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_path_skip": "node", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" - }, - { - "id": "node", - "version": "14.15.5", - "bitness": 64, - "arch": "x86_64", - "macos_url": "node-v14.15.5-darwin-x64.tar.gz", - "windows_url": "node-v14.15.5-win-x64.zip", - "linux_url": "node-v14.15.5-linux-x64.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_path_skip": "node", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" - }, - { - "id": "node", - "version": "14.15.5", - "arch": "aarch64", - "bitness": 64, - "macos_url": "node-v14.15.5-darwin-x64.tar.gz", - "linux_url": "node-v14.15.5-linux-arm64.tar.xz", - "activated_path": "%installation_dir%/bin", - "activated_path_skip": "node", - "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'", - "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%" - }, - - - { - "id": "python", - "version": "2.7.13.1", - "bitness": 32, - "arch": "x86", - "windows_url": "WinPython-32bit-2.7.13.1Zero.zip", - "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13/python%.exe%'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13/python%.exe%", - "is_old": true - }, - { - "id": "python", - "version": "2.7.13.1", - "bitness": 64, - "arch": "x86_64", - "windows_url": "WinPython-64bit-2.7.13.1Zero.zip", - "activated_cfg": "PYTHON='%installation_dir%/python-2.7.13.amd64/python%.exe%'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python-2.7.13.amd64/python%.exe%", - "is_old": true - }, - { - "id": "python", - "version": "3.7.4", - "bitness": 32, - "arch": "x86", - "windows_url": "python-3.7.4-embed-win32-patched.zip", - "activated_cfg": "PYTHON='%installation_dir%/python.exe'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe", - "is_old": true - }, - { - "id": "python", - "version": "3.7.4", - "bitness": 64, - "arch": "x86_64", - "windows_url": "python-3.7.4-embed-amd64-patched.zip", - "activated_cfg": "PYTHON='%installation_dir%/python.exe'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe", - "is_old": true - }, - { - "id": "python", - "version": "3.7.4-pywin32", - "bitness": 32, - "arch": "x86", - "windows_url": "python-3.7.4-embed-win32+pywin32.zip", - "activated_cfg": "PYTHON='%installation_dir%/python.exe'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe", - "is_old": true - }, - { - "id": "python", - "version": "3.7.4-pywin32", - "bitness": 64, - "arch": "x86_64", - "windows_url": "python-3.7.4-embed-amd64+pywin32.zip", - "activated_cfg": "PYTHON='%installation_dir%/python.exe'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe", - "is_old": true - }, - { - "id": "python", - "version": "3.7.4-2", - "bitness": 64, - "arch": "x86_64", - "macos_url": "python-3.7.4-2-macos.tar.gz", - "activated_cfg": "PYTHON='%installation_dir%/bin/python3'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.7/site-packages/certifi/cacert.pem", - "is_old": true - }, - { - "id": "python", - "version": "3.9.2-nuget", - "bitness": 64, - "arch": "x86_64", - "windows_url": "python-3.9.2-4-amd64+pywin32.zip", - "activated_cfg": "PYTHON='%installation_dir%/python.exe'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe" - }, - { - "id": "python", - "version": "3.9.2", - "bitness": 64, - "arch": "x86_64", - "windows_url": "python-3.9.2-1-embed-amd64+pywin32.zip", - "activated_cfg": "PYTHON='%installation_dir%/python.exe'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/python.exe" + "custom_is_installed_script": "lie_and_say_yes" }, { "id": "python", - "version": "3.9.2", - "bitness": 64, - "arch": "x86_64", - "macos_url": "python-3.9.2-3-macos-x86_64.tar.gz", - "activated_cfg": "PYTHON='%installation_dir%/bin/python3'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.9/site-packages/certifi/cacert.pem" - }, - { - "id": "python", - "version": "3.9.2", - "bitness": 64, - "arch": "aarch64", - "macos_url": "python-3.9.2-1-macos-arm64.tar.gz", - "activated_cfg": "PYTHON='%installation_dir%/bin/python3'", - "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.9/site-packages/certifi/cacert.pem" + "version": "8.0.0", + "activated_cfg": "PYTHON='%installation_dir%/bin/python3%.exe%'", + "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.9/site-packages/certifi/cacert.pem", + "custom_is_installed_script": "lie_and_say_yes" }, { "id": "java", @@ -410,38 +111,6 @@ "activated_path": "%installation_dir%", "activated_env": "EMSCRIPTEN=%installation_dir%" }, - { - "id": "binaryen", - "version": "tag-%binaryen_tag%", - "bitness": 32, - "append_bitness": false, - "windows_url": "https://github.com/WebAssembly/binaryen/archive/%binaryen_tag%.zip", - "unix_url": "https://github.com/WebAssembly/binaryen/archive/%binaryen_tag%.tar.gz", - "zipfile_prefix": "binaryen-e", - "activated_cfg": "BINARYEN_ROOT='%installation_dir%%generator_prefix%_64bit_binaryen'", - "activated_path": "%installation_dir%%generator_prefix%_64bit_binaryen/bin", - "activated_env": "BINARYEN_ROOT=%installation_dir%%generator_prefix%_64bit_binaryen", - "cmake_build_type": "Release", - "custom_install_script": "build_binaryen", - "custom_is_installed_script": "is_binaryen_installed", - "custom_uninstall_script": "uninstall_binaryen" - }, - { - "id": "binaryen", - "version": "tag-%binaryen_tag%", - "bitness": 64, - "append_bitness": false, - "windows_url": "https://github.com/WebAssembly/binaryen/archive/%binaryen_tag%.zip", - "unix_url": "https://github.com/WebAssembly/binaryen/archive/%binaryen_tag%.tar.gz", - "zipfile_prefix": "binaryen-e", - "activated_cfg": "BINARYEN_ROOT='%installation_dir%%generator_prefix%_64bit_binaryen'", - "activated_path": "%installation_dir%%generator_prefix%_64bit_binaryen/bin", - "activated_env": "BINARYEN_ROOT=%installation_dir%%generator_prefix%_64bit_binaryen", - "cmake_build_type": "Release", - "custom_install_script": "build_binaryen", - "custom_is_installed_script": "is_binaryen_installed", - "custom_uninstall_script": "uninstall_binaryen" - }, { "id": "emscripten", "version": "main", @@ -470,33 +139,14 @@ }, { "id": "binaryen", - "version": "main", - "bitness": 32, - "append_bitness": false, - "url": "https://github.com/WebAssembly/binaryen.git", - "git_branch": "main", - "activated_cfg": "BINARYEN_ROOT='%installation_dir%%generator_prefix%_32bit_binaryen'", - "activated_path": "%installation_dir%%generator_prefix%_32bit_binaryen/bin", - "activated_env": "BINARYEN_ROOT=%installation_dir%%generator_prefix%_32bit_binaryen", - "cmake_build_type": "Release", - "custom_install_script": "build_binaryen", - "custom_is_installed_script": "is_binaryen_installed", - "custom_uninstall_script": "uninstall_binaryen" - }, - { - "id": "binaryen", - "version": "main", - "bitness": 64, - "append_bitness": false, - "url": "https://github.com/WebAssembly/binaryen.git", - "git_branch": "main", - "activated_cfg": "BINARYEN_ROOT='%installation_dir%%generator_prefix%_64bit_binaryen'", - "activated_path": "%installation_dir%%generator_prefix%_64bit_binaryen/bin", - "activated_env": "BINARYEN_ROOT=%installation_dir%%generator_prefix%_64bit_binaryen", + "version": "8.0.0", + "url": "https://github.com/dotnet/binaryen.git", + "git_branch": "dotnet/main", + "activated_cfg": "BINARYEN_ROOT='%installation_dir%'", + "activated_path": "%installation_dir%/bin", + "activated_env": "BINARYEN_ROOT=%installation_dir%", "cmake_build_type": "Release", - "custom_install_script": "build_binaryen", - "custom_is_installed_script": "is_binaryen_installed", - "custom_uninstall_script": "uninstall_binaryen" + "custom_is_installed_script": "lie_and_say_yes" }, { "id": "gnu", @@ -548,39 +198,39 @@ "sdks": [ { "version": "main", - "bitness": 64, - "uses": ["python-3.9.2-nuget-64bit", "llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"], + "uses": ["python-8.0.0", "llvm-8.0.0", "node-8.0.0", "emscripten-main-64bit", "binaryen-8.0.0"], "os": "win" }, { "version": "main", - "bitness": 64, - "uses": ["python-3.9.2-64bit", "llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"], + "uses": ["python-8.0.0", "llvm-8.0.0", "node-8.0.0", "emscripten-main-64bit", "binaryen-8.0.0"], "os": "macos" }, { "version": "main", - "bitness": 64, - "uses": ["llvm-git-main-64bit", "node-14.18.2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"], + "uses": ["llvm-8.0.0", "emscripten-main-32bit", "binaryen-8.0.0"], "os": "linux" }, { - "version": "main", - "bitness": 32, - "uses": ["llvm-git-main-32bit", "emscripten-main-32bit", "binaryen-main-32bit"], - "os": "linux" + "version": "releases-%releases-tag%", + "bitness": 64, + "uses": ["releases-%releases-tag%-64bit"], + "os": "linux", + "arch": "x86_64", + "custom_install_script": "emscripten_npm_install" }, { "version": "releases-%releases-tag%", "bitness": 64, - "uses": ["node-14.18.2-64bit", "releases-%releases-tag%-64bit"], + "uses": ["releases-%releases-tag%-64bit"], "os": "linux", + "arch": "aarch64", "custom_install_script": "emscripten_npm_install" }, { "version": "releases-%releases-tag%", "bitness": 64, - "uses": ["node-14.18.2-64bit", "python-3.9.2-64bit", "releases-%releases-tag%-64bit"], + "uses": ["node-8.0.0", "python-8.0.0", "releases-%releases-tag%-64bit"], "os": "macos", "arch": "x86_64", "custom_install_script": "emscripten_npm_install" @@ -588,7 +238,7 @@ { "version": "releases-%releases-tag%", "bitness": 64, - "uses": ["node-14.18.2-64bit", "python-3.9.2-64bit", "releases-%releases-tag%-64bit"], + "uses": ["node-8.0.0", "python-8.0.0", "releases-%releases-tag%-64bit"], "os": "macos", "arch": "aarch64", "custom_install_script": "emscripten_npm_install" @@ -596,8 +246,17 @@ { "version": "releases-%releases-tag%", "bitness": 64, - "uses": ["node-14.18.2-64bit", "python-3.9.2-nuget-64bit", "java-8.152-64bit", "releases-%releases-tag%-64bit"], + "uses": ["node-8.0.0", "python-8.0.0", "releases-%releases-tag%-64bit"], "os": "win", + "arch": "x86_64", + "custom_install_script": "emscripten_npm_install" + }, + { + "version": "releases-%releases-tag%", + "bitness": 64, + "uses": ["node-8.0.0", "python-8.0.0", "releases-%releases-tag%-64bit"], + "os": "win", + "arch": "aarch64", "custom_install_script": "emscripten_npm_install" } ] diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 643091cf8e..6a4c741e22 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -52,6 +52,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 51d8fc566f062aaf1ad19eaa3f43c81b14278e44 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 26 Apr 2023 14:43:58 -0400 Subject: [PATCH 06/58] Add emscripten to the mix --- Directory.Build.props | 1 + emsdk_manifest.json | 131 +++------------------------------------- eng/Version.Details.xml | 4 ++ eng/Versions.props | 1 + eng/emsdk.proj | 17 ++++++ 5 files changed, 30 insertions(+), 124 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 9d33031669..a6f26df53b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -36,5 +36,6 @@ $(ProjectDir)\node\$(VersionPrefix) $(ProjectDir)\python\$(VersionPrefix) $(ProjectDir)\llvm\$(VersionPrefix) + $(ProjectDir)\emscripten\$(VersionPrefix) diff --git a/emsdk_manifest.json b/emsdk_manifest.json index b867ec1760..743cb0aa75 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -53,89 +53,17 @@ "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.9/site-packages/certifi/cacert.pem", "custom_is_installed_script": "lie_and_say_yes" }, - { - "id": "java", - "version": "8.152", - "bitness": 32, - "arch": "x86", - "windows_url": "portable_jre_8_update_152_32bit.zip", - "activated_env": "JAVA_HOME=%installation_dir%", - "activated_cfg": "JAVA='%installation_dir%/bin/java%.exe%'" - }, - { - "id": "java", - "version": "8.152", - "bitness": 64, - "arch": "x86_64", - "windows_url": "portable_jre_8_update_152_64bit.zip", - "activated_env": "JAVA_HOME=%installation_dir%", - "activated_cfg": "JAVA='%installation_dir%/bin/java%.exe%'" - }, - { - "id": "emscripten", - "version": "tag-%tag%", - "bitness": 32, - "append_bitness": false, - "windows_url": "https://github.com/emscripten-core/emscripten/archive/%tag%.zip", - "unix_url": "https://github.com/emscripten-core/emscripten/archive/%tag%.tar.gz", - "zipfile_prefix": "emscripten-e", - "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_32bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'", - "activated_path": "%installation_dir%", - "activated_env": "EMSCRIPTEN=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%%generator_prefix%_32bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%", - "cmake_build_type": "Release", - "custom_install_script": "emscripten_post_install", - "custom_is_installed_script": "is_optimizer_installed", - "custom_uninstall_script": "uninstall_optimizer" - }, - { - "id": "emscripten", - "version": "tag-%tag%", - "bitness": 64, - "append_bitness": false, - "windows_url": "https://github.com/emscripten-core/emscripten/archive/%tag%.zip", - "unix_url": "https://github.com/emscripten-core/emscripten/archive/%tag%.tar.gz", - "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'", - "activated_path": "%installation_dir%", - "activated_env": "EMSCRIPTEN=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%", - "cmake_build_type": "Release", - "custom_install_script": "emscripten_post_install", - "custom_is_installed_script": "is_optimizer_installed", - "custom_uninstall_script": "uninstall_optimizer" - }, - { - "id": "emscripten", - "version": "%precompiled_tag%", - "windows_url": "https://github.com/emscripten-core/emscripten/archive/%precompiled_tag%.zip", - "unix_url": "https://github.com/emscripten-core/emscripten/archive/%precompiled_tag%.tar.gz", - "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'", - "activated_path": "%installation_dir%", - "activated_env": "EMSCRIPTEN=%installation_dir%" - }, - { - "id": "emscripten", - "version": "main", - "bitness": 32, - "append_bitness": false, - "url": "https://github.com/emscripten-core/emscripten.git", - "git_branch": "main", - "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'", - "activated_path": "%installation_dir%", - "activated_env": "EMSCRIPTEN=%installation_dir%", - "cmake_build_type": "Release", - "custom_install_script": "emscripten_npm_install" - }, { "id": "emscripten", - "version": "main", - "bitness": 64, + "version": "8.0.0", "append_bitness": false, - "url": "https://github.com/emscripten-core/emscripten.git", - "git_branch": "main", + "url": "https://github.com/dotnet/emscripten.git", + "git_branch": "dotnet/main", "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'", "activated_path": "%installation_dir%", "activated_env": "EMSCRIPTEN=%installation_dir%", "cmake_build_type": "Release", - "custom_install_script": "emscripten_npm_install" + "custom_is_installed_script": "lie_and_say_yes" }, { "id": "binaryen", @@ -147,68 +75,23 @@ "activated_env": "BINARYEN_ROOT=%installation_dir%", "cmake_build_type": "Release", "custom_is_installed_script": "lie_and_say_yes" - }, - { - "id": "gnu", - "version": "2.5.4", - "windows_url": "grep-2.5.4.zip", - "activated_path": "%installation_dir%/bin" - }, - { - "id": "mingw", - "version": "4.6.2", - "bitness": 32, - "windows_url": "mingw_4.6.2_32bit.zip", - "activated_cfg": "MINGW_ROOT='%installation_dir%'", - "activated_path": "%installation_dir%", - "is_old": true - }, - { - "id": "mingw", - "version": "7.1.0", - "bitness": 64, - "windows_url": "mingw_7.1.0_64bit.zip", - "activated_cfg": "MINGW_ROOT='%installation_dir%'", - "activated_path": "%installation_dir%/bin" - }, - { - "id": "ninja", - "version": "git-release", - "bitness": 64, - "url": "https://github.com/ninja-build/ninja.git", - "git_branch": "release", - "activated_cfg": "NINJA=%installation_dir%/bin", - "activated_path": "%installation_dir%/bin", - "cmake_build_type": "Release", - "custom_install_script": "build_ninja" - }, - { - "id": "ccache", - "version": "git-emscripten", - "bitness": 64, - "url": "https://github.com/juj/ccache.git", - "git_branch": "emscripten", - "activated_path": "%installation_dir%/bin", - "activated_env": "_EMCC_CCACHE=1;CCACHE_CONFIGPATH=%installation_dir%/emcc_ccache.conf", - "cmake_build_type": "Release", - "custom_install_script": "build_ccache" } ], "sdks": [ { "version": "main", - "uses": ["python-8.0.0", "llvm-8.0.0", "node-8.0.0", "emscripten-main-64bit", "binaryen-8.0.0"], + "uses": ["python-8.0.0", "llvm-8.0.0", "node-8.0.0", "emscripten-8.0.0", "binaryen-8.0.0"], "os": "win" }, { "version": "main", - "uses": ["python-8.0.0", "llvm-8.0.0", "node-8.0.0", "emscripten-main-64bit", "binaryen-8.0.0"], + "uses": ["python-8.0.0", "llvm-8.0.0", "node-8.0.0", "emscripten-8.0.0", "binaryen-8.0.0"], "os": "macos" }, { "version": "main", - "uses": ["llvm-8.0.0", "emscripten-main-32bit", "binaryen-8.0.0"], + "uses": ["llvm-8.0.0", "emscripten-8.0.0", "binaryen-8.0.0"], "os": "linux" }, { diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a51e780bac..727c08e690 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,6 +81,10 @@ https://github.com/dotnet/llvm-project 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + + https://github.com/dotnet/emscripten + 21dffcc20e5c02d92d0b3c97bb90e834de838920 + diff --git a/eng/Versions.props b/eng/Versions.props index 5c0d9b2b0a..3e71d8cad3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,6 +31,7 @@ 14.0.0-alpha.1.23221.2 14.0.0-alpha.1.23221.2 14.0.0-alpha.1.23221.2 + 8.0.0-preview.4.23226.1 false diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 6a4c741e22..e829a3dfc3 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -13,6 +13,7 @@ $(runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion) $(runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion) + $(MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion) @@ -48,6 +49,10 @@ Version="$(NodePkgVersion)" PackageArch="$(BuildArchitecture)" Condition="'$(BuildArchitecture)' != '' and '$(PackageHostOS)' != 'linux'" /> + <_PackageReferenceDeduplicated Include="@(PackageReference->Distinct())" /> @@ -101,6 +106,18 @@ + + + + + + + + + + From f5259d9d4f79374b8767540a54dd5a42368a1000 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 26 Apr 2023 15:11:28 -0400 Subject: [PATCH 07/58] fix perms --- eng/build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 eng/build.sh diff --git a/eng/build.sh b/eng/build.sh old mode 100644 new mode 100755 From 215a110935433b4ed46076779c9599e3665cf356 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 26 Apr 2023 17:08:21 -0400 Subject: [PATCH 08/58] mostly fix build --- emsdk.py | 4 ++-- eng/Versions.props | 2 +- eng/emsdk.proj | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/emsdk.py b/emsdk.py index 6ba8681c8f..4c1215d58d 100644 --- a/emsdk.py +++ b/emsdk.py @@ -1616,9 +1616,9 @@ def installation_path(self): def installation_dir(self): dir = self.installation_path() if path_points_to_directory(dir): - return dir + return os.path.normpath(dir) else: - return os.path.dirname(dir) + return os.path.dirname(os.path.normpath(dir)) # Returns the configuration item that needs to be added to .emscripten to make # this Tool active for the current user. diff --git a/eng/Versions.props b/eng/Versions.props index 3e71d8cad3..343fd0f050 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 8.0.0 preview 4 - 3.1.34 + sdk-main 2.0.23 3.1.12 7.0.5 diff --git a/eng/emsdk.proj b/eng/emsdk.proj index e829a3dfc3..853a5bc999 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -50,9 +50,7 @@ PackageArch="$(BuildArchitecture)" Condition="'$(BuildArchitecture)' != '' and '$(PackageHostOS)' != 'linux'" /> + Version="$(EmscriptenPkgVersion)" /> <_PackageReferenceDeduplicated Include="@(PackageReference->Distinct())" /> @@ -133,8 +131,6 @@ true - From 820e1eb1b99404064cd69ee974ae45f4fdec428f Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 27 Apr 2023 15:15:19 -0400 Subject: [PATCH 09/58] More progress --- eng/Version.Details.xml | 8 ++++ eng/Versions.props | 2 + eng/clang-wrapper.sh | 6 +-- eng/emsdk.proj | 81 +++++++++++++++++++++-------------------- 4 files changed, 55 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 727c08e690..9888dd37eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,6 +41,14 @@ https://github.com/dotnet/cpython 39b17253329cb3e967da38bf2c98d2d3f0566c0b + + https://github.com/dotnet/node + 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + + + https://github.com/dotnet/node + 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + https://github.com/dotnet/node 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 diff --git a/eng/Versions.props b/eng/Versions.props index 343fd0f050..916e9b452f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,6 +21,8 @@ 8.0.0-preview.4.23224.1 8.0.0-preview.4.23224.1 8.0.0-preview.4.23224.1 + 8.0.0-preview.4.23220.1 + 8.0.0-preview.4.23220.1 8.0.0-preview.4.23220.1 8.0.0-preview.4.23220.1 8.0.0-preview.4.23220.1 diff --git a/eng/clang-wrapper.sh b/eng/clang-wrapper.sh index df62999dcc..84b40f6385 100755 --- a/eng/clang-wrapper.sh +++ b/eng/clang-wrapper.sh @@ -2,12 +2,12 @@ # # This abomination of a script is meant to replace the symlinks -# pointing to the clang-17 binary and set the appropriate flags -# to avoid duplicating the 90MB clang-17 binary inside the nuget +# pointing to the clang-14 binary and set the appropriate flags +# to avoid duplicating the 90MB clang-14 binary inside the nuget # package. # CLANG_NAME=$(basename "$0") -CLANG_CC=$(dirname $0)/clang-17 +CLANG_CC=$(dirname $0)/clang-14 EXTRA_ARGS="" case $CLANG_NAME in diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 853a5bc999..bc1dccf30d 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -33,6 +33,14 @@ Version="$(BinaryenPkgVersion)" PackageArch="$(BuildArchitecture)" Condition="'$(BuildArchitecture)' != ''" /> + + - - <_PackageReferenceDeduplicated Include="@(PackageReference->Distinct())" /> @@ -134,59 +134,56 @@ - - $([System.IO.Directory]::GetDirectories("$(RepoRoot)\node", "*")) - $([System.IO.Directory]::GetDirectories("$(RepoRoot)\python", "*")) - $(RepoRoot)\upstream - $(UpstreamDirectory)\emscripten - + + + + + - - - - - + - $(NodeDirectory)/bin:$(PATH) - $(NodeDirectory)\bin%3B$(PATH.Replace(';', '%3B')) + $(NodeDir)/bin:$(PATH) + $(NodeDir)\bin%3B$(PATH.Replace(';', '%3B')) - - + + - + - + - - - - - + + + + + ./embuilder.bat ./embuilder - - - - + + + + + - + + + + From eb0b8e39fa9700d599ccd8eb672469b308895e76 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 28 Apr 2023 09:19:23 -0400 Subject: [PATCH 10/58] Update latest dependencies --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++++----------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9888dd37eb..15c063e0b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/binaryen - a85dd05d1cba42294590c5a40b2e24303f0b56e3 + 3f9d99e10e0af821ad02036574112bbd8859f6d2 - + https://github.com/dotnet/binaryen - a85dd05d1cba42294590c5a40b2e24303f0b56e3 + 3f9d99e10e0af821ad02036574112bbd8859f6d2 - + https://github.com/dotnet/binaryen - a85dd05d1cba42294590c5a40b2e24303f0b56e3 + 3f9d99e10e0af821ad02036574112bbd8859f6d2 - + https://github.com/dotnet/binaryen - a85dd05d1cba42294590c5a40b2e24303f0b56e3 + 3f9d99e10e0af821ad02036574112bbd8859f6d2 - + https://github.com/dotnet/binaryen - a85dd05d1cba42294590c5a40b2e24303f0b56e3 + 3f9d99e10e0af821ad02036574112bbd8859f6d2 - + https://github.com/dotnet/binaryen - a85dd05d1cba42294590c5a40b2e24303f0b56e3 + 3f9d99e10e0af821ad02036574112bbd8859f6d2 https://github.com/dotnet/cpython @@ -65,33 +65,33 @@ https://github.com/dotnet/node 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 - + https://github.com/dotnet/llvm-project - 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + 8365ad44a42a88ddb033d3ab7fc23b09b86af25d - + https://github.com/dotnet/llvm-project - 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + 8365ad44a42a88ddb033d3ab7fc23b09b86af25d - + https://github.com/dotnet/llvm-project - 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + 8365ad44a42a88ddb033d3ab7fc23b09b86af25d - + https://github.com/dotnet/llvm-project - 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + 8365ad44a42a88ddb033d3ab7fc23b09b86af25d - + https://github.com/dotnet/llvm-project - 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + 8365ad44a42a88ddb033d3ab7fc23b09b86af25d - + https://github.com/dotnet/llvm-project - 22bd769077ac1e84b5ad9d8d7cc27750c5e62275 + 8365ad44a42a88ddb033d3ab7fc23b09b86af25d - + https://github.com/dotnet/emscripten - 21dffcc20e5c02d92d0b3c97bb90e834de838920 + 09cd97728a7cde68dfea2932a41886f5205e80d5 diff --git a/eng/Versions.props b/eng/Versions.props index 916e9b452f..669d567c02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,12 +11,12 @@ 3.1.12 7.0.5 6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11)) - 8.0.0-preview.4.23219.2 - 8.0.0-preview.4.23219.2 - 8.0.0-preview.4.23219.2 - 8.0.0-preview.4.23219.2 - 8.0.0-preview.4.23219.2 - 8.0.0-preview.4.23219.2 + 8.0.0-preview.4.23227.1 + 8.0.0-preview.4.23227.1 + 8.0.0-preview.4.23227.1 + 8.0.0-preview.4.23227.1 + 8.0.0-preview.4.23227.1 + 8.0.0-preview.4.23227.1 8.0.0-preview.4.23224.1 8.0.0-preview.4.23224.1 8.0.0-preview.4.23224.1 @@ -27,13 +27,13 @@ 8.0.0-preview.4.23220.1 8.0.0-preview.4.23220.1 8.0.0-preview.4.23220.1 - 14.0.0-alpha.1.23221.2 - 14.0.0-alpha.1.23221.2 - 14.0.0-alpha.1.23221.2 - 14.0.0-alpha.1.23221.2 - 14.0.0-alpha.1.23221.2 - 14.0.0-alpha.1.23221.2 - 8.0.0-preview.4.23226.1 + 14.0.0-alpha.1.23224.3 + 14.0.0-alpha.1.23224.3 + 14.0.0-alpha.1.23224.3 + 14.0.0-alpha.1.23224.3 + 14.0.0-alpha.1.23224.3 + 14.0.0-alpha.1.23224.3 + 8.0.0-preview.4.23227.1 false From 4eee949285754b3d8c7fe423cbbf4b0b862554fb Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 28 Apr 2023 09:43:11 -0400 Subject: [PATCH 11/58] typo --- eng/emsdk.proj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index bc1dccf30d..3df0cd07ca 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -50,6 +50,7 @@ PackageArch="$(BuildArchitecture)" Condition="'$(BuildArchitecture)' != '' and '$(PackageHostOS)' != 'linux'" /> <_PackageReferenceDeduplicated Include="@(PackageReference->Distinct())" /> @@ -107,7 +108,7 @@ - From d76ed89afbedeff289a370b8a171dde826a1c1b7 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 12:37:01 -0400 Subject: [PATCH 12/58] Update to latest builds --- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++----------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15c063e0b7..a031ef9062 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/binaryen - 3f9d99e10e0af821ad02036574112bbd8859f6d2 + 97c8f3dbaa85d3c28883fe98a588e52e9c259815 - + https://github.com/dotnet/binaryen - 3f9d99e10e0af821ad02036574112bbd8859f6d2 + 97c8f3dbaa85d3c28883fe98a588e52e9c259815 - + https://github.com/dotnet/binaryen - 3f9d99e10e0af821ad02036574112bbd8859f6d2 + 97c8f3dbaa85d3c28883fe98a588e52e9c259815 - + https://github.com/dotnet/binaryen - 3f9d99e10e0af821ad02036574112bbd8859f6d2 + 97c8f3dbaa85d3c28883fe98a588e52e9c259815 - + https://github.com/dotnet/binaryen - 3f9d99e10e0af821ad02036574112bbd8859f6d2 + 97c8f3dbaa85d3c28883fe98a588e52e9c259815 - + https://github.com/dotnet/binaryen - 3f9d99e10e0af821ad02036574112bbd8859f6d2 + 97c8f3dbaa85d3c28883fe98a588e52e9c259815 - + https://github.com/dotnet/cpython - 39b17253329cb3e967da38bf2c98d2d3f0566c0b + 705bd63dc31ffa363b6cdb5040e1810df014730e - + https://github.com/dotnet/cpython - 39b17253329cb3e967da38bf2c98d2d3f0566c0b + 705bd63dc31ffa363b6cdb5040e1810df014730e - + https://github.com/dotnet/cpython - 39b17253329cb3e967da38bf2c98d2d3f0566c0b + 705bd63dc31ffa363b6cdb5040e1810df014730e - + https://github.com/dotnet/cpython - 39b17253329cb3e967da38bf2c98d2d3f0566c0b + 705bd63dc31ffa363b6cdb5040e1810df014730e - + https://github.com/dotnet/node - 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 - + https://github.com/dotnet/node - 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 - + https://github.com/dotnet/node - 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 - + https://github.com/dotnet/node - 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 - + https://github.com/dotnet/node - 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 - + https://github.com/dotnet/node - 56d25a9b4533ce7fa79821c2ff44d48e6a2c3499 + cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 - + https://github.com/dotnet/llvm-project - 8365ad44a42a88ddb033d3ab7fc23b09b86af25d + d6e31f5b29c46b9ac99ff747be0628fc55840cf7 - + https://github.com/dotnet/llvm-project - 8365ad44a42a88ddb033d3ab7fc23b09b86af25d + d6e31f5b29c46b9ac99ff747be0628fc55840cf7 - + https://github.com/dotnet/llvm-project - 8365ad44a42a88ddb033d3ab7fc23b09b86af25d + d6e31f5b29c46b9ac99ff747be0628fc55840cf7 - + https://github.com/dotnet/llvm-project - 8365ad44a42a88ddb033d3ab7fc23b09b86af25d + d6e31f5b29c46b9ac99ff747be0628fc55840cf7 - + https://github.com/dotnet/llvm-project - 8365ad44a42a88ddb033d3ab7fc23b09b86af25d + d6e31f5b29c46b9ac99ff747be0628fc55840cf7 - + https://github.com/dotnet/llvm-project - 8365ad44a42a88ddb033d3ab7fc23b09b86af25d + d6e31f5b29c46b9ac99ff747be0628fc55840cf7 - + https://github.com/dotnet/emscripten - 09cd97728a7cde68dfea2932a41886f5205e80d5 + a84ba030043aa25e1418477bcc214e9d83f35db2 diff --git a/eng/Versions.props b/eng/Versions.props index 669d567c02..dac3a4000f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,29 +11,29 @@ 3.1.12 7.0.5 6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11)) - 8.0.0-preview.4.23227.1 - 8.0.0-preview.4.23227.1 - 8.0.0-preview.4.23227.1 - 8.0.0-preview.4.23227.1 - 8.0.0-preview.4.23227.1 - 8.0.0-preview.4.23227.1 - 8.0.0-preview.4.23224.1 - 8.0.0-preview.4.23224.1 - 8.0.0-preview.4.23224.1 - 8.0.0-preview.4.23224.1 - 8.0.0-preview.4.23220.1 - 8.0.0-preview.4.23220.1 - 8.0.0-preview.4.23220.1 - 8.0.0-preview.4.23220.1 - 8.0.0-preview.4.23220.1 - 8.0.0-preview.4.23220.1 - 14.0.0-alpha.1.23224.3 - 14.0.0-alpha.1.23224.3 - 14.0.0-alpha.1.23224.3 - 14.0.0-alpha.1.23224.3 - 14.0.0-alpha.1.23224.3 - 14.0.0-alpha.1.23224.3 - 8.0.0-preview.4.23227.1 + 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23253.1 + 8.0.0-preview.4.23253.1 + 8.0.0-preview.4.23253.1 + 8.0.0-preview.4.23253.1 + 8.0.0-preview.4.23253.1 + 8.0.0-preview.4.23253.1 + 14.0.0-alpha.1.23228.1 + 14.0.0-alpha.1.23228.1 + 14.0.0-alpha.1.23228.1 + 14.0.0-alpha.1.23228.1 + 14.0.0-alpha.1.23228.1 + 14.0.0-alpha.1.23228.1 + 8.0.0-preview.4.23251.1 false From 343113a39788af091ba300a139dc0d9d48d76087 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 12:37:34 -0400 Subject: [PATCH 13/58] Rename property, to avoid recycling a property used elsewhere --- eng/emsdk.proj | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 3df0cd07ca..f59644b02b 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -60,11 +60,11 @@ - - + @@ -72,11 +72,11 @@ - - + @@ -84,11 +84,11 @@ - - + @@ -96,11 +96,11 @@ - - + @@ -108,11 +108,11 @@ - - + From c3d5926f0b623c75b875a5cf2b3bb5cea260aea0 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 12:37:59 -0400 Subject: [PATCH 14/58] Use DestinationFolder, to avoid issues w/ extensionless files --- eng/emsdk.proj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index f59644b02b..b30c1cb598 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -188,20 +188,20 @@ + DestinationFolder="$(ArtifactsObjDir)node\%(RecursiveDir)" /> + DestinationFolder="$(ArtifactsObjDir)upstream\%(RecursiveDir)" /> + DestinationFolder="$(ArtifactsObjDir)upstream\%(RecursiveDir)" /> + DestinationFolder="$(ArtifactsObjDir)upstream\emscripten\%(RecursiveDir)" /> From 184904a5e369b025318c001cdc6f3b2d5b3d2e66 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 12:57:06 -0400 Subject: [PATCH 15/58] Make Node not filtered out on Linux --- eng/emsdk.proj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index b30c1cb598..e96275f8f6 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -11,6 +11,7 @@ $(runtimeosxx64MicrosoftNETCoreRuntimeWasmBinaryenTransportVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion) $(runtimeosxx64MicrosoftNETCoreRuntimeWasmPythonTransportVersion) + $(runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion) $(runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportVersion) $(MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion) @@ -69,7 +70,7 @@ - + Date: Wed, 3 May 2023 16:04:32 -0400 Subject: [PATCH 16/58] Make build pass on Linux, if not pack --- Directory.Build.props | 13 ++++ eng/emsdk.proj | 70 ++++++++++++++++--- .../WorkloadManifest.json.in | 21 +++--- 3 files changed, 84 insertions(+), 20 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index a6f26df53b..cddca0ffd2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,6 +11,11 @@ $(VersionPrefix) + + <_hostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) + $(_hostArch) + + @@ -33,9 +38,17 @@ $(ProjectDir)\binaryen\$(VersionPrefix) + $(BinaryenDir) + $(BaseIntermediateOutputPath)\binaryen-$(BuildArchitecture) $(ProjectDir)\node\$(VersionPrefix) + $(NodeDir) + $(BaseIntermediateOutputPath)\node-$(BuildArchitecture) $(ProjectDir)\python\$(VersionPrefix) + $(PythonDir) + $(BaseIntermediateOutputPath)\python-$(BuildArchitecture) $(ProjectDir)\llvm\$(VersionPrefix) + $(LLVMDir) + $(BaseIntermediateOutputPath)\llvm-$(BuildArchitecture) $(ProjectDir)\emscripten\$(VersionPrefix) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index e96275f8f6..5d90e18571 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -59,51 +59,79 @@ - + + - + + + + - + + - + + + + - + + - + + + + - + + - + + + + @@ -124,6 +152,8 @@ ./emsdk emsdk.bat + node + node.exe npm npm.cmd python3 @@ -204,6 +234,27 @@ + + + + + + + @@ -297,9 +348,6 @@ - - - diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.Current.Manifest/WorkloadManifest.json.in b/eng/nuget/Microsoft.NET.Workload.Emscripten.Current.Manifest/WorkloadManifest.json.in index 71fe81158e..e82a4b613e 100644 --- a/eng/nuget/Microsoft.NET.Workload.Emscripten.Current.Manifest/WorkloadManifest.json.in +++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.Current.Manifest/WorkloadManifest.json.in @@ -10,7 +10,7 @@ "Microsoft.NET.Runtime.Emscripten.Cache", "Microsoft.NET.Runtime.Emscripten.Sdk" ], - "platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ] + "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ] } }, "packs": { @@ -19,10 +19,11 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.win-x64", - "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.win-x64", + "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.win-arm64", "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.linux-x64", + "linux-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.linux-arm64", "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64", - "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64" + "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-arm64" } }, "Microsoft.NET.Runtime.Emscripten.Python" : { @@ -30,9 +31,9 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.win-x64", - "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.win-x64", + "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.win-arm64", "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64", - "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64" + "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-arm64" } }, "Microsoft.NET.Runtime.Emscripten.Cache" : { @@ -40,10 +41,11 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.win-x64", - "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.win-x64", + "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.win-arm64", "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.linux-x64", + "linux-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.linux-arm64", "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.osx-x64", - "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.osx-x64" + "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.osx-arm64" } }, "Microsoft.NET.Runtime.Emscripten.Sdk" : { @@ -51,10 +53,11 @@ "version": "${PackageVersion}", "alias-to": { "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.win-x64", - "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.win-x64", + "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.win-arm64", "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.linux-x64", + "linux-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.linux-arm64", "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.osx-x64", - "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.osx-x64" + "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.osx-arm64" } } } From 33a5dc1ce7b0468f7b2a800b4eadc3ba0d0f54d2 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 16:33:55 -0400 Subject: [PATCH 17/58] latest fixes --- eng/emsdk.proj | 48 ++++++++++++++++++++++++------------------------ eng/sanitize.py | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 5d90e18571..ceb0f2f5ff 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -158,6 +158,9 @@ npm.cmd python3 python.exe + $(HostPythonDir)\$(PythonFileName) + $(HostPythonDir)\bin\$(PythonFileName) + $(PythonFileName) strip -s strip true @@ -181,8 +184,26 @@ - + + + + + + + @@ -234,23 +255,6 @@ - - - - - @@ -343,12 +347,8 @@ - - - - - + diff --git a/eng/sanitize.py b/eng/sanitize.py index a4d450f176..0a99a26341 100644 --- a/eng/sanitize.py +++ b/eng/sanitize.py @@ -32,7 +32,7 @@ def rewrite_package_json(path): emsdk_path = sys.argv[1] -emscripten_path = os.path.join(emsdk_path, "upstream", "emscripten") +emscripten_path = os.path.join(emsdk_path, "emscripten", "8.0.0") node_root = os.path.join(emsdk_path, "node") node_paths = glob(node_root) upgrade = False From 18ddb0df82150b4a9fd2a959826cd94b1b143c77 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 17:47:23 -0400 Subject: [PATCH 18/58] Allow overriding node path, and ensure it's in a subdirectory --- Directory.Build.props | 8 ++++---- eng/emsdk.proj | 2 +- eng/sanitize.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index cddca0ffd2..0e2c04cb2c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -39,16 +39,16 @@ $(ProjectDir)\binaryen\$(VersionPrefix) $(BinaryenDir) - $(BaseIntermediateOutputPath)\binaryen-$(BuildArchitecture) + $(BaseIntermediateOutputPath)\host\binaryen\$(BuildArchitecture) $(ProjectDir)\node\$(VersionPrefix) $(NodeDir) - $(BaseIntermediateOutputPath)\node-$(BuildArchitecture) + $(BaseIntermediateOutputPath)\host\node\$(BuildArchitecture) $(ProjectDir)\python\$(VersionPrefix) $(PythonDir) - $(BaseIntermediateOutputPath)\python-$(BuildArchitecture) + $(BaseIntermediateOutputPath)\host\python\$(BuildArchitecture) $(ProjectDir)\llvm\$(VersionPrefix) $(LLVMDir) - $(BaseIntermediateOutputPath)\llvm-$(BuildArchitecture) + $(BaseIntermediateOutputPath)\host\llvm\$(BuildArchitecture) $(ProjectDir)\emscripten\$(VersionPrefix) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index ceb0f2f5ff..f06b5cfad5 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -203,7 +203,7 @@ IgnoreStandardErrorWarningFormat="true" /> + Command="$(PythonPath) eng/sanitize.py $(RepoRoot) $([System.IO.Directory]::GetParent($(HostNodeDir)))" /> diff --git a/eng/sanitize.py b/eng/sanitize.py index 0a99a26341..0d9235945c 100644 --- a/eng/sanitize.py +++ b/eng/sanitize.py @@ -32,8 +32,8 @@ def rewrite_package_json(path): emsdk_path = sys.argv[1] +node_root = sys.argv[2] emscripten_path = os.path.join(emsdk_path, "emscripten", "8.0.0") -node_root = os.path.join(emsdk_path, "node") node_paths = glob(node_root) upgrade = False From 45dff620ef69953e4eab22ed628f3e6e61bf2d50 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 17:47:53 -0400 Subject: [PATCH 19/58] Fix package name versioning --- eng/Versions.props | 3 ++- eng/emsdk.proj | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index dac3a4000f..6aaff8cb4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,8 @@ 8.0.0 preview 4 - sdk-main + sdk-main + 3.1.34 2.0.23 3.1.12 7.0.5 diff --git a/eng/emsdk.proj b/eng/emsdk.proj index f06b5cfad5..3c8bfb8e67 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -167,7 +167,7 @@ + Command="$(EmSdkFileName) activate $(EmscriptenSourceVersion)" /> From e63f0edb4bc79f9fd969bd306cb0f2eb46da4cdf Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 17:48:15 -0400 Subject: [PATCH 20/58] Delete google closure compiler harder. It keeps coming back! --- eng/emsdk.proj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 3c8bfb8e67..f9bb39f13e 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -217,6 +217,7 @@ + @@ -230,6 +231,8 @@ + + @@ -291,6 +294,7 @@ + From 6363f24aa97043e63691f6dd81c17fe6274be824 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 17:48:40 -0400 Subject: [PATCH 21/58] Override clang++ binary too --- eng/emsdk.proj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index f9bb39f13e..5829216d50 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -214,6 +214,9 @@ + From 38a9f6e22e6ee02f2c49382ca9a673fbac961216 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 17:49:08 -0400 Subject: [PATCH 22/58] Don't run npm ci, sanitize.py does it for us --- eng/emsdk.proj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 5829216d50..993057df04 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -261,10 +261,6 @@ - - From 1da0727d93fa58cf2a4776ace65aa57592dff9f9 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 17:49:24 -0400 Subject: [PATCH 23/58] Make sure pack target actually works --- eng/emsdk.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 993057df04..8e72fb14bd 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -352,7 +352,7 @@ - + From 48e459c5cd7c8f736062c02d0623ef8898eb4786 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 3 May 2023 18:19:00 -0400 Subject: [PATCH 24/58] Always pass host tools to embuilder --- eng/emsdk.proj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 8e72fb14bd..e3a8aa2eba 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -232,7 +232,8 @@ + Command="$(EmBuilder) build MINIMAL" + EnvironmentVariables="EM_LLVM_ROOT=$(HostLLVMDir)\bin;EM_BINARYEN_ROOT=$(HostBinaryenDir);EM_NODE_JS=$(HostNodeDir)\bin\node"/> From d82437da12614cd8e269ec246c5677dba686792c Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 4 May 2023 09:31:40 -0400 Subject: [PATCH 25/58] fix bad escaping on Python setuptools on OSX --- eng/nuget/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/nuget/Directory.Build.targets b/eng/nuget/Directory.Build.targets index 9b1456f09e..f9c4593014 100644 --- a/eng/nuget/Directory.Build.targets +++ b/eng/nuget/Directory.Build.targets @@ -4,7 +4,7 @@ $(ArtifactsObjDir)\$(MSBuildProjectName).UnixFilePermissions.xml - find . -type f -perm +111 -exec sh -c "echo {} | sed 's,^\.\/,,'" \; + find . -type f -perm +111 -exec sh -c "echo '{}' | sed 's,^\.\/,,'" \; find . -type f -perm /111 -printf '%P\n' From 4efbb948b4e187c6f2d1879c505d3e65f021ed41 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 09:10:59 -0400 Subject: [PATCH 26/58] Update dependencies --- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++----------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a031ef9062..94cba10870 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/binaryen - 97c8f3dbaa85d3c28883fe98a588e52e9c259815 + c868e9345d8d8f180f3c9dd3ce876af74a809bf2 - + https://github.com/dotnet/binaryen - 97c8f3dbaa85d3c28883fe98a588e52e9c259815 + c868e9345d8d8f180f3c9dd3ce876af74a809bf2 - + https://github.com/dotnet/binaryen - 97c8f3dbaa85d3c28883fe98a588e52e9c259815 + c868e9345d8d8f180f3c9dd3ce876af74a809bf2 - + https://github.com/dotnet/binaryen - 97c8f3dbaa85d3c28883fe98a588e52e9c259815 + c868e9345d8d8f180f3c9dd3ce876af74a809bf2 - + https://github.com/dotnet/binaryen - 97c8f3dbaa85d3c28883fe98a588e52e9c259815 + c868e9345d8d8f180f3c9dd3ce876af74a809bf2 - + https://github.com/dotnet/binaryen - 97c8f3dbaa85d3c28883fe98a588e52e9c259815 + c868e9345d8d8f180f3c9dd3ce876af74a809bf2 - + https://github.com/dotnet/cpython - 705bd63dc31ffa363b6cdb5040e1810df014730e + e67217fd83c179898adf90d4deaae75dd9a590b2 - + https://github.com/dotnet/cpython - 705bd63dc31ffa363b6cdb5040e1810df014730e + e67217fd83c179898adf90d4deaae75dd9a590b2 - + https://github.com/dotnet/cpython - 705bd63dc31ffa363b6cdb5040e1810df014730e + e67217fd83c179898adf90d4deaae75dd9a590b2 - + https://github.com/dotnet/cpython - 705bd63dc31ffa363b6cdb5040e1810df014730e + e67217fd83c179898adf90d4deaae75dd9a590b2 - + https://github.com/dotnet/node - cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 + 6108064f5896b33f4d966aea696da4749f05958f - + https://github.com/dotnet/node - cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 + 6108064f5896b33f4d966aea696da4749f05958f - + https://github.com/dotnet/node - cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 + 6108064f5896b33f4d966aea696da4749f05958f - + https://github.com/dotnet/node - cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 + 6108064f5896b33f4d966aea696da4749f05958f - + https://github.com/dotnet/node - cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 + 6108064f5896b33f4d966aea696da4749f05958f - + https://github.com/dotnet/node - cfe7c5ffd07ab4322514e79e3c163d7aa9bbbdb7 + 6108064f5896b33f4d966aea696da4749f05958f - + https://github.com/dotnet/llvm-project - d6e31f5b29c46b9ac99ff747be0628fc55840cf7 + 2cd4a04a80c6dd0637219751e8d615a854eb76aa - + https://github.com/dotnet/llvm-project - d6e31f5b29c46b9ac99ff747be0628fc55840cf7 + 2cd4a04a80c6dd0637219751e8d615a854eb76aa - + https://github.com/dotnet/llvm-project - d6e31f5b29c46b9ac99ff747be0628fc55840cf7 + 2cd4a04a80c6dd0637219751e8d615a854eb76aa - + https://github.com/dotnet/llvm-project - d6e31f5b29c46b9ac99ff747be0628fc55840cf7 + 2cd4a04a80c6dd0637219751e8d615a854eb76aa - + https://github.com/dotnet/llvm-project - d6e31f5b29c46b9ac99ff747be0628fc55840cf7 + 2cd4a04a80c6dd0637219751e8d615a854eb76aa - + https://github.com/dotnet/llvm-project - d6e31f5b29c46b9ac99ff747be0628fc55840cf7 + 2cd4a04a80c6dd0637219751e8d615a854eb76aa - + https://github.com/dotnet/emscripten - a84ba030043aa25e1418477bcc214e9d83f35db2 + 0f22156c5bc86839f36008762faf7abf83f22fa2 diff --git a/eng/Versions.props b/eng/Versions.props index 6aaff8cb4b..36f1da023c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,29 +12,29 @@ 3.1.12 7.0.5 6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11)) - 8.0.0-preview.4.23251.1 - 8.0.0-preview.4.23251.1 - 8.0.0-preview.4.23251.1 - 8.0.0-preview.4.23251.1 - 8.0.0-preview.4.23251.1 - 8.0.0-preview.4.23251.1 - 8.0.0-preview.4.23251.1 - 8.0.0-preview.4.23251.1 - 8.0.0-preview.4.23251.1 - 8.0.0-preview.4.23251.1 - 8.0.0-preview.4.23253.1 - 8.0.0-preview.4.23253.1 - 8.0.0-preview.4.23253.1 - 8.0.0-preview.4.23253.1 - 8.0.0-preview.4.23253.1 - 8.0.0-preview.4.23253.1 - 14.0.0-alpha.1.23228.1 - 14.0.0-alpha.1.23228.1 - 14.0.0-alpha.1.23228.1 - 14.0.0-alpha.1.23228.1 - 14.0.0-alpha.1.23228.1 - 14.0.0-alpha.1.23228.1 - 8.0.0-preview.4.23251.1 + 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23258.2 + 8.0.0-preview.4.23258.2 + 8.0.0-preview.4.23258.2 + 8.0.0-preview.4.23258.2 + 8.0.0-preview.4.23258.2 + 8.0.0-preview.4.23258.2 + 14.0.0-alpha.1.23258.2 + 14.0.0-alpha.1.23258.2 + 14.0.0-alpha.1.23258.2 + 14.0.0-alpha.1.23258.2 + 14.0.0-alpha.1.23258.2 + 14.0.0-alpha.1.23258.2 + 8.0.0-preview.4.23258.1 false From ab44bc5174ff7160e9bb7f4c4bc2b48dfcdedaeb Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 11:33:51 -0400 Subject: [PATCH 27/58] Build correct libraries --- eng/emsdk.proj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index e3a8aa2eba..17e0ad5f19 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -231,6 +231,10 @@ ./embuilder + + From baf9c47c48060e8c3b72af8ac53d575df8bbb408 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 11:34:09 -0400 Subject: [PATCH 28/58] Delete pyc files, they never match the required Python version anyway --- eng/emsdk.proj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 17e0ad5f19..0fa3b5197b 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -266,6 +266,14 @@ + + + + + + + + From fb4f73f990b6185af651636d577f66b63bba5f96 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 12:49:32 -0400 Subject: [PATCH 29/58] Attempt to make AzDO yml multi-platform --- eng/azure-pipelines.yml | 94 ++++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 38 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 9850e5411c..38c7b01612 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -42,12 +42,22 @@ stages: timeoutInMinutes: 30 pool: vmImage: macOS-11 + strategy: + matrix: + x64: + assetManifestOS: osx + assetManifestPlatform: x64 + archflag: --arch x64 + arm64: + assetManifestOS: osx + assetManifestPlatform: arm64 + archflag: --arch arm64 steps: - bash: | - ./build.sh --arch x64 --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=osx-x64 /p:AssetManifestOS=osx /p:PlatformName=x64 $(_InternalBuildArgs) $(_NonWindowsInternalPublishArg) + ./build.sh $(archflag) --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) $(_InternalBuildArgs) $(_NonWindowsInternalPublishArg) displayName: Build - publish: artifacts/packages - artifact: Packages_macOS + artifact: Packages_macOS_$(assetManifestPlatform) - bash: | rm -rf upstream node python displayName: Remove temporary artifacts @@ -60,23 +70,41 @@ stages: dependsOn: Build_macOS displayName: Sign macOS timeoutInMinutes: 30 + strategy: + matrix: + x64: + assetManifestOS: osx + assetManifestPlatform: x64 + arm64: + assetManifestOS: osx + assetManifestPlatform: arm64 pool: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022.amd64 steps: - task: DownloadPipelineArtifact@2 inputs: - artifact: Packages_macOS + artifact: Packages_macOS_$(assetManifestPlatform) path: 'artifacts/packages' - powershell: | - ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:PackageRID=osx-x64 /p:AssetManifestOS=osx /p:PlatformName=x64 $(_InternalBuildArgs) + ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) $(_InternalBuildArgs) displayName: Sign and Publish ############ Linux BUILD ############ - job: Build_Linux displayName: Linux timeoutInMinutes: 30 + strategy: + matrix: + x64: + assetManifestOS: linux + assetManifestPlatform: x64 + archflag: --arch x64 + arm64: + assetManifestOS: linux + assetManifestPlatform: arm64 + archflag: --arch arm64 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) @@ -86,10 +114,10 @@ stages: demands: ImageOverride -equals build.ubuntu.2204.amd64 steps: - bash: | - ./build.sh --arch x64 --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=linux-x64 /p:AssetManifestOS=linux /p:PlatformName=x64 $(_InternalBuildArgs) $(_NonWindowsInternalPublishArg) + ./build.sh $(archflag) --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) $(_InternalBuildArgs) $(_NonWindowsInternalPublishArg) displayName: Build - publish: artifacts/packages - artifact: Packages_Linux + artifact: Packages_Linux_$(assetManifestPlatform) - bash: | rm -rf upstream node python displayName: Remove temporary artifacts @@ -102,23 +130,41 @@ stages: dependsOn: Build_Linux displayName: Sign Linux timeoutInMinutes: 30 + strategy: + matrix: + x64: + assetManifestOS: linux + assetManifestPlatform: x64 + arm64: + assetManifestOS: linux + assetManifestPlatform: arm64 pool: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022.amd64 steps: - task: DownloadPipelineArtifact@2 inputs: - artifact: Packages_Linux + artifact: Packages_Linux_$(assetManifestPlatform) path: 'artifacts/packages' - powershell: | - ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:PackageRID=linux-x64 /p:AssetManifestOS=linux /p:PlatformName=x64 $(_InternalBuildArgs) + ./eng/common/build.ps1 -ci -configuration $(_BuildConfig) -restore -sign -publish /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) $(_InternalBuildArgs) displayName: Sign and Publish ############ Windows BUILD ############ - job: Build_Windows displayName: Windows timeoutInMinutes: 60 + strategy: + matrix: + x64: + assetManifestOS: win + assetManifestPlatform: x64 + archflag: -arch x64 + arm64: + assetManifestOS: win + assetManifestPlatform: arm64 + archflag: -arch arm64 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) @@ -127,39 +173,11 @@ stages: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022.amd64 steps: - - powershell: | - # update the machine cert store so that python can download the files as required by emscripten's install - $WebsiteURL="storage.googleapis.com" - Try { - $Conn = New-Object System.Net.Sockets.TcpClient($WebsiteURL, 443) - - Try { - $Stream = New-Object System.Net.Security.SslStream($Conn.GetStream()) - $Stream.AuthenticateAsClient($WebsiteURL) - - $Cert = $Stream.Get_RemoteCertificate() - - $ValidTo = [datetime]::Parse($Cert.GetExpirationDatestring()) - - Write-Host "`nConnection Successfull" -ForegroundColor DarkGreen - Write-Host "Website: $WebsiteURL" - } - Catch { Throw $_ } - Finally { $Conn.close() } - } - Catch { - Write-Host "`nError occurred connecting to $($WebsiteURL)" -ForegroundColor Yellow - Write-Host "Website: $WebsiteURL" - Write-Host "Status:" $_.exception.innerexception.message -ForegroundColor Yellow - Write-Host "" - } - displayName: Fetch storage.googleapis.com certificate - condition: eq(variables['System.TeamProject'], 'internal') - script: | - .\build.cmd -arch x64 -restore -build -pack -ci -configuration $(_BuildConfig) -sign -publish /p:PackageRID=win-x64 /p:AssetManifestOS=win /p:PlatformName=x64 /p:workloadPackagesPath=$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\Shipping $(_InternalBuildArgs) + .\build.cmd $(archflag) -restore -build -pack -ci -configuration $(_BuildConfig) -sign -publish /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) /p:workloadPackagesPath=$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\Shipping $(_InternalBuildArgs) displayName: Build and Publish - publish: artifacts/packages - artifact: Packages_Windows + artifact: Packages_Windows_$(assetManifestPlatform) - script: | rmdir /s /q upstream node python displayName: Remove temporary artifacts From bbbbca636edc75c71db993caacdac97de3197750 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 13:05:34 -0400 Subject: [PATCH 30/58] fix indentation --- eng/azure-pipelines.yml | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 38c7b01612..1e1215dc82 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -70,17 +70,17 @@ stages: dependsOn: Build_macOS displayName: Sign macOS timeoutInMinutes: 30 - strategy: - matrix: - x64: - assetManifestOS: osx - assetManifestPlatform: x64 - arm64: - assetManifestOS: osx - assetManifestPlatform: arm64 pool: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022.amd64 + strategy: + matrix: + x64: + assetManifestOS: osx + assetManifestPlatform: x64 + arm64: + assetManifestOS: osx + assetManifestPlatform: arm64 steps: - task: DownloadPipelineArtifact@2 inputs: @@ -95,6 +95,13 @@ stages: - job: Build_Linux displayName: Linux timeoutInMinutes: 30 + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals build.ubuntu.2204.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals build.ubuntu.2204.amd64 strategy: matrix: x64: @@ -105,13 +112,6 @@ stages: assetManifestOS: linux assetManifestPlatform: arm64 archflag: --arch arm64 - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals build.ubuntu.2204.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals build.ubuntu.2204.amd64 steps: - bash: | ./build.sh $(archflag) --restore --build --pack --ci --configuration $(_BuildConfig) /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) $(_InternalBuildArgs) $(_NonWindowsInternalPublishArg) @@ -130,17 +130,17 @@ stages: dependsOn: Build_Linux displayName: Sign Linux timeoutInMinutes: 30 - strategy: - matrix: - x64: - assetManifestOS: linux - assetManifestPlatform: x64 - arm64: - assetManifestOS: linux - assetManifestPlatform: arm64 pool: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022.amd64 + strategy: + matrix: + x64: + assetManifestOS: linux + assetManifestPlatform: x64 + arm64: + assetManifestOS: linux + assetManifestPlatform: arm64 steps: - task: DownloadPipelineArtifact@2 inputs: @@ -155,6 +155,13 @@ stages: - job: Build_Windows displayName: Windows timeoutInMinutes: 60 + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 strategy: matrix: x64: @@ -165,13 +172,6 @@ stages: assetManifestOS: win assetManifestPlatform: arm64 archflag: -arch arm64 - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 steps: - script: | .\build.cmd $(archflag) -restore -build -pack -ci -configuration $(_BuildConfig) -sign -publish /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) /p:workloadPackagesPath=$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\Shipping $(_InternalBuildArgs) From 5cffb9249a92e854df4326755a7f800384dfc426 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 13:40:51 -0400 Subject: [PATCH 31/58] Increase timeouts, since the work done is greater & takes longer --- eng/azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 1e1215dc82..46b7c04d2f 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -39,7 +39,7 @@ stages: ############ macOS BUILD ############ - job: Build_macOS displayName: macOS - timeoutInMinutes: 30 + timeoutInMinutes: 120 pool: vmImage: macOS-11 strategy: @@ -94,7 +94,7 @@ stages: ############ Linux BUILD ############ - job: Build_Linux displayName: Linux - timeoutInMinutes: 30 + timeoutInMinutes: 120 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) @@ -154,7 +154,7 @@ stages: ############ Windows BUILD ############ - job: Build_Windows displayName: Windows - timeoutInMinutes: 60 + timeoutInMinutes: 120 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) From cd0ec4431a3a4144eed694fbbf96116d885449da Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 14:41:24 -0400 Subject: [PATCH 32/58] Fix temporary artifact folders --- eng/azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 46b7c04d2f..cd2aaba03a 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -59,7 +59,7 @@ stages: - publish: artifacts/packages artifact: Packages_macOS_$(assetManifestPlatform) - bash: | - rm -rf upstream node python + rm -rf binaryen node python llvm emscripten displayName: Remove temporary artifacts - powershell: $(CheckNuGetSizesScript) displayName: Check NuGet sizes @@ -119,7 +119,7 @@ stages: - publish: artifacts/packages artifact: Packages_Linux_$(assetManifestPlatform) - bash: | - rm -rf upstream node python + rm -rf binaryen node llvm emscripten displayName: Remove temporary artifacts - powershell: $(CheckNuGetSizesScript) displayName: Check NuGet sizes @@ -179,7 +179,7 @@ stages: - publish: artifacts/packages artifact: Packages_Windows_$(assetManifestPlatform) - script: | - rmdir /s /q upstream node python + rmdir /s /q binaryen node python llvm emscripten displayName: Remove temporary artifacts # Upload packages wrapping msis - task: CopyFiles@2 From 3eeb824d10b8b37d582966e9d654a9343126b054 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 16:43:03 -0400 Subject: [PATCH 33/58] Maybe make workload upload x64-only --- eng/azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index cd2aaba03a..c42827f432 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -168,13 +168,15 @@ stages: assetManifestOS: win assetManifestPlatform: x64 archflag: -arch x64 + skipWorkloadsValue: false arm64: assetManifestOS: win assetManifestPlatform: arm64 archflag: -arch arm64 + skipWorkloadsvalue: true steps: - script: | - .\build.cmd $(archflag) -restore -build -pack -ci -configuration $(_BuildConfig) -sign -publish /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) /p:workloadPackagesPath=$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\Shipping $(_InternalBuildArgs) + .\build.cmd $(archflag) -restore -build -pack -ci -configuration $(_BuildConfig) -sign -publish /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) /p:workloadPackagesPath=$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\Shipping $(_InternalBuildArgs) /p:SkipWorkloads=$(skipWorkloadsValue) displayName: Build and Publish - publish: artifacts/packages artifact: Packages_Windows_$(assetManifestPlatform) @@ -204,7 +206,7 @@ stages: targetPath: $(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)/Insertion/ artifactName: 'Workloads' continueOnError: true - condition: always() + condition: ne(variables['skipWorkloadsValue'], 'true') - powershell: $(CheckNuGetSizesScript) displayName: Check NuGet sizes From dd1b34a60cabcdfe5d33be24cb9b7fce8822286d Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 16:45:13 -0400 Subject: [PATCH 34/58] Don't bring in dependencies on manifest-only build --- eng/emsdk.proj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 0fa3b5197b..7e7b1f1cab 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -21,35 +21,35 @@ + Condition="'$(TargetArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true'" /> + Condition="'$(BuildArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true'" /> + Condition="'$(TargetArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true'" /> + Condition="'$(BuildArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true'" /> + Condition="'$(TargetArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true'" /> + Condition="'$(BuildArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true'" /> + Condition="'$(TargetArchitecture)' != '' and '$(PackageHostOS)' != 'linux' and '$(ForceBuildManifestOnly)' != 'true'" /> + Condition="'$(BuildArchitecture)' != '' and '$(PackageHostOS)' != 'linux' and '$(ForceBuildManifestOnly)' != 'true'" /> From fe6c2af80e227af39f916ad642de00adcc1b9ac3 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 16:51:55 -0400 Subject: [PATCH 35/58] Be more aggressive in skipping build for SB --- eng/emsdk.proj | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 7e7b1f1cab..d0f249eaa3 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -21,35 +21,35 @@ + Condition="'$(TargetArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true' and '$(ArcadeBuildFromSource)' != 'true'" /> + Condition="'$(BuildArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true' and '$(ArcadeBuildFromSource)' != 'true'" /> + Condition="'$(TargetArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true' and '$(ArcadeBuildFromSource)' != 'true'" /> + Condition="'$(BuildArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true' and '$(ArcadeBuildFromSource)' != 'true'" /> + Condition="'$(TargetArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true' and '$(ArcadeBuildFromSource)' != 'true'" /> + Condition="'$(BuildArchitecture)' != '' and '$(ForceBuildManifestOnly)' != 'true' and '$(ArcadeBuildFromSource)' != 'true'" /> + Condition="'$(TargetArchitecture)' != '' and '$(PackageHostOS)' != 'linux' and '$(ForceBuildManifestOnly)' != 'true' and '$(ArcadeBuildFromSource)' != 'true'" /> + Condition="'$(BuildArchitecture)' != '' and '$(PackageHostOS)' != 'linux' and '$(ForceBuildManifestOnly)' != 'true' and '$(ArcadeBuildFromSource)' != 'true'" /> @@ -58,7 +58,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -134,7 +134,7 @@ - + Date: Tue, 9 May 2023 16:57:01 -0400 Subject: [PATCH 36/58] fixup! Be more aggressive in skipping build for SB --- eng/emsdk.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index d0f249eaa3..10edf52725 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -96,7 +96,7 @@ - + From 2bacb65b6fcf48e9d4775bf6d6fbc73d5c7c2ad4 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 17:17:28 -0400 Subject: [PATCH 37/58] more prebuild elimination --- eng/SourceBuildPrebuiltBaseline.xml | 3 +++ eng/emsdk.proj | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 941c37c4be..fb65c044d7 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,5 +1,8 @@ + + + diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 10edf52725..acead06f94 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -52,7 +52,8 @@ Condition="'$(BuildArchitecture)' != '' and '$(PackageHostOS)' != 'linux' and '$(ForceBuildManifestOnly)' != 'true' and '$(ArcadeBuildFromSource)' != 'true'" /> + Version="$(EmscriptenPkgVersion)" + Condition="'$(ForceBuildManifestOnly)' != 'true' and '$(ArcadeBuildFromSource)' != 'true'" /> <_PackageReferenceDeduplicated Include="@(PackageReference->Distinct())" /> From d51a6d4f77e590d7e55f24790ad46ca25b432487 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 17:25:57 -0400 Subject: [PATCH 38/58] Try again? --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index fb65c044d7..949c1c47b6 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,7 +1,7 @@ - + From e80181e073d8c26cc1fbda7012e3a00cb8d5fb97 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 17:30:46 -0400 Subject: [PATCH 39/58] No glob = no use UsagePattern --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 949c1c47b6..c5bcc8427c 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,7 +1,7 @@ + - From fc0a4ecd5fe6ab19b3264990ae7a6c6691dc5d95 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 May 2023 19:02:51 -0400 Subject: [PATCH 40/58] Build workload msis on arm64 too --- eng/azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index c42827f432..365aa3f5de 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -168,15 +168,15 @@ stages: assetManifestOS: win assetManifestPlatform: x64 archflag: -arch x64 - skipWorkloadsValue: false + SkipPublishWorkloads: false arm64: assetManifestOS: win assetManifestPlatform: arm64 archflag: -arch arm64 - skipWorkloadsvalue: true + SkipPublishWorkloads: true steps: - script: | - .\build.cmd $(archflag) -restore -build -pack -ci -configuration $(_BuildConfig) -sign -publish /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) /p:workloadPackagesPath=$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\Shipping $(_InternalBuildArgs) /p:SkipWorkloads=$(skipWorkloadsValue) + .\build.cmd $(archflag) -restore -build -pack -ci -configuration $(_BuildConfig) -sign -publish /p:PackageRID=$(assetManifestOS)-$(assetManifestPlatform) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) /p:workloadPackagesPath=$(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)\Shipping $(_InternalBuildArgs) displayName: Build and Publish - publish: artifacts/packages artifact: Packages_Windows_$(assetManifestPlatform) @@ -206,7 +206,7 @@ stages: targetPath: $(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)/Insertion/ artifactName: 'Workloads' continueOnError: true - condition: ne(variables['skipWorkloadsValue'], 'true') + condition: ne(variables['SkipPublishWorkloads'], 'true') - powershell: $(CheckNuGetSizesScript) displayName: Check NuGet sizes From cc320a0a2e16221250cfa5a3241fe00faa77349a Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 20 Jun 2023 13:33:15 -0400 Subject: [PATCH 41/58] Build against LLVM 16 from Testing --- NuGet.config | 1 + eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8366d7f1ca..3734cadc80 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19f968c89f..82eedc76c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,29 +65,29 @@ https://github.com/dotnet/node 6108064f5896b33f4d966aea696da4749f05958f - + https://github.com/dotnet/llvm-project - 2cd4a04a80c6dd0637219751e8d615a854eb76aa + 698f15beaff79bb990e48c3c632dda98b6f28d86 - + https://github.com/dotnet/llvm-project - 2cd4a04a80c6dd0637219751e8d615a854eb76aa + 698f15beaff79bb990e48c3c632dda98b6f28d86 - + https://github.com/dotnet/llvm-project - 2cd4a04a80c6dd0637219751e8d615a854eb76aa + 698f15beaff79bb990e48c3c632dda98b6f28d86 - + https://github.com/dotnet/llvm-project - 2cd4a04a80c6dd0637219751e8d615a854eb76aa + 698f15beaff79bb990e48c3c632dda98b6f28d86 - + https://github.com/dotnet/llvm-project - 2cd4a04a80c6dd0637219751e8d615a854eb76aa + 698f15beaff79bb990e48c3c632dda98b6f28d86 - + https://github.com/dotnet/llvm-project - 2cd4a04a80c6dd0637219751e8d615a854eb76aa + 698f15beaff79bb990e48c3c632dda98b6f28d86 https://github.com/dotnet/emscripten diff --git a/eng/Versions.props b/eng/Versions.props index c4ddf77146..545c7b337b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,12 +28,12 @@ 8.0.0-preview.4.23258.2 8.0.0-preview.4.23258.2 8.0.0-preview.4.23258.2 - 14.0.0-alpha.1.23258.2 - 14.0.0-alpha.1.23258.2 - 14.0.0-alpha.1.23258.2 - 14.0.0-alpha.1.23258.2 - 14.0.0-alpha.1.23258.2 - 14.0.0-alpha.1.23258.2 + 16.0.5-alpha.1.23319.2 + 16.0.5-alpha.1.23319.2 + 16.0.5-alpha.1.23319.2 + 16.0.5-alpha.1.23319.2 + 16.0.5-alpha.1.23319.2 + 16.0.5-alpha.1.23319.2 8.0.0-preview.4.23258.1 From 8b438891ca37f5b220ed3d05f3723a06ce806680 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 20 Jun 2023 13:44:46 -0400 Subject: [PATCH 42/58] typo --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 7daac13792..fbeb9cee8e 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23309.8" + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23309.8", "Microsoft.Build.Traversal": "2.0.34" } } From a5f70fdc8e38ecb02130ca698830d95816cd9307 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 20 Jun 2023 13:48:23 -0400 Subject: [PATCH 43/58] clang-16 in wrapper --- eng/clang-wrapper.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/clang-wrapper.sh b/eng/clang-wrapper.sh index 84b40f6385..d6e6e54712 100755 --- a/eng/clang-wrapper.sh +++ b/eng/clang-wrapper.sh @@ -2,12 +2,12 @@ # # This abomination of a script is meant to replace the symlinks -# pointing to the clang-14 binary and set the appropriate flags -# to avoid duplicating the 90MB clang-14 binary inside the nuget +# pointing to the clang-16 binary and set the appropriate flags +# to avoid duplicating the 90MB clang-16 binary inside the nuget # package. # CLANG_NAME=$(basename "$0") -CLANG_CC=$(dirname $0)/clang-14 +CLANG_CC=$(dirname $0)/clang-16 EXTRA_ARGS="" case $CLANG_NAME in @@ -22,4 +22,4 @@ case $CLANG_NAME in ;; esac -$CLANG_CC $EXTRA_ARGS $@ \ No newline at end of file +$CLANG_CC $EXTRA_ARGS $@ From 3a20589cca8e600c30dcbbde3388b8f0999944f9 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 20 Jun 2023 14:48:51 -0400 Subject: [PATCH 44/58] second half of clang-14->16 --- eng/emsdk.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index acead06f94..505419d752 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -205,9 +205,9 @@ - + + Condition="!Exists('$(LLVMDir)\bin\clang-16') and !$([MSBuild]::IsOSPlatform(Windows))" /> Date: Fri, 23 Jun 2023 17:17:26 -0400 Subject: [PATCH 45/58] Bump LLVM --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82eedc76c7..e6eef6936f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,29 +65,29 @@ https://github.com/dotnet/node 6108064f5896b33f4d966aea696da4749f05958f - + https://github.com/dotnet/llvm-project - 698f15beaff79bb990e48c3c632dda98b6f28d86 + df9171d5b767eb9fdb63bbc317dea8491ff357a3 - + https://github.com/dotnet/llvm-project - 698f15beaff79bb990e48c3c632dda98b6f28d86 + df9171d5b767eb9fdb63bbc317dea8491ff357a3 - + https://github.com/dotnet/llvm-project - 698f15beaff79bb990e48c3c632dda98b6f28d86 + df9171d5b767eb9fdb63bbc317dea8491ff357a3 - + https://github.com/dotnet/llvm-project - 698f15beaff79bb990e48c3c632dda98b6f28d86 + df9171d5b767eb9fdb63bbc317dea8491ff357a3 - + https://github.com/dotnet/llvm-project - 698f15beaff79bb990e48c3c632dda98b6f28d86 + df9171d5b767eb9fdb63bbc317dea8491ff357a3 - + https://github.com/dotnet/llvm-project - 698f15beaff79bb990e48c3c632dda98b6f28d86 + df9171d5b767eb9fdb63bbc317dea8491ff357a3 https://github.com/dotnet/emscripten diff --git a/eng/Versions.props b/eng/Versions.props index 545c7b337b..f8057acb69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,12 +28,12 @@ 8.0.0-preview.4.23258.2 8.0.0-preview.4.23258.2 8.0.0-preview.4.23258.2 - 16.0.5-alpha.1.23319.2 - 16.0.5-alpha.1.23319.2 - 16.0.5-alpha.1.23319.2 - 16.0.5-alpha.1.23319.2 - 16.0.5-alpha.1.23319.2 - 16.0.5-alpha.1.23319.2 + 16.0.5-alpha.1.23322.1 + 16.0.5-alpha.1.23322.1 + 16.0.5-alpha.1.23322.1 + 16.0.5-alpha.1.23322.1 + 16.0.5-alpha.1.23322.1 + 16.0.5-alpha.1.23322.1 8.0.0-preview.4.23258.1 From 70f5e6f483c0c8604f434cbdebf06dbcef4bf0dc Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 23 Jun 2023 18:01:56 -0400 Subject: [PATCH 46/58] typo --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 0eb286f2ea..85424890e9 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23316.6", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23316.6" + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23316.6", "Microsoft.Build.Traversal": "2.0.34" } } From fece4a092467b7bd716e005ffc4b23f9f8f2d9e9 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 23 Jun 2023 20:48:16 -0400 Subject: [PATCH 47/58] Bump emscripten package --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66d0faf7ae..47bbc4a4fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,9 +89,9 @@ https://github.com/dotnet/llvm-project df9171d5b767eb9fdb63bbc317dea8491ff357a3 - + https://github.com/dotnet/emscripten - 0f22156c5bc86839f36008762faf7abf83f22fa2 + 017cccda3202475ad32ba2f3d40f4636b36110ab diff --git a/eng/Versions.props b/eng/Versions.props index bdbfc80b69..baa781e9d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 16.0.5-alpha.1.23322.1 16.0.5-alpha.1.23322.1 16.0.5-alpha.1.23322.1 - 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23323.1 false From 81651ebf23a8ca91a1152b9d8b1dfce4d52337ab Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 3 Jul 2023 09:56:29 -0400 Subject: [PATCH 48/58] Bump LLVM --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47bbc4a4fd..5647a01481 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,29 +65,29 @@ https://github.com/dotnet/node 6108064f5896b33f4d966aea696da4749f05958f - + https://github.com/dotnet/llvm-project - df9171d5b767eb9fdb63bbc317dea8491ff357a3 + bd3acea90cae502d9a62164b863708d57d7993bc - + https://github.com/dotnet/llvm-project - df9171d5b767eb9fdb63bbc317dea8491ff357a3 + bd3acea90cae502d9a62164b863708d57d7993bc - + https://github.com/dotnet/llvm-project - df9171d5b767eb9fdb63bbc317dea8491ff357a3 + bd3acea90cae502d9a62164b863708d57d7993bc - + https://github.com/dotnet/llvm-project - df9171d5b767eb9fdb63bbc317dea8491ff357a3 + bd3acea90cae502d9a62164b863708d57d7993bc - + https://github.com/dotnet/llvm-project - df9171d5b767eb9fdb63bbc317dea8491ff357a3 + bd3acea90cae502d9a62164b863708d57d7993bc - + https://github.com/dotnet/llvm-project - df9171d5b767eb9fdb63bbc317dea8491ff357a3 + bd3acea90cae502d9a62164b863708d57d7993bc https://github.com/dotnet/emscripten diff --git a/eng/Versions.props b/eng/Versions.props index baa781e9d4..3eac184e0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,12 +28,12 @@ 8.0.0-preview.4.23258.2 8.0.0-preview.4.23258.2 8.0.0-preview.4.23258.2 - 16.0.5-alpha.1.23322.1 - 16.0.5-alpha.1.23322.1 - 16.0.5-alpha.1.23322.1 - 16.0.5-alpha.1.23322.1 - 16.0.5-alpha.1.23322.1 - 16.0.5-alpha.1.23322.1 + 16.0.5-alpha.1.23330.2 + 16.0.5-alpha.1.23330.2 + 16.0.5-alpha.1.23330.2 + 16.0.5-alpha.1.23330.2 + 16.0.5-alpha.1.23330.2 + 16.0.5-alpha.1.23330.2 8.0.0-preview.4.23323.1 From 20292e9a8f481ce4ef65f3a342edf8ebf405412b Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 3 Jul 2023 10:08:21 -0400 Subject: [PATCH 49/58] Deal with a distro with `python3` but not `which` (Mariner) --- eng/emsdk.proj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 505419d752..2501a85666 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -165,10 +165,12 @@ strip -s strip true + EMSDK_PYTHON=/usr/bin/python3 + Command="$(EmSdkFileName) activate $(EmscriptenSourceVersion)" + EnvironmentVariables="$(PythonEnvironment)" /> From c4d022ab4eb1438a504292581d62e80223650de5 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 4 Jul 2023 23:44:49 -0400 Subject: [PATCH 50/58] Use itemgroup condition instead of individual conditions --- eng/emsdk.proj | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 2501a85666..94602096ce 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -17,43 +17,42 @@ $(MicrosoftNETCoreRuntimeWasmEmscriptenTransportVersion) - + + Condition="'$(TargetArchitecture)' != ''" /> + Condition="'$(BuildArchitecture)' != ''" /> + Condition="'$(TargetArchitecture)' != ''" /> + Condition="'$(BuildArchitecture)' != ''" /> + Condition="'$(TargetArchitecture)' != ''" /> + Condition="'$(BuildArchitecture)' != ''" /> + Condition="'$(TargetArchitecture)' != '' and '$(PackageHostOS)' != 'linux'" /> + Condition="'$(BuildArchitecture)' != '' and '$(PackageHostOS)' != 'linux'" /> + Version="$(EmscriptenPkgVersion)" /> <_PackageReferenceDeduplicated Include="@(PackageReference->Distinct())" /> From fe87712686a05783ef37a9652a6b596bafa99591 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 5 Jul 2023 13:08:02 -0400 Subject: [PATCH 51/58] Bump Emscripten --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb8e761524..d22b8d624c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,9 +89,9 @@ https://github.com/dotnet/llvm-project bd3acea90cae502d9a62164b863708d57d7993bc - + https://github.com/dotnet/emscripten - 017cccda3202475ad32ba2f3d40f4636b36110ab + 29a2fa5337b50ca08ecf21d182ab229c1bf8e055 diff --git a/eng/Versions.props b/eng/Versions.props index 9cc4a00720..c36deb1db3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 16.0.5-alpha.1.23330.2 16.0.5-alpha.1.23330.2 16.0.5-alpha.1.23330.2 - 8.0.0-preview.4.23323.1 + 8.0.0-preview.4.23355.1 false From 7376b11664b83684bfaf3043e6aa7d53b5781ea8 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 6 Jul 2023 16:15:22 -0400 Subject: [PATCH 52/58] Bump Binaryen --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb8e761524..f7a2cd0e74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/binaryen - c868e9345d8d8f180f3c9dd3ce876af74a809bf2 + c020e47626b8f6dd5dc604a5d548b01513bf08c1 - + https://github.com/dotnet/binaryen - c868e9345d8d8f180f3c9dd3ce876af74a809bf2 + c020e47626b8f6dd5dc604a5d548b01513bf08c1 - + https://github.com/dotnet/binaryen - c868e9345d8d8f180f3c9dd3ce876af74a809bf2 + c020e47626b8f6dd5dc604a5d548b01513bf08c1 - + https://github.com/dotnet/binaryen - c868e9345d8d8f180f3c9dd3ce876af74a809bf2 + c020e47626b8f6dd5dc604a5d548b01513bf08c1 - + https://github.com/dotnet/binaryen - c868e9345d8d8f180f3c9dd3ce876af74a809bf2 + c020e47626b8f6dd5dc604a5d548b01513bf08c1 - + https://github.com/dotnet/binaryen - c868e9345d8d8f180f3c9dd3ce876af74a809bf2 + c020e47626b8f6dd5dc604a5d548b01513bf08c1 https://github.com/dotnet/cpython diff --git a/eng/Versions.props b/eng/Versions.props index 9cc4a00720..38c22170b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,12 +12,12 @@ 3.1.12 7.0.5 6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11)) - 8.0.0-preview.4.23258.1 - 8.0.0-preview.4.23258.1 - 8.0.0-preview.4.23258.1 - 8.0.0-preview.4.23258.1 - 8.0.0-preview.4.23258.1 - 8.0.0-preview.4.23258.1 + 8.0.0-preview.4.23355.2 + 8.0.0-preview.4.23355.2 + 8.0.0-preview.4.23355.2 + 8.0.0-preview.4.23355.2 + 8.0.0-preview.4.23355.2 + 8.0.0-preview.4.23355.2 8.0.0-preview.4.23258.1 8.0.0-preview.4.23258.1 8.0.0-preview.4.23258.1 From 5830cfe9af1d9bab4db6572c1f256a074bb03fec Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 7 Jul 2023 19:31:16 -0400 Subject: [PATCH 53/58] Only do manifest builds when targeting x64 --- eng/emsdk.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 94602096ce..ea37ffe4dd 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -374,7 +374,7 @@ Date: Mon, 10 Jul 2023 09:42:44 -0400 Subject: [PATCH 54/58] Fix last change --- eng/emsdk.proj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/emsdk.proj b/eng/emsdk.proj index ea37ffe4dd..9107e1ecf3 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -378,15 +378,15 @@ Targets="Build" Properties="PreReleaseVersionLabel=$(PreReleaseVersionLabel);PreReleaseVersionIteration=$(PreReleaseVersionIteration)" /> From 0180941950bbf4f53a252de36b8083fca0008bd6 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 10 Jul 2023 10:55:08 -0400 Subject: [PATCH 55/58] Only do workload generation on x64 --- eng/Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Build.props b/eng/Build.props index def8e2953d..a2b0a8fe93 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -2,6 +2,6 @@ - + From cd4dc846001ec07c21d3ba39643d837c9090b3b9 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 10 Jul 2023 18:40:14 -0400 Subject: [PATCH 56/58] Remove general testing feed --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 3734cadc80..8366d7f1ca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,6 @@ - From 138240f3a6d1f4e3d160436aa0a01ca4a5ca917d Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 11 Jul 2023 10:15:24 -0400 Subject: [PATCH 57/58] Suggestions from Matt RE source-build --- eng/SourceBuildPrebuiltBaseline.xml | 3 --- eng/Version.Details.xml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 763acc8974..b2fb074527 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -3,9 +3,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0caaf1540..960c13849b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -120,5 +120,20 @@ https://github.com/dotnet/arcade 9fc23a576f443284d25cd4311f5778158ad289c9 + + https://github.com/dotnet/xliff-tasks + 10a822a79bde97ca45faa76dc4ec33b85533728a + + + + https://github.com/dotnet/sourcelink + 5d7d1f2bbb1aa5806c219cc8f64c7682b6fe3518 + + + + https://github.com/dotnet/source-build-reference-packages + 81a9aad6994047fc0e589a82597d1d8c179f22bd + + From 59813268d640f27f66ee98a31432ecfc234d6e5d Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 12 Jul 2023 13:15:20 -0400 Subject: [PATCH 58/58] darc update --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38e51c4a09..1f3e6391a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -125,9 +125,9 @@ 10a822a79bde97ca45faa76dc4ec33b85533728a - + https://github.com/dotnet/sourcelink - 5d7d1f2bbb1aa5806c219cc8f64c7682b6fe3518 + d65917a564ce5d2b75fc387a7f4d0bcc6bdd269d