Skip to content
代码片段 群组 项目
未验证 提交 f2629ce4 编辑于 作者: Doug Bunting's avatar Doug Bunting 提交者: GitHub
浏览文件

Backport parts of 48a81a70 (#43357)

- was "Exclusively use Azure (public) feeds (#43303)"
- Correct ref to selenium-config.json
  - fix what broke `yarn install` in these directories
- Use `yarn` in aspnetcore-components-e2e pipeline
  - also correct a missing `--frozen-lockfile`

Co-authored-by: MerlinBot
上级 dc1e622f
No related branches found
No related tags found
无相关合并请求
...@@ -40,7 +40,7 @@ jobs: ...@@ -40,7 +40,7 @@ jobs:
displayName: Update submodules displayName: Update submodules
- script: ./restore.sh - script: ./restore.sh
displayName: Run restore.sh displayName: Run restore.sh
- script: npm install --prefix ./src/Components/test/E2ETest - script: yarn install --frozen-lockfile --cwd ./src/Components/test/E2ETest
displayName: NPM install displayName: NPM install
- script: .dotnet/dotnet build ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-restore - script: .dotnet/dotnet build ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-restore
displayName: Build displayName: Build
......
...@@ -42,7 +42,10 @@ ...@@ -42,7 +42,10 @@
<Target Name="Restore"> <Target Name="Restore">
<Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Restore" /> <Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Restore" />
<Message Importance="High" Text="Running yarn install on $(MSBuildProjectFullPath)" /> <Message Importance="High" Text="Running yarn install on $(MSBuildProjectFullPath)" />
<Yarn Command="install --mutex network $(InstallArgs)" StandardOutputImportance="High" StandardErrorImportance="High" IgnoreStandardErrorWarningFormat="$(IgnoreYarnWarnings)" /> <Yarn Command="install --mutex network $(InstallArgs) --frozen-lockfile"
StandardOutputImportance="High"
StandardErrorImportance="High"
IgnoreStandardErrorWarningFormat="$(IgnoreYarnWarnings)" />
</Target> </Target>
<Target Name="PrepareForBuild"> <Target Name="PrepareForBuild">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"selenium-standalone": "selenium-standalone", "selenium-standalone": "selenium-standalone",
"prepare": "selenium-standalone install --config ../../Shared/E2ETesting/selenium-config.json" "prepare": "selenium-standalone install --config ../../../Shared/E2ETesting/selenium-config.json"
}, },
"author": "", "author": "",
"license": "MIT", "license": "MIT",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"selenium-standalone": "selenium-standalone", "selenium-standalone": "selenium-standalone",
"prepare": "selenium-standalone install --config ../../Shared/E2ETesting/selenium-config.json" "prepare": "selenium-standalone install --config ../../../Shared/E2ETesting/selenium-config.json"
}, },
"author": "", "author": "",
"license": "MIT", "license": "MIT",
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册