Skip to content

Commit 40f5e09

Browse files
authored
Merge branch 'master' into merge/release/5.0-rc2-to-master
2 parents 8d8d293 + 4dfa2c7 commit 40f5e09

File tree

415 files changed

+5958
-6550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

415 files changed

+5958
-6550
lines changed
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Uses Scheduled Triggers, which aren't supported in YAML yet.
2+
# https://docs.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled
3+
4+
# Daily Tests for Blazor
5+
# These use Sauce Labs resources, hence they run daily rather than per-commit.
6+
7+
# We just need one Windows machine because all it does is trigger SauceLabs.
8+
variables:
9+
SAUCE_CONNECT_DOWNLOAD_ON_INSTALL: true
10+
E2ETESTS_SauceTest: true
11+
E2ETESTS_Sauce__TunnelIdentifier: 'blazor-e2e-sc-proxy-tunnel'
12+
E2ETESTS_Sauce__HostName: 'sauce.local'
13+
jobs:
14+
- template: jobs/default-build.yml
15+
parameters:
16+
buildDirectory: src/Components
17+
isTestingJob: true
18+
agentOs: Windows
19+
jobName: BlazorDailyTests
20+
jobDisplayName: "Blazor Daily Tests"
21+
afterBuild:
22+
23+
# macOS/Safari
24+
- script: 'dotnet test --filter "StandaloneAppTest"'
25+
workingDirectory: 'src/Components/test/E2ETest'
26+
displayName: 'Run Blazor tests - macOS/Safari'
27+
condition: succeededOrFailed()
28+
env:
29+
# Secrets need to be explicitly mapped to env variables.
30+
E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
31+
E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
32+
# Set platform/browser configuration.
33+
E2ETESTS_Sauce__TestName: 'Blazor Daily Tests - macOS/Safari'
34+
E2ETESTS_Sauce__PlatformName: 'macOS 10.14'
35+
E2ETESTS_Sauce__BrowserName: 'Safari'
36+
# Need to explicitly set version here because some older versions don't support timeouts in Safari.
37+
E2ETESTS_Sauce__SeleniumVersion: '3.4.0'
38+
39+
# Android/Chrome
40+
- script: 'dotnet test --filter "StandaloneAppTest"'
41+
workingDirectory: 'src/Components/test/E2ETest'
42+
displayName: 'Run Blazor tests - Android/Chrome'
43+
condition: succeededOrFailed()
44+
env:
45+
# Secrets need to be explicitly mapped to env variables.
46+
E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
47+
E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
48+
# Set platform/browser configuration.
49+
E2ETESTS_Sauce__TestName: 'Blazor Daily Tests - Android/Chrome'
50+
E2ETESTS_Sauce__PlatformName: 'Android'
51+
E2ETESTS_Sauce__PlatformVersion: '10.0'
52+
E2ETESTS_Sauce__BrowserName: 'Chrome'
53+
E2ETESTS_Sauce__DeviceName: 'Android GoogleAPI Emulator'
54+
E2ETESTS_Sauce__DeviceOrientation: 'portrait'
55+
E2ETESTS_Sauce__AppiumVersion: '1.9.1'
56+
artifacts:
57+
- name: Windows_Logs
58+
path: ../../artifacts/log/
59+
publishOnError: true

.github/ISSUE_TEMPLATE/razor_tooling.md

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,13 @@ We will close this issue if:
3434

3535
Please collect the data below before reporting your issue to aid us in diagnosing the root cause.
3636

37-
#### Activity log
37+
#### Activity log (only needed if VS crashes)
3838
[Here](https://docs.microsoft.com/en-us/visualstudio/extensibility/how-to-use-the-activity-log?view=vs-2019#to-examine-the-activity-log) are the instructions on how to generate/acquire one. Note that GitHub does not generally allow .xml files to be uploaded with issues.
3939

40-
#### Razor Language Server Client log
41-
<!-- In Visual Studio's `Output` window, the drop-down contains a `Razor Language Server Client` item. Include that below. -->
42-
<details>
43-
<summary>Razor Language Server Client Log Output</summary>
44-
45-
Paste log output here
46-
47-
</details>
48-
49-
#### HTML Language Server Client log
50-
<!-- In Visual Studio's `Output` window, the drop-down contains a `HtmlyLanguageClient` item. Include that below. -->
51-
<details>
52-
<summary>HTML Language Server Client Log Output</summary>
53-
54-
Paste log output here
55-
56-
</details>
40+
#### Language Server logs
41+
1. Run Visual Studio with the [/Log](https://docs.microsoft.com/en-us/visualstudio/ide/reference/log-devenv-exe?view=vs-2019) command line switch
42+
2. Reproduce the issue
43+
3. Provide the logs located at `%Temp%\VisualStudio\LSP`
5744

5845
### Further technical details
5946
- VS version (Help => About Microsoft Visual Studio, i.e. 16.8.0 Preview 1 30313.27...). If in Codespaces there will be two versions (server and client), please provide both.

.github/workflows/runtime-sync.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
# Test this script using changes in a fork
2222
repository: 'dotnet/aspnetcore'
2323
path: aspnetcore
24-
ref: release/5.0
24+
ref: master
2525
- name: Checkout runtime
2626
uses: actions/[email protected]
2727
with:
2828
# Test this script using changes in a fork
2929
repository: 'dotnet/runtime'
3030
path: runtime
31-
ref: release/5.0
31+
ref: master
3232
- name: Copy
3333
shell: cmd
3434
working-directory: .\runtime\src\libraries\Common\src\System\Net\Http\aspnetcore\
@@ -67,6 +67,6 @@ jobs:
6767
title: 'Sync shared code from runtime'
6868
body: 'This PR was automatically generated to sync shared code changes from runtime. Fixes #18943'
6969
labels: area-servers
70-
base: release/5.0
70+
base: master
7171
branch: github-action/sync-runtime
7272
branch-suffix: timestamp

0 commit comments

Comments
 (0)