Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into allow-nameof-to-acc…
Browse files Browse the repository at this point in the history
…ess-instance-members

* upstream/main: (669 commits)
  Fix 'hasStaticConstructor' check in MethodCompiler (dotnet#59116)
  Update dependencies from https://github.com/dotnet/arcade build 20220127.8 (dotnet#59134)
  Update StreamJsonRpc (dotnet#59073)
  Resources
  Filter cancellation exceptions in generator driver (dotnet#58843)
  Revert "Remove dependency on EditorFeatures from Remote.ServiceHub project (dotnet#59059)"
  Strings
  Inline
  Convert to switch expression
  Explicitly test empty string case.
  Fix comment
  Simplify test code
  Run all
  Add tests
  Delete test generator
  Add support for specifying server in tests
  Remove options
  review feedback
  Format document after each provider (dotnet#59091)
  [main] Update dependencies from dotnet/arcade (dotnet#59015)
  ...
  • Loading branch information
333fred committed Jan 28, 2022
2 parents 63e5828 + 674f7d4 commit 9f8216f
Show file tree
Hide file tree
Showing 1,628 changed files with 77,243 additions and 26,563 deletions.
21 changes: 21 additions & 0 deletions .devcontainer/Dockerfile
@@ -0,0 +1,21 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile

# [Choice] .NET version: 6.0, 5.0, 3.1, 2.1
ARG VARIANT="6.0"
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}

# Set up machine requirements to build the repo
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends cmake llvm-9 clang-9 \
build-essential python curl git lldb-6.0 liblldb-6.0-dev \
libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev \
libssl-dev libnuma-dev libkrb5-dev zlib1g-dev ninja-build

# Install V8 Engine
SHELL ["/bin/bash", "-c"]

RUN curl -sSL "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/linux/chromium-v8/v8-linux64-rel-8.5.183.zip" -o ./v8.zip \
&& unzip ./v8.zip -d /usr/local/v8 \
&& echo $'#!/usr/bin/env bash\n\
"/usr/local/v8/d8" --snapshot_blob="/usr/local/v8/snapshot_blob.bin" "$@"\n' > /usr/local/bin/v8 \
&& chmod +x /usr/local/bin/v8
57 changes: 57 additions & 0 deletions .devcontainer/devcontainer.json
@@ -0,0 +1,57 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/dotnetcore
{
"name": "C# (.NET 6)",
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "6.0",
}
},
"settings": {
"files.associations": {
"*.csproj": "msbuild",
"*.fsproj": "msbuild",
"*.globalconfig": "ini",
"*.manifest": "xml",
"*.nuspec": "xml",
"*.pkgdef": "ini",
"*.projitems": "msbuild",
"*.props": "msbuild",
"*.resx": "xml",
"*.rsp": "Powershell",
"*.ruleset": "xml",
"*.settings": "xml",
"*.shproj": "msbuild",
"*.slnf": "json",
"*.targets": "msbuild",
"*.vbproj": "msbuild",
"*.vsixmanifest": "xml",
"*.vstemplate": "xml",
"*.xlf": "xml",
"*.yml": "azure-pipelines"
},
// ms-dotnettools.csharp settings
"omnisharp.defaultLaunchSolution": "Compilers.sln",
"omnisharp.disableMSBuildDiagnosticWarning": true,
"omnisharp.enableEditorConfigSupport": true,
"omnisharp.enableImportCompletion": true,
"omnisharp.enableRoslynAnalyzers": true,
"omnisharp.useModernNet": true,
"omnisharp.enableAsyncCompletion": true,
// ms-vscode.powershell settings
"powershell.promptToUpdatePowerShell": false,
"powershell.integratedConsole.showOnStartup": false,
"powershell.startAutomatically": false,
// ms-azure-devops.azure-pipelines settings
"azure-pipelines.customSchemaFile": ".vscode/dnceng-schema.json"
},
"extensions": [
"ms-dotnettools.csharp",
"EditorConfig.EditorConfig",
"ms-vscode.powershell",
"tintoy.msbuild-project-tools",
"ms-azure-devops.azure-pipelines"
],
"postCreateCommand": "${containerWorkspaceFolder}/restore.sh"
}
7 changes: 7 additions & 0 deletions .devcontainer/devinit.json
@@ -0,0 +1,7 @@
{
"run": [
{
"tool": "require-dotnetcoresdk"
}
]
}
5 changes: 2 additions & 3 deletions .editorconfig
Expand Up @@ -301,6 +301,5 @@ dotnet_diagnostic.IDE2004.severity = warning

[src/{VisualStudio}/**/*.{cs,vb}]
# CA1822: Make member static
# Not enforced as a build 'warning' for 'VisualStudio' layer due to large number of false positives from https://github.com/dotnet/roslyn-analyzers/issues/3857 and https://github.com/dotnet/roslyn-analyzers/issues/3858
# Additionally, there is a risk of accidentally breaking an internal API that partners rely on though IVT.
dotnet_diagnostic.CA1822.severity = suggestion
# There is a risk of accidentally breaking an internal API that partners rely on though IVT.
dotnet_code_quality.CA1822.api_surface = private
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -3,9 +3,14 @@

*.yml @dotnet/roslyn-infrastructure
.github/ @dotnet/roslyn-infrastructure

docs/compilers @dotnet/roslyn-compiler
docs/ide @dotnet/roslyn-ide

eng/ @dotnet/roslyn-infrastructure
scripts/ @dotnet/roslyn-infrastructure

src/Analyzers/ @dotnet/roslyn-ide
src/CodeStyle/ @dotnet/roslyn-ide
src/Compilers/ @dotnet/roslyn-compiler
# Both IDE and Compiler traits are in this file, so we don't want to ping each other for changes to just this file.
Expand Down
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/api-suggestion.md
Expand Up @@ -37,10 +37,11 @@ namespace Microsoft.CodeAnalysis.Operations
Please provide code examples that highlight how the proposed API additions are meant to be consumed.
This will help suggest whether the API has the right shape to be functional, performant and useable.
You can use code blocks like this:
-->

``` C#
// some lines of code here
```
-->

## Alternative Designs

Expand Down
1 change: 1 addition & 0 deletions .vscode/dnceng-schema.json

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions .vscode/extensions.json
@@ -0,0 +1,11 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"ms-dotnettools.csharp",
"EditorConfig.EditorConfig",
"ms-vscode.powershell",
"tintoy.msbuild-project-tools",
"ms-azure-devops.azure-pipelines"
]
}
34 changes: 33 additions & 1 deletion .vscode/settings.json
@@ -1,6 +1,38 @@
{
"files.associations": {
"**/eng/pipelines/*.yml": "azure-pipelines"
"*.csproj": "msbuild",
"*.fsproj": "msbuild",
"*.globalconfig": "ini",
"*.manifest": "xml",
"*.nuspec": "xml",
"*.pkgdef": "ini",
"*.projitems": "msbuild",
"*.props": "msbuild",
"*.resx": "xml",
"*.rsp": "Powershell",
"*.ruleset": "xml",
"*.settings": "xml",
"*.shproj": "msbuild",
"*.slnf": "json",
"*.targets": "msbuild",
"*.vbproj": "msbuild",
"*.vsixmanifest": "xml",
"*.vstemplate": "xml",
"*.xlf": "xml",
"*.yml": "azure-pipelines"
},
// ms-dotnettools.csharp settings
"omnisharp.defaultLaunchSolution": "Compilers.sln",
"omnisharp.disableMSBuildDiagnosticWarning": true,
"omnisharp.enableEditorConfigSupport": true,
"omnisharp.enableImportCompletion": true,
"omnisharp.enableRoslynAnalyzers": true,
"omnisharp.useModernNet": true,
"omnisharp.enableAsyncCompletion": true,
// ms-vscode.powershell settings
"powershell.promptToUpdatePowerShell": false,
"powershell.integratedConsole.showOnStartup": false,
"powershell.startAutomatically": false,
// ms-azure-devops.azure-pipelines settings
"azure-pipelines.customSchemaFile": ".vscode/dnceng-schema.json"
}
7 changes: 0 additions & 7 deletions Roslyn.sln
Expand Up @@ -372,8 +372,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Comp
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Installer.Package", "src\Setup\Installer\Installer.Package.csproj", "{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces.Desktop.UnitTests", "src\Workspaces\DesktopTest\Microsoft.CodeAnalysis.Workspaces.Desktop.UnitTests.csproj", "{23405307-7EFF-4774-8B11-8F5885439761}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Insertion", "Insertion", "{AFA5F921-0650-45E8-B293-51A0BB89DEA0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevDivInsertionFiles", "src\Setup\DevDivInsertionFiles\DevDivInsertionFiles.csproj", "{6362616E-6A47-48F0-9EE0-27800B306ACB}"
Expand Down Expand Up @@ -1148,10 +1146,6 @@ Global
{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|Any CPU.Build.0 = Release|Any CPU
{23405307-7EFF-4774-8B11-8F5885439761}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23405307-7EFF-4774-8B11-8F5885439761}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23405307-7EFF-4774-8B11-8F5885439761}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23405307-7EFF-4774-8B11-8F5885439761}.Release|Any CPU.Build.0 = Release|Any CPU
{6362616E-6A47-48F0-9EE0-27800B306ACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6362616E-6A47-48F0-9EE0-27800B306ACB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6362616E-6A47-48F0-9EE0-27800B306ACB}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -1479,7 +1473,6 @@ Global
{B9843F65-262E-4F40-A0BC-2CBEF7563A44} = {C52D8057-43AF-40E6-A01B-6CDBB7301985}
{03607817-6800-40B6-BEAA-D6F437CD62B7} = {BE25E872-1667-4649-9D19-96B83E75A44E}
{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5} = {BE25E872-1667-4649-9D19-96B83E75A44E}
{23405307-7EFF-4774-8B11-8F5885439761} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
{AFA5F921-0650-45E8-B293-51A0BB89DEA0} = {8DBA5174-B0AA-4561-82B1-A46607697753}
{6362616E-6A47-48F0-9EE0-27800B306ACB} = {AFA5F921-0650-45E8-B293-51A0BB89DEA0}
{8977A560-45C2-4EC2-A849-97335B382C74} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
Expand Down
51 changes: 32 additions & 19 deletions azure-pipelines-integration-corehost.yml
Expand Up @@ -12,33 +12,46 @@ trigger:
# Automatic building of all PRs is disabled in the pipeline's trigger page.
# See https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/github?view=azure-devops&tabs=yaml#comment-triggers
pr:
- main
- main-vs-deps
- release/*
- features/*
- demos/*

variables:
- name: XUNIT_LOGS
value: $(Build.SourcesDirectory)\artifacts\log\$(_configuration)
branches:
include:
- main
- main-vs-deps
- release/*
- features/*
- demos/*
paths:
exclude:
- docs/*
- .github/*

jobs:
- job: VS_Integration_CoreHost
- job: VS_Integration_CoreHost_Debug
pool:
name: NetCore1ESPool-Public
demands: ImageOverride -equals $(queueName)
strategy:
maxParallel: 2
matrix:
debug:
_configuration: Debug
release:
_configuration: Release
timeoutInMinutes: 135

variables:
- name: XUNIT_LOGS
value: $(Build.SourcesDirectory)\artifacts\log\Debug
steps:
- template: eng/pipelines/test-integration-job.yml
parameters:
configuration: $(_configuration)
configuration: Debug
oop64bit: true
oopCoreClr: true

- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
- job: VS_Integration_CoreHost_Release
pool:
name: NetCore1ESPool-Public
demands: ImageOverride -equals $(queueName)
timeoutInMinutes: 135
variables:
- name: XUNIT_LOGS
value: $(Build.SourcesDirectory)\artifacts\log\Debug
steps:
- template: eng/pipelines/test-integration-job.yml
parameters:
configuration: Release
oop64bit: true
oopCoreClr: true
9 changes: 9 additions & 0 deletions azure-pipelines-integration-dartlab.yml
@@ -1,6 +1,7 @@
# Roslyn integration test pipeline for validating against branch builds of VS.

trigger: none # Manual trigger for now
pr: none # Manual trigger for now

resources:
pipelines:
Expand All @@ -15,6 +16,13 @@ resources:
type: git
name: DartLab.Templates
ref: refs/heads/dev/bradwhit/RemoveCheckoutNone
- repository: RoslynMirror
endpoint: dnceng/internal dotnet-roslyn
type: git
name: internal/dotnet-roslyn
ref: $(Build.SourceBranchName)
trigger:
- main

variables:
- name: XUNIT_LOGS
Expand Down Expand Up @@ -54,6 +62,7 @@ stages:
filePath: $(DartLab.Path)\Scripts\VisualStudio\Build\Get-VisualStudioDropName.ps1
arguments: -DropNamePrefix 'Products' -VstsDropUrlsJson '$(Pipeline.Workspace)\VisualStudioBuildUnderTest\BuildArtifacts\VstsDropUrls.json' -OutVariableName 'VisualStudio.BuildUnderTest.ProductsDropName'
deployAndRunTestsStepList:
- checkout: RoslynMirror
- template: eng/pipelines/test-integration-job.yml
parameters:
configuration: $(_configuration)
Expand Down

0 comments on commit 9f8216f

Please sign in to comment.