Skip to content

Commit

Permalink
Merge branch 'master' into merge/release/5.0-to-master
Browse files Browse the repository at this point in the history
  • Loading branch information
captainsafia authored Oct 15, 2020
2 parents 73690b2 + 8a81194 commit 329664f
Show file tree
Hide file tree
Showing 884 changed files with 8,498 additions and 12,358 deletions.
67 changes: 67 additions & 0 deletions .azure/pipelines/blazor-daily-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# Uses Scheduled Triggers, which aren't supported in YAML yet.
# https://docs.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled

# Daily Tests for Blazor
# These use Sauce Labs resources, hence they run daily rather than per-commit.

# We just need one Windows machine because all it does is trigger SauceLabs.
variables:
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- group: DotNet-MSRC-Storage
- group: AzureDevOps-Artifact-Feeds-Pats
- name: SAUCE_CONNECT_DOWNLOAD_ON_INSTALL
value: true
- name: E2ETESTS_SauceTest
value: true
- name: E2ETESTS_Sauce__TunnelIdentifier
value: 'blazor-e2e-sc-proxy-tunnel'
- name: E2ETESTS_Sauce__HostName
value: 'sauce.local'

jobs:
- template: jobs/default-build.yml
parameters:
buildDirectory: src/Components
isTestingJob: true
agentOs: Windows
jobName: BlazorDailyTests
jobDisplayName: "Blazor Daily Tests"
afterBuild:

# macOS/Safari
- script: 'dotnet test --no-build --configuration Release --filter "StandaloneAppTest"'
workingDirectory: 'src/Components/test/E2ETest'
displayName: 'Run Blazor tests - macOS/Safari'
condition: succeededOrFailed()
env:
# Secrets need to be explicitly mapped to env variables.
E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
# Set platform/browser configuration.
E2ETESTS_Sauce__TestName: 'Blazor Daily Tests - macOS/Safari'
E2ETESTS_Sauce__PlatformName: 'macOS 10.14'
E2ETESTS_Sauce__BrowserName: 'Safari'
# Need to explicitly set version here because some older versions don't support timeouts in Safari.
E2ETESTS_Sauce__SeleniumVersion: '3.4.0'

# Android/Chrome
- script: 'dotnet test --no-build --configuration Release --filter "StandaloneAppTest"'
workingDirectory: 'src/Components/test/E2ETest'
displayName: 'Run Blazor tests - Android/Chrome'
condition: succeededOrFailed()
env:
# Secrets need to be explicitly mapped to env variables.
E2ETESTS_Sauce__Username: '$(asplab-sauce-labs-username)'
E2ETESTS_Sauce__AccessKey: '$(asplab-sauce-labs-access-key)'
# Set platform/browser configuration.
E2ETESTS_Sauce__TestName: 'Blazor Daily Tests - Android/Chrome'
E2ETESTS_Sauce__PlatformName: 'Android'
E2ETESTS_Sauce__PlatformVersion: '10.0'
E2ETESTS_Sauce__BrowserName: 'Chrome'
E2ETESTS_Sauce__DeviceName: 'Android GoogleAPI Emulator'
E2ETESTS_Sauce__DeviceOrientation: 'portrait'
E2ETESTS_Sauce__AppiumVersion: '1.9.1'
artifacts:
- name: Windows_Logs
path: artifacts/log/
publishOnError: true
34 changes: 34 additions & 0 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,40 @@ stages:
parameters:
inputName: Linux_musl_x64

# Build Linux Musl ARM
- template: jobs/default-build.yml
parameters:
jobName: Linux_musl_arm_build
jobDisplayName: "Build: Linux Musl ARM"
agentOs: Linux
useHostedUbuntu: false
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20200827125937-14441ae
buildScript: ./build.sh
buildArgs:
--arch arm
--os-name linux-musl
--pack
--all
--no-build-nodejs
--no-build-java
-p:OnlyPackPlatformSpecificPackages=true
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml
$(_BuildArgs)
$(_PublishArgs)
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
installJdk: false
artifacts:
- name: Linux_musl_arm_Logs
path: artifacts/log/
publishOnError: true
includeForks: true
- name: Linux_musl_arm_Packages
path: artifacts/packages/
- template: jobs/codesign-xplat.yml
parameters:
inputName: Linux_musl_arm

# Build Linux Musl ARM64
- template: jobs/default-build.yml
parameters:
Expand Down
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,8 @@ end_of_line = lf

[*.{razor,cshtml}]
charset = utf-8-bom

[*.cs]
dotnet_diagnostic.CA1304.severity = error
dotnet_diagnostic.CA1305.severity = error
dotnet_diagnostic.CA1310.severity = error
23 changes: 5 additions & 18 deletions .github/ISSUE_TEMPLATE/razor_tooling.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,13 @@ We will close this issue if:

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

#### Activity log
#### Activity log (only needed if VS crashes)
[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.

#### Razor Language Server Client log
<!-- In Visual Studio's `Output` window, the drop-down contains a `Razor Language Server Client` item. Include that below. -->
<details>
<summary>Razor Language Server Client Log Output</summary>

Paste log output here

</details>

#### HTML Language Server Client log
<!-- In Visual Studio's `Output` window, the drop-down contains a `HtmlyLanguageClient` item. Include that below. -->
<details>
<summary>HTML Language Server Client Log Output</summary>

Paste log output here

</details>
#### Language Server logs
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
2. Reproduce the issue
3. Provide the logs located at `%Temp%\VisualStudio\LSP`

### Further technical details
- 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.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/runtime-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
# Test this script using changes in a fork
repository: 'dotnet/aspnetcore'
path: aspnetcore
ref: release/5.0
ref: master
- name: Checkout runtime
uses: actions/checkout@v2.0.0
with:
# Test this script using changes in a fork
repository: 'dotnet/runtime'
path: runtime
ref: release/5.0
ref: master
- name: Copy
shell: cmd
working-directory: .\runtime\src\libraries\Common\src\System\Net\Http\aspnetcore\
Expand Down Expand Up @@ -67,6 +67,6 @@ jobs:
title: 'Sync shared code from runtime'
body: 'This PR was automatically generated to sync shared code changes from runtime. Fixes #18943'
labels: area-servers
base: release/5.0
base: master
branch: github-action/sync-runtime
branch-suffix: timestamp
Loading

0 comments on commit 329664f

Please sign in to comment.