Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: dotnet targets #3791

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6864fe0
chore: add edition settings
Seddryck Nov 12, 2023
de79628
build: move build settings to props and targets
Seddryck Nov 12, 2023
b9d82c3
refactor: improve function descriptions and exception messages
Seddryck Nov 12, 2023
bc12ed9
fix: update name of the native dll to import
Seddryck Nov 12, 2023
2f85dc0
refactor: make PrqlCompilerOptions immutable
Seddryck Nov 12, 2023
eca84f5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 12, 2023
a2c124d
Merge branch 'PRQL:main' into dotnet-targets
Seddryck Nov 12, 2023
891c704
Merge branch 'main' into dotnet-targets
max-sixty Nov 17, 2023
800f541
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 17, 2023
ae0aa9f
ci: github-action for building, testing and packaging in .NET
Seddryck Nov 19, 2023
235951e
fix: explicitely run the script setting the version
Seddryck Nov 19, 2023
bada233
fix: syntax issue
Seddryck Nov 19, 2023
fe70d3a
fix: cargo invocation
Seddryck Nov 19, 2023
e67b2c7
fix: new attempt
Seddryck Nov 19, 2023
ab70454
fix: finally understood that default shell is powershell :-/
Seddryck Nov 19, 2023
4357236
style: switch to file-scoped namespace
Seddryck Nov 19, 2023
3765846
fix: no clue
Seddryck Nov 19, 2023
0343340
fix: change jq
Seddryck Nov 19, 2023
c7c6d4f
fix: add reference to GitHubActionsTestLogger
Seddryck Nov 19, 2023
d60c635
fix: package command for CMD shell
Seddryck Nov 19, 2023
edb5735
style: fix trailing spaces reported by linter
Seddryck Nov 19, 2023
003c1cd
fix: attemp to make package downloadable to check it
Seddryck Nov 19, 2023
7bca705
style: prettier test-dotnet.yaml
Seddryck Nov 19, 2023
1092829
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 19, 2023
18c0bb4
Merge branch 'main' into dotnet-targets
Seddryck Nov 19, 2023
d767684
refactor: try to use the bash script
Seddryck Nov 19, 2023
b30c3ee
Merge branch 'dotnet-targets' of https://github.com/Seddryck/prql int…
Seddryck Nov 19, 2023
1bb0ca4
style: switch end of line to lf to match with .gitignore
Seddryck Nov 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 44 additions & 10 deletions .github/workflows/test-dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,54 @@ on:

jobs:
test:
runs-on: ubuntu-latest
runs-on: windows-latest
steps:
- name: 📂 Checkout code
uses: actions/checkout@v4
- name: 🏗 Build prqlc-clib
run: cargo build --package prqlc-clib
run: cargo build --package prqlc-clib --release
- name: 🔢 Set version
shell: bash
run: ./.github/workflows/scripts/set_version.sh
- name: 🐜 Debug CI/CD (version + target/release)
shell: pwsh
run: |
Write-Host "Version: $env:version"
Get-ChildItem ./target/release/
- name: 🔧 Setup dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7
- name: 🧪 Build and test
working-directory: prqlc/bindings
run: |
dotnet build dotnet
cp ../../target/debug/libprqlc_lib.* dotnet/PrqlCompiler/bin/Debug/net*/
cp ../../target/debug/libprqlc_lib.* dotnet/PrqlCompiler.Tests/bin/Debug/net*/
dotnet test dotnet
dotnet-version: |
6
7
- name: 🛠️ Build
working-directory: prqlc/bindings/dotnet
shell: cmd
run:
dotnet build prql-net.sln -p:version="%version%" -c Release
/p:ContinuousIntegrationBuild=true --nologo
- name: 🧪 Test
working-directory: prqlc/bindings/dotnet
shell: cmd
run:
dotnet test PrqlCompiler.tests\PrqlCompiler.Tests.csproj -c release
--runtime win-x64 --logger GitHubActions /p:CI=true --nologo
- name: 📦 Package
working-directory: prqlc/bindings/dotnet
shell: cmd
run:
dotnet pack PrqlCompiler -p:version="%version%" -c Release
--include-symbols /p:CI=true --no-build --nologo
- name: 🍱 Archive artifacts
uses: actions/upload-artifact@v3
with:
name: nuget-packages
path: |
prqlc/bindings/dotnet/PrqlCompiler/bin/Release/*.nupkg
prqlc/bindings/dotnet/PrqlCompiler/bin/Release/*.snupkg
# - name: 🚚 Publish
# working-directory: prqlc/bindings/dotnet
# run: |
# dotnet nuget push PrqlCompiler/bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
# env:
# NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
175 changes: 175 additions & 0 deletions prqlc/bindings/dotnet/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

root = true

# Default settings:
# A newline ending every file
# Use 4 spaces as indentation
[*]
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
dotnet_style_operator_placement_when_wrapping = beginning_of_line
tab_width = 4
end_of_line = crlf
eitsupi marked this conversation as resolved.
Show resolved Hide resolved

# 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_case_contents_when_block = true
csharp_indent_switch_labels = true
csharp_indent_labels = one_less_than_current

# Modifier preferences
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion

# 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

# Types: use keywords instead of BCL types, and permit var only when the type is clear
csharp_style_var_for_built_in_types = true:none
csharp_style_var_when_type_is_apparent = true:suggestion
csharp_style_var_elsewhere = true:suggestion
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 s_ prefix
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 = none
dotnet_naming_symbols.static_fields.required_modifiers = static
dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
dotnet_naming_style.static_prefix_style.required_prefix = s_
dotnet_naming_style.static_prefix_style.capitalization = camel_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_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_style.capitalization = camel_case

# Code style defaults
csharp_using_directive_placement = outside_namespace:suggestion
dotnet_sort_system_directives_first = true
csharp_prefer_braces = true:silent
csharp_preserve_single_line_blocks = true:none
csharp_preserve_single_line_statements = false:none
csharp_prefer_static_local_function = true:suggestion
csharp_prefer_simple_using_statement = false:none
csharp_style_prefer_switch_expression = true:suggestion

# Code quality
dotnet_style_readonly_field = true:suggestion
dotnet_code_quality_unused_parameters = non_public:suggestion

# 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
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_auto_properties = true:suggestion
dotnet_style_prefer_conditional_expression_over_assignment = true:refactoring
dotnet_style_prefer_conditional_expression_over_return = true:refactoring
csharp_prefer_simple_default_expression = true:suggestion

# Expression-bodied members
csharp_style_expression_bodied_methods = true:silent
csharp_style_expression_bodied_constructors = true:silent
csharp_style_expression_bodied_operators = true:silent
csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
csharp_style_expression_bodied_lambdas = true:refactoring
csharp_style_expression_bodied_local_functions = true:refactoring

# 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

# Other features
csharp_style_prefer_index_operator = false:none
csharp_style_prefer_range_operator = false:none
csharp_style_pattern_local_over_anonymous_function = false:none

# 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
csharp_style_namespace_declarations = block_scoped:silent
csharp_style_prefer_method_group_conversion = true:silent
csharp_style_prefer_top_level_statements = true:silent
csharp_style_prefer_primary_constructors = false:suggestion

# Xml project files
[*.{csproj,props,targets}]
indent_size = 2
charset = utf-8
Loading
Loading