Skip to content

Commit

Permalink
Merge branch 'releases/6.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
cd21h committed Dec 29, 2020
2 parents ee48cdd + c40f895 commit c9f1c6e
Show file tree
Hide file tree
Showing 56 changed files with 423 additions and 191 deletions.
46 changes: 28 additions & 18 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@
root=true

[*]
trim_trailing_whitespace = true
end_of_line = crlf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.cake]
indent_style = space
indent_size = 4
tab_width = 4

[*.{config,xml,js,json,html,css,sql,csproj,props,yml}]
indent_size = 2
Expand All @@ -17,26 +23,30 @@ end_of_line = lf
end_of_line = crlf

[{**/tests/**,**/Tests/**,**/*.Tests/**}.cs]
resharper_class_never_instantiated_global_highlighting=do_not_show
resharper_consider_using_configure_await_highlighting=do_not_show
resharper_event_exception_not_documented_highlighting=do_not_show
resharper_exception_not_documented_highlighting=do_not_show
resharper_exception_not_documented_optional_highlighting=do_not_show
resharper_heap_view_boxing_allocation=do_not_show
resharper_heap_view_boxing_allocation_highlighting=do_not_show
resharper_heap_view_closure_allocation_highlighting=do_not_show
resharper_heap_view_delegate_allocation_highlighting=do_not_show
resharper_heap_view_object_allocation_highlighting=do_not_show
resharper_heap_view_object_allocation_evident_highlighting=do_not_show
resharper_possible_null_reference_exception_highlighting=do_not_show
resharper_private_field_can_be_converted_to_local_variable_highlighting=do_not_show
resharper_return_value_of_pure_method_is_not_used_highlighting=do_not_show
resharper_suggest_base_type_for_parameter_highlighting=do_not_show
resharper_class_with_virtual_members_never_inherited_local_highlighting=do_not_show
resharper_class_with_virtual_members_never_inherited_global_highlighting=do_not_show
resharper_async_converter_async_await_may_be_elided_highlighting=do_not_show
resharper_class_never_instantiated_global_highlighting = do_not_show
resharper_class_with_virtual_members_never_inherited_global_highlighting = do_not_show
resharper_class_with_virtual_members_never_inherited_local_highlighting = do_not_show
resharper_consider_using_configure_await_highlighting = do_not_show
resharper_event_exception_not_documented_highlighting = do_not_show
resharper_exception_not_documented_highlighting = do_not_show
resharper_exception_not_documented_optional_highlighting = do_not_show
resharper_heap_view_boxing_allocation_highlighting = do_not_show
resharper_heap_view_closure_allocation_highlighting = do_not_show
resharper_heap_view_delegate_allocation_highlighting = do_not_show
resharper_heap_view_object_allocation_evident_highlighting = do_not_show
resharper_heap_view_object_allocation_highlighting = do_not_show
resharper_inconsistent_naming_highlighting = do_not_show
resharper_missing_annotation_highlighting = do_not_show
resharper_missing_xml_doc_highlighting = do_not_show
resharper_possible_null_reference_exception_highlighting = do_not_show
resharper_private_field_can_be_converted_to_local_variable_highlighting = do_not_show
resharper_return_value_of_pure_method_is_not_used_highlighting = do_not_show
resharper_suggest_base_type_for_parameter_highlighting = do_not_show

[**/{Startup,Program}.cs]
resharper_event_exception_not_documented_highlighting=do_not_show
resharper_exception_not_documented_highlighting=do_not_show
resharper_exception_not_documented_optional_highlighting=do_not_show
resharper_heap_view_object_allocation_evident_highlighting=do_not_show
resharper_missing_xml_doc_highlighting=do_not_show
8 changes: 8 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"version": "0.2.0",
"configurations": [
]
}
11 changes: 11 additions & 0 deletions .vscode/solution-explorer/class.cs-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace {{namespace}}
{
using System;

/// <summary>
/// {{name}} description.
/// </summary>
public class {{name}}
{
}
}
3 changes: 3 additions & 0 deletions .vscode/solution-explorer/class.ts-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export class {{name}} {

}
9 changes: 9 additions & 0 deletions .vscode/solution-explorer/class.vb-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Imports System

Namespace {{namespace}}

Public Class {{name}}

End Class

End Namespace
3 changes: 3 additions & 0 deletions .vscode/solution-explorer/default.ts-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {{name}} {

}
11 changes: 11 additions & 0 deletions .vscode/solution-explorer/enum.cs-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace {{namespace}}
{
using System;

/// <summary>
/// {{name}} description.
/// </summary>
public enum {{name}}
{
}
}
11 changes: 11 additions & 0 deletions .vscode/solution-explorer/interface.cs-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace {{namespace}}
{
using System;

/// <summary>
/// {{name}} description.
/// </summary>
public interface {{name}}
{
}
}
3 changes: 3 additions & 0 deletions .vscode/solution-explorer/interface.ts-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface {{name}} {

}
46 changes: 46 additions & 0 deletions .vscode/solution-explorer/template-list.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"templates": [
{
"name": "Class",
"extension": "cs",
"file": "./class.cs-template",
"parameters": "./template-parameters.js"
},
{
"name": "Interface",
"extension": "cs",
"file": "./interface.cs-template",
"parameters": "./template-parameters.js"
},
{
"name": "Enum",
"extension": "cs",
"file": "./enum.cs-template",
"parameters": "./template-parameters.js"
},
{
"name": "Class",
"extension": "ts",
"file": "./class.ts-template",
"parameters": "./template-parameters.js"
},
{
"name": "Interface",
"extension": "ts",
"file": "./interface.ts-template",
"parameters": "./template-parameters.js"
},
{
"name": "Default",
"extension": "ts",
"file": "./default.ts-template",
"parameters": "./template-parameters.js"
},
{
"name": "Class",
"extension": "vb",
"file": "./class.vb-template",
"parameters": "./template-parameters.js"
}
]
}
17 changes: 17 additions & 0 deletions .vscode/solution-explorer/template-parameters.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
var path = require("path");

module.exports = function(filename, projectPath, folderPath) {
var namespace = "Unknown";
if (projectPath) {
namespace = path.basename(projectPath, path.extname(projectPath));
if (folderPath) {
namespace += "." + folderPath.replace(path.dirname(projectPath), "").substring(1).replace(/[\\\/]/g, ".");
}
namespace = namespace.replace(/[\\\-]/g, "_");
}

return {
namespace: namespace,
name: path.basename(filename, path.extname(filename))
}
};
31 changes: 25 additions & 6 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"type": "cake",
"script": "RunUnitTests",
"problemMatcher": []
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/Src/SharpArch.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "test",
"command": "dotnet",
"type": "shell",
"group": "test",
"args": [
"test",
"${workspaceFolder}/Src/SharpArch.sln"
],
"presentation": {
"reveal": "silent"
},
"problemMatcher": "$msCompile"
}
]
}
}
11 changes: 6 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
<Product>Sharp Architecture</Product>
<Authors>Sharp Architecture Dev Team</Authors>

<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net5</TargetFrameworks>
<SignAssembly>false</SignAssembly>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType>

<LangVersion>8.0</LangVersion>
<LangVersion>9.0</LangVersion>
<IsTestProject>false</IsTestProject>
</PropertyGroup>

<PropertyGroup Label="Custom targers">
<PropertyGroup Label="Custom targeTs">
<!-- target frameworks for unit-tests and applications -->
<AppTargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.1</AppTargetFrameworks>
<AppTargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.1;net5</AppTargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)'=='Debug'">
Expand All @@ -43,7 +43,8 @@
<PropertyGroup Label="SourceLink">
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<PropertyGroup Condition="'$(MSBuildProjectName.Contains(Tests))' == true">
Expand Down
8 changes: 4 additions & 4 deletions Samples/TardisBank/Database/UnitTestGeneratedSchema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -62,29 +62,29 @@ alter table Parents drop constraint FK_Parents_Join_Users

create table Messages (
MessageId INT not null,
UserId INT null,
Date DATETIME2 null,
Text NVARCHAR(255) null,
HasBeenRead BIT null,
UserId INT null,
primary key (MessageId)
)

create table PaymentSchedules (
PaymentScheduleId INT not null,
AccountId INT null,
NextRun DATETIME2 null,
Interval NVARCHAR(255) null,
Amount DECIMAL(19,5) null,
Description NVARCHAR(255) null,
AccountId INT null,
primary key (PaymentScheduleId)
)

create table Transactions (
TransactionId INT not null,
AccountId INT null,
Description NVARCHAR(255) null,
Amount DECIMAL(19,5) null,
Date DATETIME2 null,
AccountId INT null,
primary key (TransactionId)
)

Expand All @@ -99,8 +99,8 @@ alter table Parents drop constraint FK_Parents_Join_Users

create table Children (
UserId INT not null,
ParentId INT null,
AccountId INT null,
ParentId INT null,
primary key (UserId)
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup Label="Package References (NetStandard 2.0)" Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
</ItemGroup>

<ItemGroup Label="Package References (NetStandard 2.1)" Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
</ItemGroup>

<ItemGroup Label="Package References (.NET 5)" Condition=" '$(TargetFramework)' == 'net5' ">
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(AppTargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<PackageReference Include="MediatR" Version="8.0.1" />
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(AppTargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="9.0.0" />
<PackageReference Include="FluentNHibernate" Version="2.1.2" />
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="FluentNHibernate" Version="3.1.0" />
<PackageReference Include="Humanizer.Core" Version="2.8.26" />
<PackageReference Include="Iesi.Collections" Version="4.0.4" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<PackageReference Include="NHibernate" Version="5.2.7" />
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
<PackageReference Include="NHibernate" Version="5.3.5" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(AppTargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Iesi.Collections" Version="4.0.4" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<PackageReference Include="MediatR" Version="8.0.1" />
<PackageReference Include="NHibernate" Version="5.2.7" />
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="NHibernate" Version="5.3.5" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit c9f1c6e

Please sign in to comment.