Merge in 'release/3.1' changes

dotnet-bot · dotnet-bot · commit 64bcee623787 · 2022-03-11T18:12:57.000Z
diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props
@@ -114,6 +114,7 @@
     <_CompilationOnlyReference Include="System.ComponentModel.Annotations" />
     <_CompilationOnlyReference Include="System.Runtime.CompilerServices.Unsafe" />
     <_CompilationOnlyReference Include="System.Text.Json" />
+    <_CompilationOnlyReference Include="System.Text.Encodings.Web" />
   </ItemGroup>
 
   <!--
@@ -124,6 +125,7 @@
     <_CompilationOnlyReference Include="Microsoft.Win32.Registry" />
     <_CompilationOnlyReference Include="System.Security.Cryptography.Cng" />
     <_CompilationOnlyReference Include="System.Security.Principal.Windows" />
+    <_CompilationOnlyReference Include="System.Text.Encodings.Web" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/test/E2ETest/package.json b/src/Components/test/E2ETest/package.json
@@ -22,6 +22,7 @@
   },
   "resolutions": {
     "bl": ">=2.2.1",
-    "lodash": ">=4.17.21"
+    "lodash": ">=4.17.21",
+    "urijs": ">=1.19.10"
   }
 }
diff --git a/src/Components/test/E2ETest/yarn.lock b/src/Components/test/E2ETest/yarn.lock
@@ -699,10 +699,10 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urijs@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
-  integrity sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==
+urijs@>=1.19.10, urijs@^1.19.1:
+  version "1.19.10"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.10.tgz#8e2fe70a8192845c180f75074884278f1eea26cb"
+  integrity sha512-EzauQlgKuJgsXOqoMrCiePBf4At5jVqRhXykF3Wfb8ZsOBMxPcfiVBcsHXug4Aepb/ICm2PIgqAUGMelgdrWEg==
 
 util-deprecate@^1.0.1:
   version "1.0.2"
diff --git a/src/ProjectTemplates/test/package.json b/src/ProjectTemplates/test/package.json
@@ -15,6 +15,7 @@
   },
   "resolutions": {
     "lodash": ">=4.17.21",
-    "bl": ">=2.2.1"
+    "bl": ">=2.2.1",
+    "urijs": ">=1.19.10"
   }
 }
diff --git a/src/ProjectTemplates/test/yarn.lock b/src/ProjectTemplates/test/yarn.lock
@@ -533,10 +533,10 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urijs@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
-  integrity sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==
+urijs@>=1.19.10, urijs@^1.19.1:
+  version "1.19.10"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.10.tgz#8e2fe70a8192845c180f75074884278f1eea26cb"
+  integrity sha512-EzauQlgKuJgsXOqoMrCiePBf4At5jVqRhXykF3Wfb8ZsOBMxPcfiVBcsHXug4Aepb/ICm2PIgqAUGMelgdrWEg==
 
 util-deprecate@^1.0.1:
   version "1.0.2"

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`},`
`23`	`23`	`"resolutions": {`
`24`	`24`	`"bl": ">=2.2.1",`
`25`		`- "lodash": ">=4.17.21"`
	`25`	`+ "lodash": ">=4.17.21",`
	`26`	`+ "urijs": ">=1.19.10"`
`26`	`27`	`}`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`},`
`16`	`16`	`"resolutions": {`
`17`	`17`	`"lodash": ">=4.17.21",`
`18`		`- "bl": ">=2.2.1"`
	`18`	`+ "bl": ">=2.2.1",`
	`19`	`+ "urijs": ">=1.19.10"`
`19`	`20`	`}`
`20`	`21`	`}`