diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index f8c3f2116444..feec59968ea5 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - - - + + + @@ -34,120 +34,120 @@ - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 @@ -155,114 +155,114 @@ - 6.0.2 + 6.0.3 - - + + - - + + - - + + - 6.0.2 + 6.0.3 - + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - + - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 - + - 6.0.2 + 6.0.3 - - - + + + - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - - + + @@ -270,81 +270,81 @@ - 6.0.2 + 6.0.3 - + - 6.0.2 + 6.0.3 - + - + - + - + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - - + + - + - - + + - + - - + + - + @@ -352,58 +352,58 @@ - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - + - 6.0.2 + 6.0.3 @@ -411,71 +411,71 @@ - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - - + + - - + + - - + + - - + + - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 @@ -491,195 +491,195 @@ - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - + - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 - - + + - 6.0.2 + 6.0.3 - + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - + - + - 6.0.2 + 6.0.3 - - + + - - + + - - + + - 6.0.2 + 6.0.3 - - + + - - + + - - + + - - + + - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - - - - + + + + - 6.0.2 + 6.0.3 @@ -688,69 +688,69 @@ - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - + - 6.0.2 + 6.0.3 - + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 @@ -769,7 +769,7 @@ - 6.0.2 + 6.0.3 @@ -788,62 +788,62 @@ - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - + - + - + - + - + - + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - - - + + + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 @@ -853,7 +853,7 @@ - 6.0.2 + 6.0.3 @@ -862,79 +862,79 @@ - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - + - + - + - 6.0.2 + 6.0.3 - + - + - + - + - + - + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - + @@ -943,7 +943,7 @@ - + @@ -951,17 +951,17 @@ - + - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 @@ -979,13 +979,13 @@ - 6.0.2 + 6.0.3 - 6.0.2 + 6.0.3 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 24d6ccfa45b2..903713249197 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,114 +1,114 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16531cf760aa..a1f0d6ec5533 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -280,22 +280,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f diff --git a/eng/Versions.props b/eng/Versions.props index 75af9bf607f7..181afaaa14ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 6 0 4 - false + true @@ -131,8 +131,8 @@ 6.0.4 6.0.4 - 6.0.0-beta.22107.2 - 6.0.0-beta.22107.2 + 6.0.0-beta.22122.7 + 6.0.0-beta.22122.7 2.1.1 2.2.0 - 3.1.22-servicing-21579-4 + 3.1.23-servicing-22123-12 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version) - 5.0.14-servicing-22063-24 + 5.0.15-servicing-22116-16 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 new file mode 100644 index 000000000000..a733a8885824 --- /dev/null +++ b/eng/common/generate-sbom-prep.ps1 @@ -0,0 +1,19 @@ +Param( + [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed +) + +Write-Host "Creating dir $ManifestDirPath" +# create directory for sbom manifest to be placed +if (!(Test-Path -path $ManifestDirPath)) +{ + New-Item -ItemType Directory -path $ManifestDirPath + Write-Host "Successfully created directory $ManifestDirPath" +} +else{ + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +} + +Write-Host "Updating artifact name" +$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' +Write-Host "Artifact name $artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh new file mode 100644 index 000000000000..f6c77453142a --- /dev/null +++ b/eng/common/generate-sbom-prep.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +manifest_dir=$1 + +if [ ! -d "$manifest_dir" ] ; then + mkdir -p "$manifest_dir" + echo "Sbom directory created." $manifest_dir +else + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +fi + +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +echo "Artifact name before : "$artifact_name +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" +echo "Artifact name after : "$safe_artifact_name +export ARTIFACT_NAME=$safe_artifact_name +echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" + +exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 30d1de5835e8..547d878da073 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -31,6 +31,10 @@ parameters: name: '' preSteps: [] runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' jobs: - job: ${{ parameters.name }} @@ -247,3 +251,9 @@ jobs: ArtifactName: AssetManifests continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 70d44735ace4..554e71cfc436 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -8,10 +8,6 @@ parameters: # Optional: Enable publishing using release pipelines enablePublishUsingPipelines: false - # Optional: Disable component governance detection. In general, component governance - # should be on for all jobs. Use only in the event of issues. - disableComponentGovernance: false - # Optional: Enable running the source-build jobs to build repo from source enableSourceBuild: false diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml new file mode 100644 index 000000000000..f4d7937f3798 --- /dev/null +++ b/eng/common/templates/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed + +parameters: + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + +- task: PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index 3f354ab1872d..b9b16f9f858f 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -1,16 +1,16 @@ - - false + true @@ -59,7 +59,7 @@ Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal' AND '$(IsPublicRuntime)' == 'false'" Destination="dotnet-cli" Uri="https://dotnetbuilds.blob.core.windows.net/internal/Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(DotNetCliRuntime)$(ArchiveExtension)$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))" /> - + runtime diff --git a/global.json b/global.json index 3ed497ccfba5..a852dd17154b 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "6.0.102" + "version": "6.0.103" }, "tools": { - "dotnet": "6.0.102", + "dotnet": "6.0.103", "runtimes": { "dotnet/x64": [ "2.1.30", @@ -13,7 +13,7 @@ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" ], "aspnetcore/x64": [ - "3.1.22" + "3.1.23" ] }, "Git": "2.22.0", @@ -29,7 +29,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22107.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22122.7" } } diff --git a/src/Components/Web.JS/package.json b/src/Components/Web.JS/package.json index b28bbe47a34c..e05f5a4ba14a 100644 --- a/src/Components/Web.JS/package.json +++ b/src/Components/Web.JS/package.json @@ -42,7 +42,7 @@ }, "resolutions": { "**/set-value": "^4.0.1", - "url-parse": ">=1.5.6", + "url-parse": ">=1.5.8", "node-fetch": ">=2.6.7" } } diff --git a/src/Components/Web.JS/yarn.lock b/src/Components/Web.JS/yarn.lock index d94e520111f9..f67cf3464f37 100644 --- a/src/Components/Web.JS/yarn.lock +++ b/src/Components/Web.JS/yarn.lock @@ -1883,9 +1883,9 @@ ansi-escapes@^4.2.1: type-fest "^0.21.3" ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^3.2.1: version "3.2.1" @@ -4438,9 +4438,9 @@ throat@^6.0.1: integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== tmpl@1.0.x: - version "1.0.4" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" - integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== to-fast-properties@^2.0.0: version "2.0.0" @@ -4582,10 +4582,10 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -url-parse@>=1.5.6, url-parse@^1.4.3: - version "1.5.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a" - integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA== +url-parse@>=1.5.8, url-parse@^1.4.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" diff --git a/src/SignalR/clients/ts/FunctionalTests/package.json b/src/SignalR/clients/ts/FunctionalTests/package.json index f26e15de3501..02f923c27067 100644 --- a/src/SignalR/clients/ts/FunctionalTests/package.json +++ b/src/SignalR/clients/ts/FunctionalTests/package.json @@ -54,7 +54,7 @@ }, "resolutions": { "lodash": ">=4.17.21", - "url-parse": ">=1.5.6", + "url-parse": ">=1.5.8", "node-fetch": ">=2.6.7" }, "author": "", diff --git a/src/SignalR/clients/ts/FunctionalTests/yarn.lock b/src/SignalR/clients/ts/FunctionalTests/yarn.lock index 44b4dab86986..83ff9d122a99 100644 --- a/src/SignalR/clients/ts/FunctionalTests/yarn.lock +++ b/src/SignalR/clients/ts/FunctionalTests/yarn.lock @@ -969,9 +969,9 @@ flatted@^2.0.0: integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== follow-redirects@^1.0.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" - integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== + version "1.14.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== forever-agent@~0.6.1: version "0.6.1" @@ -2171,10 +2171,10 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -url-parse@>=1.5.6, url-parse@^1.4.3: - version "1.5.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a" - integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA== +url-parse@>=1.5.8, url-parse@^1.4.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" @@ -2302,9 +2302,9 @@ wrappy@1: integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= "ws@ ^6.0.0": - version "6.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" - integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + version "6.2.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" + integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw== dependencies: async-limiter "~1.0.0" diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json index 0e8c71ee9b09..faa4fd90136d 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/package.json @@ -49,7 +49,7 @@ }, "devDependencies": {}, "resolutions": { - "url-parse": ">=1.5.6", + "url-parse": ">=1.5.8", "node-fetch": ">=2.6.7" } } diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock b/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock index 5034bccf3223..5a041778f1db 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/yarn.lock @@ -112,10 +112,10 @@ universalify@^0.1.2: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -url-parse@>=1.5.6, url-parse@^1.4.3: - version "1.5.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a" - integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA== +url-parse@>=1.5.8, url-parse@^1.4.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" diff --git a/src/SignalR/clients/ts/signalr/package.json b/src/SignalR/clients/ts/signalr/package.json index 1fdd32c78c41..cbf527d7bad3 100644 --- a/src/SignalR/clients/ts/signalr/package.json +++ b/src/SignalR/clients/ts/signalr/package.json @@ -59,6 +59,6 @@ }, "resolutions": { "ansi-regex": "5.0.1", - "url-parse": ">=1.5.6" + "url-parse": ">=1.5.8" } } diff --git a/src/SignalR/clients/ts/signalr/yarn.lock b/src/SignalR/clients/ts/signalr/yarn.lock index 4cc214da9796..8c4dc550c14d 100644 --- a/src/SignalR/clients/ts/signalr/yarn.lock +++ b/src/SignalR/clients/ts/signalr/yarn.lock @@ -235,10 +235,10 @@ universalify@^0.1.2: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -url-parse@>=1.5.6, url-parse@^1.4.3: - version "1.5.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a" - integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA== +url-parse@>=1.5.8, url-parse@^1.4.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0"