Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fix/26992/to-full-p…
Browse files Browse the repository at this point in the history
…rop-refactoring-naming-alignment

* origin/master: (1888 commits)
  Remove unused diagnostic methods. (#30539)
  Added missing underscores in resource name (#30545)
  Move Spanish job to Azure DevOps
  Add when clause case to the TypeInferrer
  Add unit test
  Workaround for missing ZipDirectory task in msbuild 15.7
  Build Roslyn_Preview.zip from a project
  Fixed typo ‘should descent’
  Test loading of analyzer built against netstandard1.3
  Add links to workitems/test plans (#30476)
  Use the IsAccessor extension for ISymbol
  Add unit test
  Update test.
  Simplify.
  Don't double massage actions.
  Only look at the nested actions, ensuring that this form doesn't change unexpectedly.
  Set getInnermostNodeForTie argument to true
  Fix for UseLocalFunction breaking semantics
  Rename
  Update name.
  ...

# Conflicts:
#	src/Features/Core/Portable/InitializeParameter/AbstractInitializeMemberFromParameterCodeRefactoringProviderMemberCreation.cs
  • Loading branch information
wachulski committed Oct 18, 2018
2 parents 5ef0401 + 2827208 commit 4b2bff0
Show file tree
Hide file tree
Showing 3,557 changed files with 347,066 additions and 253,191 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
69 changes: 69 additions & 0 deletions .editorconfig
Expand Up @@ -47,6 +47,75 @@ dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion

# Non-private static fields are PascalCase
dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.symbols = non_private_static_fields
dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.style = non_private_static_field_style

dotnet_naming_symbols.non_private_static_fields.applicable_kinds = field
dotnet_naming_symbols.non_private_static_fields.applicable_accessibilities = public, protected, internal, protected internal, private protected
dotnet_naming_symbols.non_private_static_fields.required_modifiers = static

dotnet_naming_style.non_private_static_field_style.capitalization = pascal_case

# Constants are PascalCase
dotnet_naming_rule.constants_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constants_should_be_pascal_case.symbols = constants
dotnet_naming_rule.constants_should_be_pascal_case.style = constant_style

dotnet_naming_symbols.constants.applicable_kinds = field, local
dotnet_naming_symbols.constants.required_modifiers = const

dotnet_naming_style.constant_style.capitalization = pascal_case

# Static fields are camelCase and start with s_
dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion
dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields
dotnet_naming_rule.static_fields_should_be_camel_case.style = static_field_style

dotnet_naming_symbols.static_fields.applicable_kinds = field
dotnet_naming_symbols.static_fields.required_modifiers = static

dotnet_naming_style.static_field_style.capitalization = camel_case
dotnet_naming_style.static_field_style.required_prefix = s_

# Instance fields are camelCase and start with _
dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style

dotnet_naming_symbols.instance_fields.applicable_kinds = field

dotnet_naming_style.instance_field_style.capitalization = camel_case
dotnet_naming_style.instance_field_style.required_prefix = _

# Locals and parameters are camelCase
dotnet_naming_rule.locals_should_be_camel_case.severity = suggestion
dotnet_naming_rule.locals_should_be_camel_case.symbols = locals_and_parameters
dotnet_naming_rule.locals_should_be_camel_case.style = camel_case_style

dotnet_naming_symbols.locals_and_parameters.applicable_kinds = parameter, local

dotnet_naming_style.camel_case_style.capitalization = camel_case

# Local functions are PascalCase
dotnet_naming_rule.local_functions_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.local_functions_should_be_pascal_case.symbols = local_functions
dotnet_naming_rule.local_functions_should_be_pascal_case.style = local_function_style

dotnet_naming_symbols.local_functions.applicable_kinds = local_function

dotnet_naming_style.local_function_style.capitalization = pascal_case

# By default, name items with PascalCase
dotnet_naming_rule.members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.members_should_be_pascal_case.symbols = all_members
dotnet_naming_rule.members_should_be_pascal_case.style = pascal_case_style

dotnet_naming_symbols.all_members.applicable_kinds = *

dotnet_naming_style.pascal_case_style.capitalization = pascal_case

# CSharp code style settings:
[*.cs]
# Indentation preferences
Expand Down
10 changes: 0 additions & 10 deletions .gitattributes
Expand Up @@ -2,16 +2,6 @@
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto encoding=UTF-8

# RunCsc/RunVbc are shell scripts and should always have unix line endings
# These shell scripts are included in the toolset packages. Normally, the shell
# scripts in our repo are only run by cloning onto a Linux/Mac machine, and git
# automatically chooses LF as the line ending.
#
# However, right now the toolset packages must be built on Windows, and so the
# files must be hard-coded to be cloned with LF
build/NuGetAdditionalFiles/RunCsc text eol=lf
build/NuGetAdditionalFiles/RunVbc text eol=lf
*.sh text eol=lf

###############################################################################
Expand Down
44 changes: 0 additions & 44 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

92 changes: 33 additions & 59 deletions .vsts-ci.yml
Expand Up @@ -32,37 +32,29 @@ steps:
feed: '8f470c7e-ac49-4afe-a6ee-cf784e438b93'

- task: CmdLine@1
displayName: Create output directory
inputs:
filename: mkdir
arguments: 'Binaries\$(BuildConfiguration)'

- task: VSBuild@1
- script: build\scripts\cibuild.cmd
-configuration $(BuildConfiguration) -official -testDesktop -procdump
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
/p:DotNetSignType=$(PB_SignType)
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
displayName: Build
condition: succeeded()

- task: PowerShell@2
displayName: Publish Assets
inputs:
solution: 'src/Tools/MicroBuild/Build.proj'
vsVersion: 15.0
msbuildArgs: >-
/p:TreatWarningsAsErrors=true
/p:DeployExtension=false
/p:TrackFileAccess=false
/p:OfficialBuild=true
/p:VisualStudioVersion=14.0
/flp1:Summary;Verbosity=diagnostic;Encoding=UTF-8;LogFile=$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\Roslyn.log
/flp2:WarningsOnly;Verbosity=diagnostic;Encoding=UTF-8;LogFile=$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\Roslyn.wrn
/flp3:ErrorsOnly;Verbosity=diagnostic;Encoding=UTF-8;LogFile=$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\Roslyn.err
/p:RoslynMyGetApiKey=$(Roslyn.MyGetApiKey)
/p:RoslynNuGetApiKey=$(Roslyn.NuGetApiKey)
/p:RoslynGitHubEmail=$(Roslyn.GitHubEmail)
/p:RoslynGitHubToken=$(Roslyn.GitHubToken)
/p:RoslynGitHubUserName=$(Roslyn.GitHubUserName)
/p:PB_PublishBlobFeedKey=$(PB_PublishBlobFeedKey)
/p:PublishStableVersions=false
/p:VersionStampToPublish=prerelease
platform: '$(BuildPlatform)'
configuration: '$(BuildConfiguration)'
maximumCpuCount: true
logProjectEvents: false
arguments: '-config $(BuildConfiguration) -branchName "$(Build.SourceBranch)" -mygetApiKey $(Roslyn.MyGetApiKey) -nugetApiKey $(Roslyn.NuGetApiKey) -gitHubUserName $(Roslyn.GitHubUserName) -gitHubToken $(Roslyn.GitHubToken) -gitHubEmail $(Roslyn.GitHubEmail)'
filePath: 'build\scripts\publish-assets.ps1'
condition: succeeded()

- task: PublishBuildArtifacts@1
displayName: Publish Logs
inputs:
PathtoPublish: '$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\Logs'
ArtifactName: 'Build Diagnostic Files'
Expand All @@ -71,48 +63,19 @@ steps:
condition: succeededOrFailed()

- task: PublishTestResults@1
displayName: Publish Test Results
inputs:
testRunner: XUnit
testResultsFiles: '**/xUnitResults/*.xml'
mergeTestResults: true
testRunTitle: 'Unit Tests'
condition: succeededOrFailed()

- task: PublishSymbols@1
displayName: Create Symbol Index
inputs:
SymbolsPath: '$(DropRoot)\Roslyn-Signed\$(Build.SourceBranchName)\$(BuildConfiguration)\$(Build.BuildNumber)\Symbols'
SearchPattern: '**\*.dll;**\*.exe;**\*.pdb'
SymbolsFolder: '$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\SymStore'
SkipIndexing: true
TreatNotIndexedAsWarning: true
SymbolsProduct: Roslyn
SymbolsVersion: '$(Build.BuildNumber)'
SymbolsArtifactName: Symbols
condition: and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))

- task: CopyFiles@2
displayName: Copy Files to Local Temporary Path
inputs:
SourceFolder: '$(DropRoot)\Roslyn-Signed\$(Build.SourceBranchName)\$(BuildConfiguration)\$(Build.BuildNumber)\Symbols'
TargetFolder: '$(Build.StagingDirectory)\SymbolsForPublish'
condition: and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))

- task: ms-vscs-artifact.build-tasks.artifactSymbolTask-1.artifactSymbolTask@0
displayName: Publish Symbols to Artifact Services
inputs:
symbolServiceURI: 'https://microsoft.artifacts.visualstudio.com/DefaultCollection'
requestName: '$(system.teamProject)/Roslyn-Signed/$(Build.BuildNumber)/$(Build.BuildId)'
sourcePath: '$(Build.StagingDirectory)\SymbolsForPublish'
usePat: false
continueOnError: true
condition: and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))

- task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
displayName: Upload VSTS Drop
inputs:
DropFolder: 'Binaries\$(BuildConfiguration)\Insertion'
condition: and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))
DropFolder: 'Binaries\VSSetup\$(BuildConfiguration)\Insertion'
condition: succeeded()

- task: NuGetCommand@2
displayName: NuGet CoreXT publish
Expand All @@ -122,17 +85,28 @@ steps:
packagesToPush: '$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\DevDivPackages\**\*.nupkg'
publishVstsFeed: '97a41293-2972-4f48-8c0e-05493ae82010'
allowPackageConflicts: true
condition: and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))
condition: succeeded()

# Publish VSTS artifact that the RoslynInsertionTool is able to find by its name.
# The backing storage of the artifact is a file share.
- task: PublishBuildArtifacts@1
displayName: Publish Drop (parallel)
displayName: Publish Drop - Binaries
inputs:
PathtoPublish: 'Binaries\$(BuildConfiguration)'
ArtifactName: '$(Build.BuildNumber)'
publishLocation: FilePath
TargetPath: '$(DropRoot)\Roslyn-Signed\$(Build.SourceBranchName)\$(BuildConfiguration)'
Parallel: true
ParallelCount: 64
condition: succeededOrFailed()

# Copy additional files to the drop directory
- task: PowerShell@2
displayName: Publish Drop - VSSetup
inputs:
arguments: '-Source Binaries\VSSetup\$(BuildConfiguration)\Insertion -Target $(DropRoot)\Roslyn-Signed\$(Build.SourceBranchName)\$(BuildConfiguration)\$(Build.BuildNumber)\Insertion -ParallelCount 8'
filePath: 'build\scripts\vsts-robocopy.ps1'
condition: succeededOrFailed()

- task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
displayName: Perform Cleanup Tasks
Expand All @@ -145,5 +119,5 @@ steps:
ArtifactName: '$(Build.BuildNumber)'
publishLocation: FilePath
TargetPath: '$(DropRoot)\Roslyn-Signed\$(Build.SourceBranchName)\$(BuildConfiguration)'
condition: and(succeededOrFailed(), contains(variables['PB_PublishType'], 'vsts'))
condition: succeededOrFailed()

0 comments on commit 4b2bff0

Please sign in to comment.