Skip to content

Commit

Permalink
Merge pull request #188 from Azure/MergeDevBranchToMaster
Browse files Browse the repository at this point in the history
Merge dev branch to master upto commit 51ca8ab to release new version.
  • Loading branch information
sjkwak authored Aug 1, 2017
2 parents 007b193 + 838ce98 commit 52b1ce1
Show file tree
Hide file tree
Showing 86 changed files with 3,066 additions and 1,909 deletions.
78 changes: 78 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# Taken from dotnet/roslyn https://github.com/dotnet/roslyn/blob/master/.editorconfig

# top-most EditorConfig file
root = true

# Don't use tabs for indentation.
[*]
indent_style = tabs
# (Please don't specify an indent_size here; that has too many unintended consequences.)

# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4

# Xml project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2

# Xml config files
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
indent_size = 2

# JSON files
[*.json]
indent_size = 2

# Dotnet code style settings:
[*.{cs,vb}]
# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = true
# Avoid "this." and "Me." if not necessary
#dotnet_style_qualification_for_field = false:suggestion
#dotnet_style_qualification_for_property = false:suggestion
#dotnet_style_qualification_for_method = false:suggestion
#dotnet_style_qualification_for_event = false:suggestion

# Use language keywords instead of framework type names for type references
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

# Suggest more modern language features when available
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion

# CSharp code style settings:
[*.cs]
# Prefer "var" everywhere
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
csharp_style_var_elsewhere = true:suggestion

# Prefer method-like constructs to have a block body
csharp_style_expression_bodied_methods = false:none
csharp_style_expression_bodied_constructors = false:none
csharp_style_expression_bodied_operators = false:none

# Prefer property-like constructs to have an expression-body
csharp_style_expression_bodied_properties = true:none
csharp_style_expression_bodied_indexers = true:none
csharp_style_expression_bodied_accessors = true:none

# Suggest more modern language features when available
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion

# Newline settings
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,8 @@ Buildx86retail.dat
**/.vscode/

# Typescript installed definition files for modules
**/typings/
**/typings/

#OpenCover
/build/OpenCoverReport/*
/build/coverage.xml
29 changes: 6 additions & 23 deletions Microsoft.Azure.EventHubs.sln
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26430.6
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{08E028C1-29E7-42B5-871F-C911DB93E78A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9B788560-F090-446B-8E59-76B7BFD1C0B3}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.EventHubs", "src\Microsoft.Azure.EventHubs\Microsoft.Azure.EventHubs.xproj", "{126D946D-CE0F-4F14-9F13-8FD7098B81D8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{AF49C862-CB78-4110-A275-8111B387805D}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.EventHubs.UnitTests", "test\Microsoft.Azure.EventHubs.UnitTests\Microsoft.Azure.EventHubs.UnitTests.xproj", "{154F7B4C-B998-4FA0-933F-F34DB0CA9B88}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.EventHubs", "src\Microsoft.Azure.EventHubs\Microsoft.Azure.EventHubs.csproj", "{126D946D-CE0F-4F14-9F13-8FD7098B81D8}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.EventHubs.Processor", "src\Microsoft.Azure.EventHubs.Processor\Microsoft.Azure.EventHubs.Processor.xproj", "{8C89967A-4E1F-46B0-8458-81B545C822B2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.EventHubs.Tests", "test\Microsoft.Azure.EventHubs.Tests\Microsoft.Azure.EventHubs.Tests.csproj", "{154F7B4C-B998-4FA0-933F-F34DB0CA9B88}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.EventHubs.Processor.UnitTests", "test\Microsoft.Azure.EventHubs.Processor.UnitTests\Microsoft.Azure.EventHubs.Processor.UnitTests.xproj", "{F7F892F4-4490-4BC9-BB18-F42F2C85E345}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.EventHubs.Processor", "src\Microsoft.Azure.EventHubs.Processor\Microsoft.Azure.EventHubs.Processor.csproj", "{8C89967A-4E1F-46B0-8458-81B545C822B2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -38,18 +36,6 @@ Global
{8C89967A-4E1F-46B0-8458-81B545C822B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8C89967A-4E1F-46B0-8458-81B545C822B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8C89967A-4E1F-46B0-8458-81B545C822B2}.Release|Any CPU.Build.0 = Release|Any CPU
{F7F892F4-4490-4BC9-BB18-F42F2C85E345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F7F892F4-4490-4BC9-BB18-F42F2C85E345}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7F892F4-4490-4BC9-BB18-F42F2C85E345}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7F892F4-4490-4BC9-BB18-F42F2C85E345}.Release|Any CPU.Build.0 = Release|Any CPU
{940BCA4A-B154-4667-8A03-57E6B689866D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{940BCA4A-B154-4667-8A03-57E6B689866D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{940BCA4A-B154-4667-8A03-57E6B689866D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{940BCA4A-B154-4667-8A03-57E6B689866D}.Release|Any CPU.Build.0 = Release|Any CPU
{679DFCC5-76BD-4725-A51E-AFBB01565401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{679DFCC5-76BD-4725-A51E-AFBB01565401}.Debug|Any CPU.Build.0 = Debug|Any CPU
{679DFCC5-76BD-4725-A51E-AFBB01565401}.Release|Any CPU.ActiveCfg = Release|Any CPU
{679DFCC5-76BD-4725-A51E-AFBB01565401}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -58,8 +44,5 @@ Global
{126D946D-CE0F-4F14-9F13-8FD7098B81D8} = {08E028C1-29E7-42B5-871F-C911DB93E78A}
{154F7B4C-B998-4FA0-933F-F34DB0CA9B88} = {AF49C862-CB78-4110-A275-8111B387805D}
{8C89967A-4E1F-46B0-8458-81B545C822B2} = {08E028C1-29E7-42B5-871F-C911DB93E78A}
{F7F892F4-4490-4BC9-BB18-F42F2C85E345} = {AF49C862-CB78-4110-A275-8111B387805D}
{940BCA4A-B154-4667-8A03-57E6B689866D} = {188550D8-80F0-410D-AECA-BC3C1F96CF95}
{679DFCC5-76BD-4725-A51E-AFBB01565401} = {188550D8-80F0-410D-AECA-BC3C1F96CF95}
EndGlobalSection
EndGlobal
45 changes: 26 additions & 19 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,32 @@
version: 1.0.{build}
branches:
only:
- master
- dev
skip_tags: true
matrix:
fast_finish: true
image: Visual Studio 2017
environment:
ClientSecret:
azure-event-hubs-dotnet/ClientSecret:
secure: /8H7C81iNS+gVi7LhJCEOPUlNaa30y4KcY4nw/g2C4HGxOv6SrcroyDvMnqD+5GN
TenantId:
azure-event-hubs-dotnet/TenantId:
secure: xohonz/X8PPLOVIdT3ch2C5XeSa30RwR6NuXFh4e85svXT1mJNGGO1HQEGxCk3wp
AppId:
azure-event-hubs-dotnet/AppId:
secure: c+H140oRJfHtmFHZxSRLWocv5AU0q33X7kgMcTcXxhJvtVhk2WAk1dRQkSN+SyoA
before_build:
- ps: >-
. .\build\AppveyorBuildFunctions.ps1
matrix:
# First build
- DotNetRunTime: netcoreapp1.0
azure-event-hubs-dotnet/CodeCovSecret:
secure: pmpPpo9faBysYDhkDrKv4zOm1UOmdpga7+sZEcjYOITwzph24z947KugpQMLMGrx
# Second build
- DotNetRunTime: net46
azure-event-hubs-dotnet/SkipCodeCoverage: true
skip_commits:
files:
- '**/*.md'
artifacts:
- path: .\build\artifacts\*
build_script:
- ps: >-
Build-Solution
before_test:
- ps: >-
Set-XUnitConfig
Deploy-AzureResources
test_script:
- ps: >-
Run-UnitTests
after_test:
- ps: >-
Delete-AzureResources
- ps: .\build\build.ps1
test: off
149 changes: 0 additions & 149 deletions build/AppveyorBuildFunctions.ps1

This file was deleted.

File renamed without changes.
Loading

0 comments on commit 52b1ce1

Please sign in to comment.