Skip to content

Commit

Permalink
Updated configuration.
Browse files Browse the repository at this point in the history
  • Loading branch information
mahara committed Jan 11, 2024
1 parent 944cb3e commit 9368d70
Show file tree
Hide file tree
Showing 16 changed files with 160 additions and 112 deletions.
55 changes: 28 additions & 27 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,75 +1,71 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

#### Core EditorConfig Options ####

# Code-style rule options
# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/code-style-rule-options?view=vs-2022
# https://github.com/dotnet/roslyn/blob/main/src/VisualStudio/Core/Def/CodeCleanup/readme.md


# top-most EditorConfig file
root = true


# All files
[*]

# File encoding preferences
charset = utf-8

# New line preferences
end_of_line = crlf
insert_final_newline = true
trim_trailing_whitespace = true

# Indentation and spacing
indent_style = space
indent_size = 4
tab_width = 4


# Project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
[*.{csproj,vbproj,vcxproj,vcxproj.filters,fsproj,sqlproj,dbproj,wixproj,shproj,proj}]
indent_size = 2
tab_width = 2


# Solution and project configuration files
[*.{props,targets,manifest,yml,ruleset,nuspec,vsixmanifest,vsct}]
[*.{manifest,props,targets,yml,yaml}]
indent_size = 2
tab_width = 2


# XML configuration files
[*.{xml,xsd,json,config,resx}]
# JSON and XML configuration files
[*.{json,config,ruleset,resx,xml,xsd}]
indent_size = 2
tab_width = 2


# HTML, CSS, SCSS files
[*.{html,css,scss}]
# HTML, CSS, and related files
[*.{html,css,scss,less}]
indent_size = 2
tab_width = 2


# Markdown files
[*.md]
trim_trailing_whitespace = false


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

indent_size = 2
tab_width = 2

#### Core EditorConfig Options ####

# File encoding preferences
charset = utf-8

# New line preferences
end_of_line = crlf
insert_final_newline = true
trim_trailing_whitespace = true
#### .NET Coding Conventions ####

# Indentation and spacing
indent_style = space
# C# and VB.NET files
[*.{cs,csx,cshtml,vb,vbx,vbhtml,xaml}]
indent_size = 4
tab_width = 4


#### .NET Coding Conventions ####

# Organize usings
dotnet_separate_import_directive_groups = true
dotnet_sort_system_directives_first = true
Expand Down Expand Up @@ -192,6 +188,9 @@ dotnet_diagnostic.CA1311.severity = warning
# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1815
dotnet_diagnostic.CA1815.severity = error

# NUnit2045: Use Assert.Multiple
dotnet_diagnostic.NUnit2045.severity = silent


# C# files
[*.cs]
Expand Down Expand Up @@ -251,6 +250,8 @@ csharp_style_unused_value_assignment_preference = discard_variable:suggestion
csharp_style_unused_value_expression_statement_preference = discard_variable:silent

# 'using' directive preferences
# SA1200: UsingDirectivesMustBePlacedWithinNamespace
# https://documentation.help/StyleCop/SA1200.html
csharp_using_directive_placement = inside_namespace:silent

# New line preferences
Expand Down
6 changes: 4 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ MAKEFILE text
*.sql text
*.sqlgen text eol=crlf
*.wixproj text eol=crlf merge=union
*.shproj text eol=crlf merge=union
*.proj text eol=crlf merge=union
*.xml text diff=html
*.xsd text diff=html
Expand All @@ -56,6 +57,8 @@ MAKEFILE text
*.ps1xml text eol=crlf
*.cmd text eol=crlf
*.bat text eol=crlf
*.yml text
*.yaml text
*.licenseheader text eol=crlf
*.pubxml text eol=crlf
*.md text diff=markdown
Expand All @@ -65,16 +68,15 @@ MAKEFILE text
*.exe binary
*.dll binary
*.pdb binary
*.msi binary
*.xap binary
*.snk binary
*.png binary
*.ico binary
*.jpg binary
*.jpeg binary
*.gif binary
*.bmp binary
*.webp binary
*.ico binary
*.cur binary
*.sys binary
*.chm binary
3 changes: 0 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,3 @@ jobs:
with:
name: '${{env.test_results_artifact_name}}'
path: '${{github.workspace}}/${{env.test_results_artifact_name}}'



2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NHibernate.ObservableCollections - Changelog

## 5.0.0 (2023-04-06)
## 5.0.0 (2024-01-11)

Initial release.

Expand Down
17 changes: 17 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>

<!--
https://github.com/dotnet/project-system/blob/main/docs/build-acceleration.md
https://devblogs.microsoft.com/visualstudio/vs-toolbox-accelerate-your-builds-of-sdk-style-net-projects/
https://github.com/dotnet/project-system/issues/9106
-->

<!-- Enable Build Acceleration in Visual Studio. -->
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>

<!--
If you target a framework earlier than .NET 5 (including .NET Framework and .NET Standard),
you should set ProduceReferenceAssembly to true in order to speed incremental builds.
If you multi-target and any target is before .NET 5, you need this.
Even if you target .NET 5 or later, having this property is fine.
-->
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>

</PropertyGroup>

</Project>
1 change: 0 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,5 @@
<PackageVersion Include="Remotion.Linq" Version="2.2.0" />
<PackageVersion Include="Remotion.Linq.EagerFetching" Version="2.2.0" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.5" />
<PackageVersion Include="System.Security.Permissions" Version="8.0.0" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.



2 changes: 1 addition & 1 deletion build/AssemblyInfo.Global.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Runtime.InteropServices;

[assembly: CLSCompliant(true)]
[assembly: ComVisible(false)]
[assembly: ComVisible(true)]
Loading

0 comments on commit 9368d70

Please sign in to comment.