diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 979f3f880c..adc14289f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,37 +49,37 @@ https://github.com/dotnet/cpython bbdcd1d66c245d46433da4869ef0b09d87fd3775 - + https://github.com/dotnet/node - 3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7 + 47afc4864111d5af2ce03262bc49073140e0821b - + https://github.com/dotnet/node - 3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7 + 47afc4864111d5af2ce03262bc49073140e0821b - + https://github.com/dotnet/node - 3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7 + 47afc4864111d5af2ce03262bc49073140e0821b - + https://github.com/dotnet/node - 3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7 + 47afc4864111d5af2ce03262bc49073140e0821b - + https://github.com/dotnet/node - 3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7 + 47afc4864111d5af2ce03262bc49073140e0821b - + https://github.com/dotnet/node - 3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7 + 47afc4864111d5af2ce03262bc49073140e0821b - + https://github.com/dotnet/node - 3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7 + 47afc4864111d5af2ce03262bc49073140e0821b - + https://github.com/dotnet/node - 3a8007cf8cbb0a78eaf0a8e03f3ed5b5023e26b7 + 47afc4864111d5af2ce03262bc49073140e0821b https://github.com/dotnet/llvm-project @@ -145,9 +145,9 @@ https://github.com/dotnet/llvm-project 55fbf5793d3f255f5525ae7cb57736ab71270a52 - + https://github.com/dotnet/emscripten - e4b9356443189c19a5e4ebeef58652f9c436402f + f5b445017e80145a9baf893401083b1367455bc6 diff --git a/eng/Versions.props b/eng/Versions.props index fae281aec8..cdf0a77988 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,14 +28,14 @@ 9.0.0-alpha.1.25563.2 9.0.0-alpha.1.25563.2 9.0.0-alpha.1.25563.2 - 9.0.0-alpha.1.25312.1 - 9.0.0-alpha.1.25312.1 - 9.0.0-alpha.1.25312.1 - 9.0.0-alpha.1.25312.1 - 9.0.0-alpha.1.25312.1 - 9.0.0-alpha.1.25312.1 - 9.0.0-alpha.1.25312.1 - 9.0.0-alpha.1.25312.1 + 9.0.0-alpha.1.25602.7 + 9.0.0-alpha.1.25602.7 + 9.0.0-alpha.1.25602.7 + 9.0.0-alpha.1.25602.7 + 9.0.0-alpha.1.25602.7 + 9.0.0-alpha.1.25602.7 + 9.0.0-alpha.1.25602.7 + 9.0.0-alpha.1.25602.7 19.1.0-alpha.1.25565.2 19.1.0-alpha.1.25565.2 19.1.0-alpha.1.25565.2 @@ -44,7 +44,7 @@ 19.1.0-alpha.1.25565.2 19.1.0-alpha.1.25565.2 19.1.0-alpha.1.25565.2 - 9.0.0-alpha.1.25563.2 + 9.0.0-alpha.1.25574.3 true diff --git a/eng/emsdk.proj b/eng/emsdk.proj index 1cee58eb5b..47547183fc 100644 --- a/eng/emsdk.proj +++ b/eng/emsdk.proj @@ -174,15 +174,6 @@ - - - $(NodeDir)/bin:$(PATH) - $(NodeDir)\bin%3B$(PATH.Replace(';', '%3B')) - - - - - - + + + $(HostNodeDir)/bin:$(PATH) + $(HostNodeDir)\bin%3B$(PATH.Replace(';', '%3B')) + + + diff --git a/eng/sanitize.py b/eng/sanitize.py deleted file mode 100644 index 19d02f90b7..0000000000 --- a/eng/sanitize.py +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env python3 -import json -import os -import shutil -import sys - - -def glob(path): - return [os.path.join(path, filename) for filename in os.listdir(path)] - - -def remove(*paths): - for path in paths: - path = os.path.abspath(path) - try: - if os.path.isdir(path): - shutil.rmtree(path) - else: - os.remove(path) - except OSError as error: - print(error) - - -def rewrite_package_json(path): - package = open(path, "r+") - settings = json.load(package) - settings["devDependencies"] = {} - package.seek(0) - package.truncate() - json.dump(settings, package, indent=4) - package.close() - - -emscripten_path = sys.argv[1] -node_root = sys.argv[2] -node_paths = glob(node_root) -upgrade = True - -# Add the local node bin directory to the path so that -# npm can find it when doing the updating or pruning -os.environ["PATH"] = os.path.join(node_paths[0], "bin") + os.pathsep + os.environ["PATH"] - -# Set root .npmrc file as the config to make sure we use AzDO feed -os.environ["npm_config_userconfig"] = os.path.join(os.getcwd(), ".npmrc") - -def update_npm(path): - try: - os.chdir(os.path.join(path, "lib")) - os.system("npm install npm@latest") - os.system("npm install npm@latest") - prune() - except OSError as error: - print("npm update failed") - print(error) - - -def remove_npm(path): - os.chdir(path) - remove("bin/npx", "bin/npm", "include", "lib", "share") - - -def prune(): - try: - os.system("npm prune --production") - except OSError as error: - print("npm prune failed") - print(error) - -if upgrade: - for path in node_paths: - update_npm(path) - -os.chdir(emscripten_path) -rewrite_package_json("package.json") -try: - os.system("npm audit fix") -except OSError as error: - print("npm audit fix failed") - print(error) - -prune() - -if not upgrade: - for path in node_paths: - remove_npm(path)