Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into merge-master
Browse files Browse the repository at this point in the history
* upstream/master: (1099 commits)
  Specially handle tuple methods in CodeGenerator.EmitMethodInfoExpression for VB. (dotnet#43553)
  Remove unnecessary usings
  AssetStorage cleanup (dotnet#43511)
  Remove unused code (dotnet#43556)
  Revert anonymous type DebuggerDisplay change (dotnet#43575)
  Replace GeneratePkgDef with impl that does not load assemblies (dotnet#43302)
  Fix
  Update src/Analyzers/Core/CodeFixes/MakeFieldReadonly/AbstractMakeFieldReadonlyCodeFixProvider.cs
  PR feedback
  use capacity when creating builders.
  Push options down.
  Rename methods
  Fix GetSymbolInfo on ValueTuple declaration (dotnet#43467)
  Add support for cref-type-parameters.
  Support OOP with dynamic types.
  Support error locals in symbolkey
  Update tests to run OOP
  Update docs/Language Feature Status.md
  Update for partial methods
  Fix typos (dotnet#43494)
  ...
  • Loading branch information
333fred committed Apr 23, 2020
2 parents c7aa169 + e615033 commit 86c102a
Show file tree
Hide file tree
Showing 2,229 changed files with 121,089 additions and 46,388 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,13 @@ indent_size = 2

# Dotnet code style settings:
[*.{cs,vb}]

# IDE0055: Fix formatting
dotnet_diagnostic.IDE0055.severity = warning

# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = true
dotnet_separate_import_directive_groups = false
# Avoid "this." and "Me." if not necessary
dotnet_style_qualification_for_field = false:refactoring
dotnet_style_qualification_for_property = false:refactoring
Expand Down Expand Up @@ -136,6 +141,9 @@ dotnet_naming_symbols.all_members.applicable_kinds = *

dotnet_naming_style.pascal_case_style.capitalization = pascal_case

# error RS2008: Enable analyzer release tracking for the analyzer project containing rule '{0}'
dotnet_diagnostic.RS2008.severity = none

# IDE0073: File header
dotnet_diagnostic.IDE0073.severity = warning
file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.\nSee the LICENSE file in the project root for more information.
Expand Down Expand Up @@ -216,3 +224,7 @@ dotnet_diagnostic.RS0037.severity = none
[src/CodeStyle/**.{cs,vb}]
# warning RS0005: Do not use generic CodeAction.Create to create CodeAction
dotnet_diagnostic.RS0005.severity = none

[src/{Analyzers,CodeStyle,Features,Workspaces}/**/*.{cs,vb}]
# IDE0005: Remove unnecessary usings/imports
dotnet_diagnostic.IDE0005.severity = warning
72 changes: 62 additions & 10 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,35 @@
"tasks": [
{
"label": "build",
"command": "./build.cmd",
"command": "./build.sh",
"type": "shell",
"args": [
],
"windows": {
"command": "./build.cmd",
},
"problemMatcher": "$msCompile",
"group": "build"
},
{
"label": "build skip analyzers",
"command": "./build.cmd",
"command": "./build.sh",
"type": "shell",
"args": [
"-skipAnalyzers"
"--skipAnalyzers"
],
"windows": {
"command": "./build.cmd",
"args": [
"-skipAnalyzers"
],
},
"problemMatcher": "$msCompile",
"group": "build"
},
{
"label": "build csc skip analyzers",
"command": "dotnet",
"command": "./.dotnet/dotnet",
"type": "shell",
"args": [
"msbuild",
Expand All @@ -36,17 +45,60 @@
"group": "build"
},
{
"label": "build directory skip analyzers",
"command": "dotnet",
"label": "build current project skip analyzers",
"command": "./.dotnet/dotnet",
"type": "shell",
"args": [
"msbuild",
"-p:UseRoslynAnalyzers=false",
"-p:GenerateFullPaths=true",
"${fileDirname}"
"pwsh",
"${workspaceRoot}/scripts/vscode-build.ps1",
"-filePath",
"${file}"
],
"problemMatcher": "$msCompile",
"group": "build"
},
{
"label": "generate compiler code",
"command": "./.dotnet/dotnet",
"type": "shell",
"args": [
"pwsh",
"${workspaceRoot}/eng/generate-compiler-code.ps1"
],
"problemMatcher": "$msCompile",
"group": "build"
},
{
"label": "run tests in current file (netcoreapp3.1)",
"command": "./.dotnet/dotnet",
"type": "shell",
"args": [
"pwsh",
"${workspaceRoot}/scripts/vscode-run-tests.ps1",
"-filePath",
"${file}",
"-framework",
"netcoreapp3.1",
"-filter",
"${fileBasenameNoExtension}"
],
"problemMatcher": "$msCompile",
"group": "test"
},
{
"label": "run tests in current project (netcoreapp3.1)",
"command": "./.dotnet/dotnet",
"type": "shell",
"args": [
"pwsh",
"${workspaceRoot}/scripts/vscode-run-tests.ps1",
"-filePath",
"${file}",
"-framework",
"netcoreapp3.1"
],
"problemMatcher": "$msCompile",
"group": "test"
}
]
}
6 changes: 6 additions & 0 deletions CODE-OF-CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Code of Conduct

This project has adopted the code of conduct defined by the Contributor Covenant
to clarify expected behavior in our community.

For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
20 changes: 6 additions & 14 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,23 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
<add key="system-commandline" value="https://dotnet.myget.org/F/system-commandline/api/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="myget-dotnet-coreclr" value="https://dotnet.myget.org/F/dotnet-coreclr/api/v3/index.json" />
<add key="myget-dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="dotnet-corefxtestdata" value="https://dotnet.myget.org/F/dotnet-corefxtestdata/api/v3/index.json" />
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
<!-- Microsoft.VisualStudio.* packages (e.g. Microsoft.VisualStudio.LanguageServer.Protocol.Extensions): https://github.com/dotnet/roslyn/issues/43242 -->
<add key="experimental-vs-packages" value="https://dotnet.myget.org/F/experimental-vs-packages/api/v3/index.json" />
<add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
<add key="interactive-window" value="https://dotnet.myget.org/F/interactive-window/api/v3/index.json" />
<add key="roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
<!-- Microsoft.CodeAnalysis.Test.Resource.Proprietary -->
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
<add key="roslyn-analyzers" value="https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json" />
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
<add key="vs-devcore" value="https://myget.org/F/vs-devcore/api/v3/index.json" />
<!-- Microsoft.VisualStudio.* packages (e.g. Microsoft.VisualStudio.ImageCatalog): https://github.com/dotnet/roslyn/issues/43242 -->
<add key="vs-editor" value="https://myget.org/F/vs-editor/api/v3/index.json" />
<!-- Microsoft.VisualStudio.ProjectSystem.Managed -->
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
<add key="roslyn_concord" value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
<add key="system-commandline" value="https://dotnet.myget.org/F/system-commandline/api/v3/index.json" />
<add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
<add key="dotnet-format" value="https://dotnet.myget.org/F/format/api/v3/index.json" />
<add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
15 changes: 3 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,7 @@ Want to start developing in C# and Visual Basic? Download [Visual Studio 2019](h
also [prebuilt Azure VM images](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/category/compute?search=visual%20studio%202019) available with
Visual Studio 2019 already installed.

To install the latest release without Visual Studio, run one of the following [nuget](https://dist.nuget.org/index.html) command lines:

```
nuget install Microsoft.Net.Compilers # Install C# and VB compilers
nuget install Microsoft.CodeAnalysis # Install Language APIs and Services
```

Daily NuGet builds of the project are also available in our MyGet feed:

> [https://dotnet.myget.org/F/roslyn/api/v3/index.json](https://dotnet.myget.org/F/roslyn/api/v3/index.json)
To install the latest release without Visual Studio, download the [].NET SDK nightlies](https://github.com/dotnet/installer/blob/master/README.md#installers-and-binaries).

See [what's new with the C# and VB compilers](https://github.com/dotnet/roslyn/wiki/Changelog-for-C%23-and-VB-compilers).

Expand Down Expand Up @@ -94,9 +85,9 @@ Some of the best ways to contribute are to try things out, file bugs, and join i

Looking for something to work on? The list of [up for grabs issues](https://github.com/dotnet/roslyn/labels/help%20wanted) is a great place to start.

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
This [project](CODE-OF-CONDUCT.md) has adopted the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

### .NET Foundation

This project is part of the [.NET Foundation](http://www.dotnetfoundation.org/projects) along with other
projects like [the class libraries for .NET Core](https://github.com/dotnet/corefx/).
projects like [the .NET Runtime](https://github.com/dotnet/runtime/).
17 changes: 16 additions & 1 deletion azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ variables:
value: .NETCore
- name: _DotNetValidationArtifactsCategory
value: .NETCoreValidation
- group: DotNet-Roslyn-SDLValidation-Params

stages:
- stage: build
Expand Down Expand Up @@ -123,7 +124,7 @@ stages:
inputs:
filePath: 'eng\publish-assets.ps1'
arguments: '-configuration $(BuildConfiguration) -branchName "$(SourceBranchName)" -mygetApiKey $(Roslyn.MyGetApiKey) -nugetApiKey $(Roslyn.NuGetApiKey) -gitHubUserName $(Roslyn.GitHubUserName) -gitHubToken $(Roslyn.GitHubToken) -gitHubEmail $(Roslyn.GitHubEmail)'
condition: succeeded()
condition: and(succeeded(), eq(variables['PRNumber'], 'default'))

# Publish OptProf configuration files
- task: ms-vscs-artifact.build-tasks.artifactDropTask-1.artifactDropTask@0
Expand Down Expand Up @@ -291,3 +292,17 @@ stages:
enableSourceLinkValidation: false
validateDependsOn:
- SetValidateDependency
# Enable SDL validation, passing through values from the 'DotNet-Roslyn-SDLValidation-Params' group.
SDLValidationParameters:
enable: true
params: >-
-SourceToolsList @("policheck","credscan")
-TsaInstanceURL $(_TsaInstanceURL)
-TsaProjectName $(_TsaProjectName)
-TsaNotificationEmail $(_TsaNotificationEmail)
-TsaCodebaseAdmin $(_TsaCodebaseAdmin)
-TsaBugAreaPath $(_TsaBugAreaPath)
-TsaIterationPath $(_TsaIterationPath)
-TsaRepositoryName $(_TsaRepositoryName)
-TsaCodebaseName $(_TsaCodebaseName)
-TsaPublish $True
Loading

0 comments on commit 86c102a

Please sign in to comment.