Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Component Governance alerts #41485

Merged
merged 5 commits into from
May 3, 2022
Merged

Fix Component Governance alerts #41485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
695478d
Fix Component Governance alerts
wtgodbe May 2, 2022
63a2211
Fixup
wtgodbe May 2, 2022
464728e
Update Versions.props
wtgodbe May 2, 2022
c7fc77c
Update spa-templates
wtgodbe May 3, 2022
4e8a2fe
Update template-baselines.json
MackinnonBuck May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions eng/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ and are generated based on the last package release.
<LatestPackageReference Include="System.Net.Http" />
<LatestPackageReference Include="System.Net.Http.Json" />
<LatestPackageReference Include="System.Net.Sockets" />
<LatestPackageReference Include="System.Private.Uri" />
<LatestPackageReference Include="System.Reflection.Metadata" />
<LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
<LatestPackageReference Include="System.Security.Cryptography.Pkcs" />
<LatestPackageReference Include="System.Security.Cryptography.X509Certificates" />
<LatestPackageReference Include="System.Security.Cryptography.Xml" />
<LatestPackageReference Include="System.Security.Permissions" />
<LatestPackageReference Include="System.Security.Principal.Windows" />
Expand Down
2 changes: 2 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@
<SystemComponentModelVersion>4.3.0</SystemComponentModelVersion>
<SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
<SystemNetSocketsVersion>4.3.0</SystemNetSocketsVersion>
<SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
<SystemSecurityCryptographyX509CertificatesVersion>4.3.0</SystemSecurityCryptographyX509CertificatesVersion>
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
Expand Down
1 change: 1 addition & 0 deletions src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<Reference Include="Microsoft.AspNetCore.SignalR.Client" />
<Reference Include="Microsoft.Extensions.Logging.Configuration" />
<Reference Include="Newtonsoft.Json" />
<Reference Include="System.Private.Uri" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<ItemGroup>
<Reference Include="BenchmarkDotNet" />
<Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
<Reference Include="System.Private.Uri" />

<Compile Include="$(SharedSourceRoot)BenchmarkRunner\*.cs" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Servers/IIS/IIS/samples/NativeIISSample/NativeIISSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<Reference Include="Microsoft.AspNetCore.Server.IIS" />
<Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="System.Private.Uri" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<Reference Include="Microsoft.AspNetCore.Server.IIS" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="System.Diagnostics.EventLog" />
<Reference Include="System.Private.Uri" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" >
<AllowExplicitReference>true</AllowExplicitReference>
</PackageReference>
<PackageReference Include="System.Private.Uri" Version="4.3.2" >
<AllowExplicitReference>true</AllowExplicitReference>
</PackageReference>
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.1" >
<AllowExplicitReference>true</AllowExplicitReference>
</PackageReference>
Expand Down
1 change: 1 addition & 0 deletions src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<Reference Include="Microsoft.Extensions.Configuration.Json" />
<Reference Include="Microsoft.Extensions.Hosting" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
<Reference Include="System.Private.Uri" />
<Reference Include="xunit.assert" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions .../IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
<Reference Include="Microsoft.NETCore.Windows.ApiSets" />
<Reference Include="Microsoft.Web.Administration" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Security.Cryptography.X509Certificates" />
<Reference Include="System.ServiceProcess.ServiceController" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion src/SignalR/clients/ts/FunctionalTests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
"lodash": ">=4.17.21",
"url-parse": ">=1.5.6",
"ua-parser-js": "^0.7.30",
"minimist": ">=1.2.6"
"minimist": ">=1.2.6",
"ws": "^7.4.6"
},
"author": "",
"license": "MIT"
Expand Down
18 changes: 4 additions & 14 deletions src/SignalR/clients/ts/FunctionalTests/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3550,20 +3550,10 @@ wrappy@1:
dependencies:
async-limiter "~1.0.0"

ws@^7.2.3:
version "7.5.5"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==

ws@^7.4.5:
version "7.4.5"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==

ws@~8.2.3:
version "8.2.3"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
ws@^7.2.3, ws@^7.4.5, ws@^7.4.6, ws@~8.2.3:
version "7.5.7"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I'm reading this correctly, it looks scary. Does this mean that a package requesting ws v8.2.3 will instead get v7.5.7❔ If yes, is there a way to map v7.x.y to v7.5.7 but still have v8.2.3 map to itself❔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it does mean that, and I'm not sure if there's a way to achieve that. I'm trying ^ here because I've run into problems with resolving versions using >= as that often updates things too much and leads to build breaks.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to use >= instead of ^, after looking at other branches I'm thinking that >= breaks things less often than I'd thought.


xmlbuilder@12.0.0:
version "12.0.0"
Expand Down
3 changes: 2 additions & 1 deletion src/SignalR/clients/ts/signalr-protocol-msgpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
},
"devDependencies": {},
"resolutions": {
"url-parse": ">=1.5.6"
"url-parse": ">=1.5.6",
"ws": "^7.4.6"
}
}
8 changes: 4 additions & 4 deletions src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ whatwg-url@^5.0.0:
tr46 "~0.0.3"
webidl-conversions "^3.0.0"

ws@^7.4.5:
version "7.4.5"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
ws@^7.4.5, ws@^7.4.6:
version "7.5.7"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
1 change: 1 addition & 0 deletions src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<ItemGroup>
<Reference Include="Microsoft.Build" ExcludeAssets="runtime" />
<Reference Include="Microsoft.Build.Locator" />
<Reference Include="System.Private.Uri" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

<ItemGroup>
<Reference Include="Microsoft.Data.SqlClient" />
<Reference Include="System.Private.Uri" />
</ItemGroup>

</Project>