Skip to content

Commit 35ae498

Browse files
authored
[release/6.0] Resolve component governance bugs (dotnet#38539)
* Resolve conflicts * Remove remaining System.Net.Http 4.1.0 reference (dotnet#38441)
1 parent 97c1261 commit 35ae498

File tree

19 files changed

+80
-61
lines changed

19 files changed

+80
-61
lines changed

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
<SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
169169
<SystemNetSocketsVersion>4.3.0</SystemNetSocketsVersion>
170170
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
171-
<SystemThreadingTasksExtensionsVersion>4.5.3</SystemThreadingTasksExtensionsVersion>
171+
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
172172
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
173173
<!-- Packages developed by @aspnet, but manually updated as necessary. -->
174174
<LibuvVersion>1.10.0</LibuvVersion>
@@ -225,7 +225,7 @@
225225
<BenchmarkDotNetVersion>0.13.0</BenchmarkDotNetVersion>
226226
<CastleCoreVersion>4.2.1</CastleCoreVersion>
227227
<CommandLineParserVersion>2.3.0</CommandLineParserVersion>
228-
<FSharpCoreVersion>4.2.1</FSharpCoreVersion>
228+
<FSharpCoreVersion>6.0.0</FSharpCoreVersion>
229229
<GoogleProtobufVersion>3.18.0</GoogleProtobufVersion>
230230
<GrpcAspNetCoreVersion>2.40.0</GrpcAspNetCoreVersion>
231231
<GrpcAuthVersion>2.40.0</GrpcAuthVersion>
@@ -256,7 +256,7 @@
256256
<SerilogExtensionsLoggingVersion>1.4.0</SerilogExtensionsLoggingVersion>
257257
<SerilogSinksFileVersion>4.0.0</SerilogSinksFileVersion>
258258
<StackExchangeRedisVersion>2.2.4</StackExchangeRedisVersion>
259-
<SystemReactiveLinqVersion>3.1.1</SystemReactiveLinqVersion>
259+
<SystemReactiveLinqVersion>5.0.0</SystemReactiveLinqVersion>
260260
<SwashbuckleAspNetCoreVersion>6.2.3</SwashbuckleAspNetCoreVersion>
261261
<XunitAbstractionsVersion>2.0.3</XunitAbstractionsVersion>
262262
<XunitAnalyzersVersion>0.10.0</XunitAnalyzersVersion>

src/Components/WebAssembly/Authentication.Msal/src/Interop/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@
2727
},
2828
"dependencies": {
2929
"@azure/msal-browser": "^2.16.1"
30+
},
31+
"resolutions": {
32+
"ansi-regex": "5.0.1"
3033
}
3134
}

src/Components/WebAssembly/Authentication.Msal/src/Interop/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,10 +1242,10 @@ ansi-colors@^4.1.1:
12421242
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
12431243
integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
12441244

1245-
ansi-regex@^5.0.0:
1246-
version "5.0.0"
1247-
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
1248-
integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
1245+
ansi-regex@5.0.1, ansi-regex@^5.0.0:
1246+
version "5.0.1"
1247+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
1248+
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
12491249

12501250
ansi-styles@^3.2.1:
12511251
version "3.2.1"

src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@
2727
},
2828
"dependencies": {
2929
"oidc-client": "^1.11.5"
30+
},
31+
"resolutions": {
32+
"ansi-regex": "5.0.1"
3033
}
3134
}

src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,10 +1228,10 @@ ansi-colors@^4.1.1:
12281228
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
12291229
integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
12301230

1231-
ansi-regex@^5.0.0:
1232-
version "5.0.0"
1233-
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
1234-
integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
1231+
ansi-regex@5.0.1, ansi-regex@^5.0.0:
1232+
version "5.0.1"
1233+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
1234+
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
12351235

12361236
ansi-styles@^3.2.1:
12371237
version "3.2.1"

src/Components/test/E2ETest/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"@types/node": "^13.1.7",
2020
"ts-node": "^8.6.2",
2121
"typescript": "^3.7.5"
22+
},
23+
"resolutions": {
24+
"lodash": ">=4.17.21"
2225
}
2326
}

src/Components/test/E2ETest/yarn.lock

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -330,15 +330,10 @@ lodash.merge@^4.6.2:
330330
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
331331
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
332332

333-
lodash@^4.16.6:
334-
version "4.17.15"
335-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
336-
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
337-
338-
lodash@^4.17.14:
339-
version "4.17.14"
340-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
341-
integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
333+
lodash@>=4.17.21, lodash@^4.16.6, lodash@^4.17.14:
334+
version "4.17.21"
335+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
336+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
342337

343338
lowercase-keys@^2.0.0:
344339
version "2.0.0"

src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<Reference Include="Microsoft.AspNetCore.Mvc.Testing" />
2626
<Reference Include="Microsoft.EntityFrameworkCore.Sqlite" />
2727
<Reference Include="AngleSharp" />
28+
<Reference Include="System.Net.Http" />
2829
</ItemGroup>
2930

3031
<ItemGroup>

src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
<ItemGroup>
1212
<Reference Include="AngleSharp" />
13+
<Reference Include="System.Net.Http" />
1314
<Reference Include="Microsoft.AspNetCore.Hosting" />
1415
<Reference Include="Microsoft.AspNetCore.Http" />
1516
<Reference Include="Microsoft.AspNetCore.Identity.Specification.Tests" />

src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<ProjectReference Include="..\WebSites\XmlFormattersWebSite\XmlFormattersWebSite.csproj" />
4545

4646
<Reference Include="AngleSharp" />
47+
<Reference Include="System.Net.Http" />
4748
<Reference Include="Microsoft.AspNet.WebApi.Client" />
4849
<Reference Include="Microsoft.AspNetCore.Components.Server" />
4950
<Reference Include="Microsoft.AspNetCore.Routing.Abstractions" />

0 commit comments

Comments
 (0)