Skip to content

Commit dd002ce

Browse files
authored
Merge branch 'master' into merge/release/5.0-to-master
2 parents bc3dc72 + e94b1e7 commit dd002ce

File tree

427 files changed

+6128
-5839
lines changed

Some content is hidden

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

427 files changed

+6128
-5839
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
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+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
10+
- group: DotNet-MSRC-Storage
11+
- group: AzureDevOps-Artifact-Feeds-Pats
12+
- name: SAUCE_CONNECT_DOWNLOAD_ON_INSTALL
13+
value: true
14+
- name: E2ETESTS_SauceTest
15+
value: true
16+
- name: E2ETESTS_Sauce__TunnelIdentifier
17+
value: 'blazor-e2e-sc-proxy-tunnel'
18+
- name: E2ETESTS_Sauce__HostName
19+
value: 'sauce.local'
20+
21+
jobs:
22+
- template: jobs/default-build.yml
23+
parameters:
24+
buildDirectory: src/Components
25+
isTestingJob: true
26+
agentOs: Windows
27+
jobName: BlazorDailyTests
28+
jobDisplayName: "Blazor Daily Tests"
29+
afterBuild:
30+
31+
# macOS/Safari
32+
- script: 'dotnet test --no-build --configuration Release --filter "StandaloneAppTest"'
33+
workingDirectory: 'src/Components/test/E2ETest'
34+
displayName: 'Run Blazor tests - macOS/Safari'
35+
condition: succeededOrFailed()
36+
env:
37+
# Secrets need to be explicitly mapped to env variables.
38+
E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
39+
E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
40+
# Set platform/browser configuration.
41+
E2ETESTS_Sauce__TestName: 'Blazor Daily Tests - macOS/Safari'
42+
E2ETESTS_Sauce__PlatformName: 'macOS 10.14'
43+
E2ETESTS_Sauce__BrowserName: 'Safari'
44+
# Need to explicitly set version here because some older versions don't support timeouts in Safari.
45+
E2ETESTS_Sauce__SeleniumVersion: '3.4.0'
46+
47+
# Android/Chrome
48+
- script: 'dotnet test --no-build --configuration Release --filter "StandaloneAppTest"'
49+
workingDirectory: 'src/Components/test/E2ETest'
50+
displayName: 'Run Blazor tests - Android/Chrome'
51+
condition: succeededOrFailed()
52+
env:
53+
# Secrets need to be explicitly mapped to env variables.
54+
E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
55+
E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
56+
# Set platform/browser configuration.
57+
E2ETESTS_Sauce__TestName: 'Blazor Daily Tests - Android/Chrome'
58+
E2ETESTS_Sauce__PlatformName: 'Android'
59+
E2ETESTS_Sauce__PlatformVersion: '10.0'
60+
E2ETESTS_Sauce__BrowserName: 'Chrome'
61+
E2ETESTS_Sauce__DeviceName: 'Android GoogleAPI Emulator'
62+
E2ETESTS_Sauce__DeviceOrientation: 'portrait'
63+
E2ETESTS_Sauce__AppiumVersion: '1.9.1'
64+
artifacts:
65+
- name: Windows_Logs
66+
path: artifacts/log/
67+
publishOnError: true

.azure/pipelines/ci.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,40 @@ stages:
511511
parameters:
512512
inputName: Linux_musl_x64
513513

514+
# Build Linux Musl ARM
515+
- template: jobs/default-build.yml
516+
parameters:
517+
jobName: Linux_musl_arm_build
518+
jobDisplayName: "Build: Linux Musl ARM"
519+
agentOs: Linux
520+
useHostedUbuntu: false
521+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20200827125937-14441ae
522+
buildScript: ./build.sh
523+
buildArgs:
524+
--arch arm
525+
--os-name linux-musl
526+
--pack
527+
--all
528+
--no-build-nodejs
529+
--no-build-java
530+
-p:OnlyPackPlatformSpecificPackages=true
531+
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml
532+
$(_BuildArgs)
533+
$(_PublishArgs)
534+
$(_InternalRuntimeDownloadArgs)
535+
installNodeJs: false
536+
installJdk: false
537+
artifacts:
538+
- name: Linux_musl_arm_Logs
539+
path: artifacts/log/
540+
publishOnError: true
541+
includeForks: true
542+
- name: Linux_musl_arm_Packages
543+
path: artifacts/packages/
544+
- template: jobs/codesign-xplat.yml
545+
parameters:
546+
inputName: Linux_musl_arm
547+
514548
# Build Linux Musl ARM64
515549
- template: jobs/default-build.yml
516550
parameters:
@@ -739,6 +773,7 @@ stages:
739773
- CodeSign_Xplat_Linux_arm
740774
- CodeSign_Xplat_Linux_arm64
741775
- CodeSign_Xplat_Linux_musl_x64
776+
- CodeSign_Xplat_Linux_musl_arm
742777
- CodeSign_Xplat_Linux_musl_arm64
743778
# In addition to the dependencies above, ensure the build was successful overall.
744779
- Source_Build

.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)