Skip to content

Commit

Permalink
Merge pull request #325 from HicServices/feature/updates
Browse files Browse the repository at this point in the history
.Net 9, Ubuntu 22.04
  • Loading branch information
JFriel authored Jan 27, 2025
2 parents 67239ae + b860c2a commit c6e054c
Show file tree
Hide file tree
Showing 11 changed files with 219 additions and 26 deletions.
184 changes: 184 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@

[*.{appxmanifest,axml,blockshader,build,c,c++,c++m,cc,ccm,cginc,compute,config,cp,cpp,cppm,cshtml,csproj,cu,cuh,cxx,cxxm,dbml,discomap,dtd,fx,fxh,h,h++,hh,hlsl,hlsli,hlslinc,hp,hpp,htm,html,hxx,icc,inc,inl,ino,ipp,ixx,jsproj,lsproj,mpp,mq4,mq5,mqh,mxx,njsproj,nuspec,proj,props,razor,resw,resx,shaderFoundry,StyleCop,targets,tasks,tcc,tpp,urtshader,usf,ush,vbproj,xml,xsd}]
indent_style = tab
indent_size = tab
tab_width = 4

[*.{asax,ascx,aspx,axaml,cs,master,paml,skin,vb,xaml,xamlx,xoml}]
indent_style = space
indent_size = 4
tab_width = 4

[*]

# Microsoft .NET properties
csharp_new_line_before_members_in_object_initializers = false
csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
csharp_style_prefer_utf8_string_literals = true:suggestion
csharp_style_var_elsewhere = true:suggestion
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
dotnet_naming_rule.interfaces_rule.import_to_resharper = True
dotnet_naming_rule.interfaces_rule.resharper_description = Interfaces
dotnet_naming_rule.interfaces_rule.resharper_guid = a7a3339e-4e89-4319-9735-a9dc4cb74cc7
dotnet_naming_rule.interfaces_rule.severity = warning
dotnet_naming_rule.interfaces_rule.style = i_upper_camel_case_style
dotnet_naming_rule.interfaces_rule.symbols = interfaces_symbols
dotnet_naming_rule.private_constants_rule.import_to_resharper = True
dotnet_naming_rule.private_constants_rule.resharper_description = Constant fields (private)
dotnet_naming_rule.private_constants_rule.resharper_guid = 236f7aa5-7b06-43ca-bf2a-9b31bfcff09a
dotnet_naming_rule.private_constants_rule.severity = warning
dotnet_naming_rule.private_constants_rule.style = upper_camel_case_style
dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols
dotnet_naming_rule.private_instance_fields_rule.import_to_resharper = True
dotnet_naming_rule.private_instance_fields_rule.resharper_description = Instance fields (private)
dotnet_naming_rule.private_instance_fields_rule.resharper_guid = 4a98fdf6-7d98-4f5a-afeb-ea44ad98c70c
dotnet_naming_rule.private_instance_fields_rule.severity = warning
dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style
dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols
dotnet_naming_rule.private_static_fields_rule.import_to_resharper = True
dotnet_naming_rule.private_static_fields_rule.resharper_description = Static fields (private)
dotnet_naming_rule.private_static_fields_rule.resharper_exclusive_prefixes_suffixes = true
dotnet_naming_rule.private_static_fields_rule.resharper_guid = f9fce829-e6f4-4cb2-80f1-5497c44f51df
dotnet_naming_rule.private_static_fields_rule.severity = warning
dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style
dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols
dotnet_naming_rule.private_static_readonly_rule.import_to_resharper = True
dotnet_naming_rule.private_static_readonly_rule.resharper_description = Static readonly fields (private)
dotnet_naming_rule.private_static_readonly_rule.resharper_guid = 15b5b1f1-457c-4ca6-b278-5615aedc07d3
dotnet_naming_rule.private_static_readonly_rule.severity = warning
dotnet_naming_rule.private_static_readonly_rule.style = upper_camel_case_style
dotnet_naming_rule.private_static_readonly_rule.symbols = private_static_readonly_symbols
dotnet_naming_style.i_upper_camel_case_style.capitalization = pascal_case
dotnet_naming_style.i_upper_camel_case_style.required_prefix = I
dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
dotnet_naming_style.lower_camel_case_style.required_prefix = _
dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
dotnet_naming_symbols.interfaces_symbols.applicable_accessibilities = *
dotnet_naming_symbols.interfaces_symbols.applicable_kinds = interface
dotnet_naming_symbols.interfaces_symbols.resharper_applicable_kinds = interface
dotnet_naming_symbols.interfaces_symbols.resharper_required_modifiers = any
dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
dotnet_naming_symbols.private_constants_symbols.resharper_applicable_kinds = constant_field
dotnet_naming_symbols.private_constants_symbols.resharper_required_modifiers = any
dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.private_instance_fields_symbols.resharper_applicable_kinds = field,readonly_field
dotnet_naming_symbols.private_instance_fields_symbols.resharper_required_modifiers = instance
dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
dotnet_naming_symbols.private_static_fields_symbols.resharper_applicable_kinds = field
dotnet_naming_symbols.private_static_fields_symbols.resharper_required_modifiers = static
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = readonly,static
dotnet_naming_symbols.private_static_readonly_symbols.resharper_applicable_kinds = readonly_field
dotnet_naming_symbols.private_static_readonly_symbols.resharper_required_modifiers = static
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:warning
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning
dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:warning
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion
dotnet_style_qualification_for_event = false:suggestion
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_property = false:suggestion
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion

# ReSharper properties
resharper_method_or_operator_body = expression_body

# ReSharper inspection severities
resharper_annotate_can_be_null_parameter_highlighting = warning
resharper_annotate_can_be_null_type_member_highlighting = warning
resharper_annotate_not_null_parameter_highlighting = warning
resharper_annotate_not_null_type_member_highlighting = warning
resharper_arguments_style_anonymous_function_highlighting = warning
resharper_arguments_style_literal_highlighting = warning
resharper_arguments_style_named_expression_highlighting = warning
resharper_arguments_style_other_highlighting = warning
resharper_arguments_style_string_literal_highlighting = warning
resharper_arrange_attributes_highlighting = warning
resharper_arrange_constructor_or_destructor_body_highlighting = warning
resharper_arrange_local_function_body_highlighting = warning
resharper_arrange_method_or_operator_body_highlighting = warning
resharper_arrange_redundant_parentheses_highlighting = hint
resharper_arrange_this_qualifier_highlighting = hint
resharper_arrange_type_member_modifiers_highlighting = hint
resharper_arrange_type_modifiers_highlighting = hint
resharper_async_void_method_highlighting = warning
resharper_bad_attribute_brackets_spaces_highlighting = hint
resharper_bad_braces_spaces_highlighting = hint
resharper_bad_child_statement_indent_highlighting = hint
resharper_bad_colon_spaces_highlighting = hint
resharper_bad_comma_spaces_highlighting = hint
resharper_bad_control_braces_indent_highlighting = hint
resharper_bad_control_braces_line_breaks_highlighting = hint
resharper_bad_declaration_braces_indent_highlighting = hint
resharper_bad_declaration_braces_line_breaks_highlighting = hint
resharper_bad_empty_braces_line_breaks_highlighting = hint
resharper_bad_expression_braces_indent_highlighting = hint
resharper_bad_expression_braces_line_breaks_highlighting = hint
resharper_bad_generic_brackets_spaces_highlighting = hint
resharper_bad_indent_highlighting = hint
resharper_bad_linq_line_breaks_highlighting = hint
resharper_bad_list_line_breaks_highlighting = hint
resharper_bad_member_access_spaces_highlighting = hint
resharper_bad_namespace_braces_indent_highlighting = hint
resharper_bad_parens_line_breaks_highlighting = hint
resharper_bad_parens_spaces_highlighting = hint
resharper_bad_preprocessor_indent_highlighting = hint
resharper_bad_semicolon_spaces_highlighting = hint
resharper_bad_spaces_after_keyword_highlighting = hint
resharper_bad_square_brackets_spaces_highlighting = hint
resharper_bad_switch_braces_indent_highlighting = hint
resharper_bad_symbol_spaces_highlighting = hint
resharper_built_in_type_reference_style_for_member_access_highlighting = hint
resharper_built_in_type_reference_style_highlighting = hint
resharper_class_can_be_sealed_global_highlighting = warning
resharper_class_can_be_sealed_local_highlighting = warning
resharper_compare_non_constrained_generic_with_null_highlighting = warning
resharper_function_complexity_overflow_highlighting = warning
resharper_incorrect_blank_lines_near_braces_highlighting = hint
resharper_lambda_expression_can_be_made_static_highlighting = warning
resharper_localizable_element_highlighting = none
resharper_local_function_can_be_made_static_highlighting = warning
resharper_loop_can_be_partly_converted_to_query_highlighting = warning
resharper_missing_blank_lines_highlighting = hint
resharper_missing_indent_highlighting = hint
resharper_missing_linebreak_highlighting = hint
resharper_missing_space_highlighting = hint
resharper_multiple_spaces_highlighting = hint
resharper_multiple_statements_on_one_line_highlighting = hint
resharper_multiple_type_members_on_one_line_highlighting = hint
resharper_nullable_warning_suppression_is_used_highlighting = warning
resharper_n_unit_attribute_produces_too_many_tests_highlighting = warning
resharper_outdent_is_off_prev_level_highlighting = hint
resharper_redundant_base_qualifier_highlighting = warning
resharper_redundant_blank_lines_highlighting = hint
resharper_redundant_enum_case_label_for_default_section_highlighting = warning
resharper_redundant_linebreak_highlighting = hint
resharper_redundant_space_highlighting = hint
resharper_remove_constructor_invocation_highlighting = warning
resharper_separate_control_transfer_statement_highlighting = warning
resharper_string_ends_with_is_culture_specific_highlighting = warning
resharper_string_starts_with_is_culture_specific_highlighting = warning
resharper_struct_member_can_be_made_read_only_highlighting = warning
resharper_suggest_var_or_type_built_in_types_highlighting = hint
resharper_suggest_var_or_type_elsewhere_highlighting = hint
resharper_suggest_var_or_type_simple_types_highlighting = hint
resharper_switch_expression_handles_some_known_enum_values_with_exception_in_default_highlighting = none
resharper_tabs_and_spaces_mismatch_highlighting = hint
resharper_tabs_are_disallowed_highlighting = warning
resharper_tabs_outside_indent_highlighting = hint
resharper_unknown_property_highlighting = warning
resharper_unnecessary_whitespace_highlighting = warning
resharper_use_configure_await_false_for_async_disposable_highlighting = warning
resharper_use_nameof_expression_for_part_of_the_string_highlighting = warning
resharper_use_positional_deconstruction_pattern_highlighting = warning
resharper_use_throw_if_null_method_highlighting = warning
resharper_wrong_indent_size_highlighting = hint
resharper_wrong_metadata_use_highlighting = warning
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ updates:
target-branch: main
reviewers:
- jas88
- package-ecosystem: "dotnet-sdk"
directory: "/"
schedule:
interval: weekly
2 changes: 2 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
jobs:
build:

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
services:
oracle:
image: konnecteam/docker-oracle-12c:sequelize
Expand All @@ -37,12 +37,10 @@ jobs:
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
- name: Install Sql Server
run: |
wget -qO- https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/20.04/mssql-server-2019.list)"
sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/22.04/mssql-server-2022.list)"
sudo apt-get install -y --no-install-recommends postgresql mssql-tools mssql-server
sudo -E /opt/mssql/bin/mssql-conf -n setup accept-eula
- name: MySQL
Expand Down
5 changes: 3 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>preview</LangVersion>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>
3 changes: 1 addition & 2 deletions FAnsiSql/FAnsi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<description>FAnsiSql is a database management/ETL library that allows you to perform common SQL operations without having to know which Database Management System (DBMS) you are targetting (e.g. Sql Server, My Sql, Oracle).</description>
<PackageTags>Ansi,SQL</PackageTags>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>HIC.FAnsiSql</AssemblyTitle>
<Company>Health Informatics Centre, University of Dundee</Company>
<Product>HIC.FAnsiSql</Product>
<Description>FAnsiSql is a database management/ETL library that allows you to perform common SQL operations without having to know which Database Management System (DBMS) you are targetting (e.g. Sql Server, My Sql, Oracle).</Description>
<Copyright>Copyright © 2019-2024</Copyright>
<Copyright>Copyright © 2019-2025</Copyright>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsAotCompatible>true</IsAotCompatible>
Expand Down
Loading

0 comments on commit c6e054c

Please sign in to comment.