Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1 from Homely/netstandard20
Browse files Browse the repository at this point in the history
🚀 Migrated to NETStandard20
  • Loading branch information
RPM1984 authored Mar 19, 2021
2 parents 7ac9d41 + 90e31d7 commit 86b8559
Show file tree
Hide file tree
Showing 18 changed files with 302 additions and 336 deletions.
176 changes: 176 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
# EditorConfig is awesome:
http://EditorConfig.org


#### How to manually clean up code in an IDE?

#### - Visual Studio: CTRL + K + D
#### - VSCode: SHIFT + ALT + F



####################################################################################################

### VS Settings Reference: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference




# top-most EditorConfig file
root = true

# Default settings:
# A newline ending every file
# Use 4 spaces as indentation
[*]
insert_final_newline = true
indent_style = space
indent_size = 4
end_of_line = crlf
charset = utf-8
trim_trailing_whitespace = true

# C# files
[*.cs]
# New line preferences
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
csharp_new_line_between_query_expression_clauses = true

# Indentation preferences
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = one_less_than_current

# avoid this. unless absolutely 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

# only use var when it's obvious what the variable type is
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
csharp_style_var_elsewhere = true:suggestion

# use language keywords instead of BCL types
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

# name all constant fields using PascalCase
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style

dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_symbols.constant_fields.required_modifiers = const

dotnet_naming_style.pascal_case_style.capitalization = pascal_case

# static fields should have PascalCase
dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
dotnet_naming_rule.static_fields_should_have_prefix.symbols = static_fields
dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style

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

dotnet_naming_style.static_prefix_style.capitalization = pascal_case

# internal and private fields should be _camelCase
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style

dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal

dotnet_naming_style.camel_case_underscore_style.required_prefix = _
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case

# private fields must start with an underscore
dotnet_naming_rule.field_must_start_with_underscore.severity = warning
dotnet_naming_rule.field_must_start_with_underscore.symbols = private_fields
dotnet_naming_rule.field_must_start_with_underscore.style = start_underscore_style

dotnet_naming_symbols.private_fields.applicable_kinds = field
dotnet_naming_symbols.private_fields.applicable_accessibilities = private

dotnet_naming_style.start_underscore_style.capitalization = camel_case
dotnet_naming_style.start_underscore_style.required_prefix = _

# Code style defaults
dotnet_sort_system_directives_first = true
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = false

# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion

# Expression-bodied members
csharp_style_expression_bodied_methods = false:none
csharp_style_expression_bodied_constructors = false:none
csharp_style_expression_bodied_operators = false:none
csharp_style_expression_bodied_properties = true:none
csharp_style_expression_bodied_indexers = true:none
csharp_style_expression_bodied_accessors = true:none

# Pattern matching
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

# Null checking preferences
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion

# Space preferences
csharp_space_after_cast = false
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_around_binary_operators = before_and_after
csharp_space_around_declaration_statements = do_not_ignore
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

[*.{asm,inc}]
indent_size = 8

# Xml project files
[*.{csproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
indent_size = 2

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

[CMakeLists.txt]
indent_size = 2

[*.cmd]
indent_size = 2
97 changes: 41 additions & 56 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,56 +1,41 @@
*.obj
*.pdb
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
*.lib
*.sbr
*.scc
*.tmp
[Bb]in/
[Dd]ebug/
obj/
[Rr]elease/
[Tt]humbs.db
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.[Pp]ublish.xml
*.log.*
[Ll]ogs/
[Dd]ata/
[Pp]ackages/
*nlog*.csv
nlog-404s.csv
imagecache/
[Aa]ssemblies/
[Rr]aven/
.vs/

# Windows Azure
csx/
rcf/

# Windows Azure Publish Settings contain security keys for accessing your Windows Azure account
.publishsettings

# Resharper Ignores
_ReSharper.*/
*.resharper.user

.sass-cache/

# Ignore build stuff
[Bb]uild/Artifacts/
[Ss]cripts-[Bb]uild/
*.obj
*.pdb
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
*.lib
*.sbr
*.scc
[Bb]in
[Dd]ebug*/
obj/
[Rr]elease*/
_ReSharper*/
*.[Pp]ublish.xml
*.resharper*
AppData/
App_Data/
*.log.*
[Ll]ogs/
[Pp]ackages/
[Tt]humbs.db
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.sln.DotSettings.*
*.ncrunchproject
*.ncrunchsolution
*.nupkg
.vs
*.orig
10 changes: 9 additions & 1 deletion Homely.Testing.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ VisualStudioVersion = 16.0.28621.142
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Homely.Testing", "src\Homely.Testing\Homely.Testing.csproj", "{FE29A8FC-A6F7-4CD1-BA92-1384FE1BF866}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Homely.Testing.Tests", "tests\Homely.Testing.Tests\Homely.Testing.Tests.csproj", "{47377D46-D55C-44D0-B714-9E12AA78B6CD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Homely.Testing.Tests", "tests\Homely.Testing.Tests\Homely.Testing.Tests.csproj", "{47377D46-D55C-44D0-B714-9E12AA78B6CD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9604E446-1933-4AD4-A6AB-FB8FF8690D24}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D0EA52A8-F2EB-4247-9CE0-321D87E3124B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -25,6 +29,10 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{FE29A8FC-A6F7-4CD1-BA92-1384FE1BF866} = {9604E446-1933-4AD4-A6AB-FB8FF8690D24}
{47377D46-D55C-44D0-B714-9E12AA78B6CD} = {D0EA52A8-F2EB-4247-9CE0-321D87E3124B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {070AAA10-C49E-4519-B769-27C2459BC1BB}
EndGlobalSection
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ steps:
condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))

# Remove this task once .NET Core 2.2 is added to hosted agent.
- task: DotNetCoreInstaller@0
- task: DotNetCoreInstaller@2
inputs:
packageType: 'sdk'
version: '2.2.100'
version: '3.1.407'

- script: dotnet build --configuration $(buildConfiguration) -p:Version=$(assemblyVersion)
displayName: 'dotnet build'
Expand Down
12 changes: 12 additions & 0 deletions coverlet.runsettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<RunSettings>
<DataCollectionRunSettings>
<DataCollectors>
<DataCollector friendlyName="XPlat code coverage">
<Configuration>
<Exclude>[*.Tests]*</Exclude> <!-- [Assembly-Filter]Type-Filter -->
</Configuration>
</DataCollector>
</DataCollectors>
</DataCollectionRunSettings>
</RunSettings>
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "3.1.100",
"rollForward": "latestFeature"
}
}
Binary file added icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 30 additions & 7 deletions src/Homely.Testing/Homely.Testing.csproj
Original file line number Diff line number Diff line change
@@ -1,25 +1,48 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>0.0.0</Version>
<LangVersion>latest</LangVersion>
<PackageId>Homely.Testing</PackageId>
<Authors>Homely's developers</Authors>
<Company>Homely</Company>
<Product>Homely - testing library.</Product>
<Description>This library contains some test helpers which we regularly use in our test projects.</Description>
<Copyright>2019</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/Homely/Homely.Testing</PackageProjectUrl>
<PackageLicenseUrl></PackageLicenseUrl>
<PackageIconUrl>https://i.imgur.com/PnxWhuz.jpg</PackageIconUrl>
<OutputType>Library</OutputType>
<PackageProjectUrl>https://github.com/Homely/</PackageProjectUrl>
<RepositoryUrl>https://github.com/Homely/Homely.Testing</RepositoryUrl>
<RepositoryType>.net c# .net-core</RepositoryType>
<PackageTags>homely dotnet-core c# hosting dotnet testing test</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>

<IsPackable>true</IsPackable>

<!-- Source Link. REF: https://github.com/dotnet/sourcelink -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageIcon>icon.png</PackageIcon>
<PackageIconUrl />


</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<None Include="..\..\icon.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

</Project>
Loading

0 comments on commit 86b8559

Please sign in to comment.