Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .azure/pipelines/jobs/default-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ jobs:
displayName: Start background dump collection
- ${{ if eq(parameters.installNodeJs, 'true') }}:
- task: NodeTool@0
displayName: Install Node 18.x
displayName: Install Node 20.x
inputs:
versionSpec: 18.x
versionSpec: 20.x
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
- powershell: |
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\"
Expand Down Expand Up @@ -393,9 +393,9 @@ jobs:
displayName: Start background dump collection
- ${{ if eq(parameters.installNodeJs, 'true') }}:
- task: NodeTool@0
displayName: Install Node 18.x
displayName: Install Node 20.x
inputs:
versionSpec: 18.x
versionSpec: 20.x
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
- powershell: |
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\"
Expand Down
2 changes: 1 addition & 1 deletion eng/targets/Helix.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<HelixAvailableTargetQueue Include="Ubuntu.2204.Amd64.Open" Platform="Linux" />
<HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
<HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Windows.Amd64.VS2022.Pre.Open" Platform="Windows" />
<HelixAvailableTargetQueue Include="Windows.Amd64.VS2022.Open" Platform="Windows" />
</ItemGroup>
</When>
<Otherwise>
Expand Down
2 changes: 1 addition & 1 deletion eng/targets/Npm.Common.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageJson>$(MSBuildProjectDirectory)\package.json</PackageJson>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(MSBuildProjectDirectory)\obj\</BaseIntermediateOutputPath>
<IntermediateOutputPath>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)'))$(Configuration)\</IntermediateOutputPath>
<InstallArgs>$(InstallArgs) --frozen-lockfile</InstallArgs>
<InstallArgs>$(InstallArgs) --frozen-lockfile --ignore-engines</InstallArgs>
<_BackupPackageJson>$(IntermediateOutputPath)$(MSBuildProjectName).package.json.bak</_BackupPackageJson>
<BuildDependsOn>
PrepareForBuild;
Expand Down
11 changes: 10 additions & 1 deletion src/Components/CustomElements/src/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@
},
"resolutions": {
"ansi-regex": "5.0.1",
"minimist": ">=1.2.6"
"minimist": ">=1.2.6",
"serialize-javascript": ">=7.0.5",
"cross-spawn": ">=7.0.5",
"braces": ">=3.0.3",
"micromatch": ">=4.0.8",
"picomatch": ">=2.3.2",
"flatted": ">=3.4.2",
"semver": ">=7.5.2",
"word-wrap": ">=1.2.4",
"@babel/traverse": ">=7.23.2"
}
}
243 changes: 157 additions & 86 deletions src/Components/CustomElements/src/js/yarn.lock

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions src/Components/Web.JS/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,16 @@
"typescript": "^4.5.4",
"webpack": "^5.72.1",
"webpack-cli": "^4.9.2"
},
"resolutions": {
"serialize-javascript": ">=7.0.5",
"cross-spawn": ">=7.0.5",
"braces": ">=3.0.3",
"micromatch": ">=4.0.8",
"picomatch": ">=2.3.2",
"flatted": ">=3.4.2",
"semver": ">=7.5.2",
"word-wrap": ">=1.2.4",
"@babel/traverse": ">=7.23.2"
}
}
243 changes: 157 additions & 86 deletions src/Components/Web.JS/yarn.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,19 @@
"webpack-cli": "^4.9.2"
},
"dependencies": {
"@azure/msal-browser": "^2.28.3"
"@azure/msal-browser": "^2.39.0"
},
"resolutions": {
"ansi-regex": "5.0.1",
"minimist": ">=1.2.6"
"minimist": ">=1.2.6",
"serialize-javascript": ">=7.0.5",
"cross-spawn": ">=7.0.5",
"braces": ">=3.0.3",
"micromatch": ">=4.0.8",
"picomatch": ">=2.3.2",
"flatted": ">=3.4.2",
"semver": ">=7.5.2",
"word-wrap": ">=1.2.4",
"@babel/traverse": ">=7.23.2"
}
}
Loading
Loading