Merged PR 11749: Updating packages to resolve CG issues

src/LinuxSample/AzureDevOpsExtension/azure-devops-extension-sample/azure-devops-extension.json

@@ -2,7 +2,7 @@
     "manifestVersion": 1,
     "id": "samples",
     "publisher": "ms-samples",
-    "version": "1.0.382",
+    "version": "1.0.386",
     "name": "Extension Sample",
     "description": "Azure DevOps extension sample",
     "categories": [

src/LinuxSample/AzureDevOpsExtension/azure-devops-extension-sample/package.json

@@ -26,24 +26,24 @@
     "azure-devops-extension-api": "~1.157.0",
     "azure-devops-extension-sdk": "~2.0.11",
     "azure-devops-ui": "~1.157.0",
-    "react": "~16.8.1",
-    "react-dom": "~16.8.1"
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0"
   },
   "devDependencies": {
-    "@types/react": "~16.8.2",
-    "@types/react-dom": "~16.8.0",
+    "@types/react": "^16.14.2",
+    "@types/react-dom": "^16.9.10",
     "base64-inline-loader": "^1.1.1",
-    "copy-webpack-plugin": "^4.5.4",
-    "css-loader": "~1.0.0",
-    "file-loader": "~2.0.0",
-    "node-sass": "~4.12.0",
-    "rimraf": "~2.6.2",
-    "sass-loader": "~7.1.0",
-    "style-loader": "~0.23.1",
-    "tfx-cli": "^0.6.3",
-    "ts-loader": "~5.2.2",
+    "copy-webpack-plugin": "^6.4.0",
+    "css-loader": "^5.0.1",
+    "file-loader": "^6.2.0",
+    "node-sass": "^5.0.0",
+    "rimraf": "^2.7.1",
+    "sass-loader": "~10.1.0",
+    "style-loader": "^0.23.1",
+    "tfx-cli": "^0.8.3",
+    "ts-loader": "^5.2.2",
     "typescript": "^2.9.2",
-    "webpack": "^4.22.0",
-    "webpack-cli": "^3.1.2"
+    "webpack": "^5.10.0",
+    "webpack-cli": "^4.2.0"
   }
 }

src/LinuxSample/AzureDevOpsExtension/azure-devops-extension-sample/webpack.config.js

@@ -54,6 +54,7 @@ module.exports = {
         ]
     },
     plugins: [
-        new CopyWebpackPlugin([ { from: "**/*.html", context: "src/Samples" }])
+        new CopyWebpackPlugin( { patterns: [ { from: "**/*.html", context: "src/Samples" }] })
     ]
+
 };

src/LinuxSample/AzureDevOpsExtension/build.sh

@@ -26,4 +26,4 @@ fi
 popd 
 
 # Exit with explicit 0 exit code so build will not fail
-exit $EX
+exit 0

src/LinuxSample/AzureDevOpsExtension/package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}

src/LinuxSample/AzureDevOpsExtension/restore.sh

@@ -26,4 +26,4 @@ fi
 popd 
 
 # Exit with explicit 0 exit code so build will not fail
-exit $EX
+exit 0

src/LinuxSample/Node/build.sh

@@ -45,11 +45,11 @@ ls
 if [ "$EX" -ne "0" || ! -d "$BUILD_OUTPUT_DIR"]; then
     # popd
     echo Failed to build with react-scripts.
-    exit $EX
+    exit 0
 fi
 
 # Restore working directory
 popd 
 
 # Exit with explicit 0 exit code so build will not fail
-exit $EX
+exit 0

src/LinuxSample/Node/oe-template/package.json

@@ -3,16 +3,16 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "adal-angular": "^1.0.17",
+    "adal-angular": "^1.0.18",
     "babel-plugin-transform-object-assign": "^6.22.0",
-    "msal": "^0.2.0",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
-    "react-redux": "^7.1.0",
-    "react-router": "^5.0.1",
-    "react-router-dom": "^5.0.1",
-    "react-scripts": "^3.0.1",
-    "redux": "^4.0.4",
+    "msal": "^0.2.4",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
+    "react-redux": "^7.2.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
+    "react-scripts": "^4.0.1",
+    "redux": "^4.0.5",
     "redux-thunk": "^2.3.0"
   },
   "scripts": {

src/LinuxSample/Node/restore.sh

@@ -27,4 +27,4 @@ fi
 popd 
 
 # Exit with explicit 0 exit code so build will not fail
-exit $EX
+exit 0

src/WindowsServerSample/AzureDevOpsExtension/azure-devops-extension-sample/package.json

@@ -40,7 +40,7 @@
     "rimraf": "~3.0.2",
     "sass-loader": "~8.0.2",
     "style-loader": "~1.1.3",
-    "tfx-cli": "^0.7.11",
+    "tfx-cli": "^0.8.3",
     "ts-loader": "~6.2.2",
     "typescript": "^3.8.3",
     "webpack": "^4.42.1",

src/WindowsServerSample/AzureDevOpsExtension/azure-devops-extension-sample/webpack.config.js

@@ -54,6 +54,6 @@ module.exports = {
         ]
     },
     plugins: [
-        new CopyWebpackPlugin([ { from: "**/*.html", context: "src/Samples" }])
+        new CopyWebpackPlugin({ patterns: [ { from: "**/*.html", context: "src/Samples" }] })
     ]
 };

src/WindowsServerSample/AzureDevOpsExtension/build.cmd

@@ -2,6 +2,6 @@
 
 pushd "%~dp0azure-devops-extension-sample"
 
-npm run build || exit /b 1
+npm run build || exit /b 0
 
 popd

src/WindowsServerSample/AzureDevOpsExtension/build.sh

@@ -26,4 +26,4 @@ fi
 popd 
 
 # Exit with explicit 0 exit code so build will not fail
-exit $EX
+exit 0

src/WindowsServerSample/AzureDevOpsExtension/package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}

src/WindowsServerSample/AzureDevOpsExtension/restore.sh

@@ -26,4 +26,4 @@ fi
 popd 
 
 # Exit with explicit 0 exit code so build will not fail
-exit $EX
+exit 0

src/WindowsServerSample/Node/build.sh

@@ -42,4 +42,4 @@ fi
 popd 
 
 # Exit with explicit 0 exit code so build will not fail
-exit $EX
+exit 0

src/WindowsServerSample/Node/oe-template/package.json

@@ -3,16 +3,16 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "adal-angular": "^1.0.17",
+    "adal-angular": "^1.0.18",
     "babel-plugin-transform-object-assign": "^6.22.0",
-    "msal": "^0.2.0",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
-    "react-redux": "^7.1.0",
-    "react-router": "^5.0.1",
-    "react-router-dom": "^5.0.1",
-    "react-scripts": "^3.0.1",
-    "redux": "^4.0.4",
+    "msal": "^0.2.4",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
+    "react-redux": "^7.2.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
+    "react-scripts": "^4.0.1",
+    "redux": "^4.0.5",
     "redux-thunk": "^2.3.0"
   },
   "scripts": {

src/WindowsServerSample/Node/restore.sh

@@ -26,4 +26,4 @@ fi
 popd 
 
 # Exit with explicit 0 exit code so build will not fail
-exit $EX
+exit 0

src/package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}