Skip to content

Commit

Permalink
Merge branch 'release/3.802.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
vc-ci committed Feb 22, 2024
2 parents f9516f4 + 001d01d commit 2966460
Show file tree
Hide file tree
Showing 12 changed files with 325 additions and 118 deletions.
169 changes: 169 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = crlf
trim_trailing_whitespace = true
insert_final_newline = true

# Project files
[*.{csproj,props}]
insert_final_newline = false

# HTML files
[*.{html,htm}]
insert_final_newline = false

# Code
[*.{cs,js,ts,ps1,sh,bat,cmd}]
indent_size = 4

# Dotnet code style settings
[*.{cs,vb}]

# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = true

# Avoid "this." and "Me." if not 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

# Use language keywords instead of framework type names for type references
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

# Use explicit accessibility modifiers
dotnet_style_require_accessibility_modifiers = true:suggestion

# Suggest more modern language features when available
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_prefer_inferred_tuple_names = true:suggestion
dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion

# CSharp code style settings
[*.cs]

# Prefer curly braces even for one line of code
csharp_prefer_braces = true:suggestion

# Prefer "var" everywhere
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
csharp_style_var_elsewhere = true:suggestion

# Prefer method-like constructs to have a block body
csharp_style_expression_bodied_methods = false:none
csharp_style_expression_bodied_constructors = false:none
csharp_style_expression_bodied_operators = false:none

# Prefer property-like constructs to have an expression-body
csharp_style_expression_bodied_properties = true:none
csharp_style_expression_bodied_indexers = true:none
csharp_style_expression_bodied_accessors = true:none

# Suggest more modern language features when available
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
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_style_pattern_local_over_anonymous_function = true:suggestion

# Newline settings
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

csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = flush_left

csharp_space_after_cast = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_parentheses = false

csharp_preserve_single_line_statements = false
csharp_preserve_single_line_blocks = true
csharp_using_directive_placement = outside_namespace:silent
csharp_prefer_simple_using_statement = true:suggestion
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_expression_bodied_lambdas = true:silent
csharp_style_expression_bodied_local_functions = false:silent

[*.{cs,vb}]
#### Naming styles ####

# Naming rules

dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i

dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case

dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case

# Symbol specifications

dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.interface.required_modifiers =

dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.types.required_modifiers =

dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.non_field_members.required_modifiers =

# Naming styles

dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case
dotnet_style_operator_placement_when_wrapping = beginning_of_line
tab_width = 4
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
dotnet_style_prefer_auto_properties = true:silent
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_compound_assignment = true:suggestion
dotnet_style_prefer_simplified_interpolation = true:suggestion
dotnet_style_namespace_match_folder = true:suggestion
19 changes: 10 additions & 9 deletions .github/workflows/module-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# v3.800.0
# v3.800.2
# https://virtocommerce.atlassian.net/browse/VCST-349
name: Module CI

on:
Expand Down Expand Up @@ -56,13 +57,13 @@ jobs:

steps:

- name: Set up Node 18
uses: actions/setup-node@v3
- name: Set up Node 20
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'

- name: Set up Java 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand All @@ -72,7 +73,7 @@ jobs:
run: |
echo "RELEASE_STATUS=true" >> $GITHUB_ENV
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -127,7 +128,7 @@ jobs:
run: vc-build Compress -skip Clean+Restore+Compile+Test

- name: Publish Nuget
if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }}
if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'workflow_dispatch' }}
uses: VirtoCommerce/vc-github-actions/publish-nuget@master

- name: Publish to Blob
Expand Down Expand Up @@ -240,7 +241,7 @@ jobs:
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
(github.event_name == 'workflow_dispatch')}}
needs: 'ci'
uses: VirtoCommerce/.github/.github/workflows/[email protected].0
uses: VirtoCommerce/.github/.github/workflows/[email protected].2
with:
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
katalonRepoBranch: 'dev'
Expand All @@ -260,7 +261,7 @@ jobs:
(github.ref == 'refs/heads/dev')) &&
github.event_name == 'push' }}
needs: ci
uses: VirtoCommerce/.github/.github/workflows/[email protected].0
uses: VirtoCommerce/.github/.github/workflows/[email protected].2
with:
releaseSource: module
moduleId: ${{ needs.ci.outputs.moduleId }}
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/module-release-hotfix.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# v3.800.0
# v3.800.2
# https://virtocommerce.atlassian.net/browse/VCST-349
name: Release hotfix

on:
Expand All @@ -12,12 +13,12 @@ on:

jobs:
test:
uses: VirtoCommerce/.github/.github/workflows/[email protected].0
uses: VirtoCommerce/.github/.github/workflows/[email protected].2
secrets:
sonarToken: ${{ secrets.SONAR_TOKEN }}

build:
uses: VirtoCommerce/.github/.github/workflows/[email protected].0
uses: VirtoCommerce/.github/.github/workflows/[email protected].2
with:
uploadPackage: 'true'
uploadDocker: 'false'
Expand All @@ -34,7 +35,7 @@ jobs:
changelog: ${{ steps.changelog.outputs.changelog }}
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -45,7 +46,7 @@ jobs:
publish-github-release:
needs:
[build, test, get-metadata]
uses: VirtoCommerce/.github/.github/workflows/[email protected].0
uses: VirtoCommerce/.github/.github/workflows/[email protected].2
with:
fullKey: ${{ needs.build.outputs.packageFullKey }}
changeLog: '${{ needs.get-metadata.outputs.changeLog }}'
Expand All @@ -62,7 +63,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install VirtoCommerce.GlobalTool
uses: VirtoCommerce/vc-github-actions/setup-vcbuild@master
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/publish-nugets.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# v3.800.0
# v3.800.2
# https://virtocommerce.atlassian.net/browse/VCST-349
name: Publish nuget

on:
Expand All @@ -12,12 +13,12 @@ on:

jobs:
test:
uses: VirtoCommerce/.github/.github/workflows/[email protected].0
uses: VirtoCommerce/.github/.github/workflows/[email protected].2
secrets:
sonarToken: ${{ secrets.SONAR_TOKEN }}

build:
uses: VirtoCommerce/.github/.github/workflows/[email protected].0
uses: VirtoCommerce/.github/.github/workflows/[email protected].2
with:
uploadPackage: 'true'
uploadDocker: 'false'
Expand All @@ -28,7 +29,7 @@ jobs:
publish-nuget:
needs:
[build, test]
uses: VirtoCommerce/.github/.github/workflows/[email protected].0
uses: VirtoCommerce/.github/.github/workflows/[email protected].2
with:
fullKey: ${{ needs.build.outputs.packageFullKey }}
forceGithub: false
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# v3.800.0
# v3.800.2
# https://virtocommerce.atlassian.net/browse/VCST-349
name: Release

on:
workflow_dispatch:

jobs:
release:
uses: VirtoCommerce/.github/.github/workflows/[email protected].0
uses: VirtoCommerce/.github/.github/workflows/[email protected].2
secrets:
envPAT: ${{ secrets.REPO_TOKEN }}
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<!-- These properties will be shared for all projects -->
<PropertyGroup>
<VersionPrefix>3.801.0</VersionPrefix>
<VersionPrefix>3.802.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup>
Expand Down
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ Azure Blob Storage Assets module provide integration with [Azure Blob Storage](h
"Provider": "AzureBlobStorage",
"AzureBlobStorage": {
"ConnectionString": "",
"CdnUrl": ""
"CdnUrl": "",
"AllowBlobPublicAccess": true
}
}
```
3. Modify the following settings:
- Set the **Provider** value to **AzureBlobStorage**
- Provide **ConnectionString** in case you are going to use the **AzureBlobStorage** implementation option
- Set the **Provider** value to **AzureBlobStorage**.
- Provide **ConnectionString** in case you are going to use the **AzureBlobStorage** implementation option.
- Set up "CdnUrl": "" if you want to configured CDN before Azure Blob Storage. By default, empty. Ex: `https://cdn.somecloud.com`.
- Set up **AllowBlobPublicAccess** to `false`, if create private container by default. By default, `true`.

## Documentation
* [Assets Module Documentation](https://virtocommerce.com/docs/latest/modules/assets/)
Expand Down
Loading

0 comments on commit 2966460

Please sign in to comment.