Skip to content

Commit 050dd3b

Browse files
committed
fix package build settings
1 parent c5cd62a commit 050dd3b

File tree

4 files changed

+43
-20
lines changed

4 files changed

+43
-20
lines changed

.editorconfig

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ csharp_style_var_for_built_in_types = false
8282
csharp_style_var_when_type_is_apparent = false
8383

8484
# Expression-bodied members
85-
csharp_style_expression_bodied_accessors = true
86-
csharp_style_expression_bodied_constructors = false
87-
csharp_style_expression_bodied_indexers = true
88-
csharp_style_expression_bodied_lambdas = true
89-
csharp_style_expression_bodied_local_functions = false
90-
csharp_style_expression_bodied_methods = false
91-
csharp_style_expression_bodied_operators = false
92-
csharp_style_expression_bodied_properties = true
85+
csharp_style_expression_bodied_accessors = true:silent
86+
csharp_style_expression_bodied_constructors = false:silent
87+
csharp_style_expression_bodied_indexers = true:silent
88+
csharp_style_expression_bodied_lambdas = true:silent
89+
csharp_style_expression_bodied_local_functions = false:silent
90+
csharp_style_expression_bodied_methods = false:silent
91+
csharp_style_expression_bodied_operators = false:silent
92+
csharp_style_expression_bodied_properties = true:silent
9393

9494
# Pattern matching preferences
9595
csharp_style_pattern_matching_over_as_with_null_check = true
@@ -110,12 +110,12 @@ csharp_style_prefer_readonly_struct = true
110110
csharp_style_prefer_readonly_struct_member = true
111111

112112
# Code-block preferences
113-
csharp_prefer_braces = true
114-
csharp_prefer_simple_using_statement = true
115-
csharp_style_namespace_declarations = block_scoped
116-
csharp_style_prefer_method_group_conversion = true
117-
csharp_style_prefer_primary_constructors = true
118-
csharp_style_prefer_top_level_statements = true
113+
csharp_prefer_braces = true:silent
114+
csharp_prefer_simple_using_statement = true:suggestion
115+
csharp_style_namespace_declarations = block_scoped:silent
116+
csharp_style_prefer_method_group_conversion = true:silent
117+
csharp_style_prefer_primary_constructors = true:suggestion
118+
csharp_style_prefer_top_level_statements = true:silent
119119

120120
# Expression-level preferences
121121
csharp_prefer_simple_default_expression = true
@@ -133,7 +133,7 @@ csharp_style_unused_value_assignment_preference = discard_variable
133133
csharp_style_unused_value_expression_statement_preference = discard_variable
134134

135135
# 'using' directive preferences
136-
csharp_using_directive_placement = outside_namespace
136+
csharp_using_directive_placement = outside_namespace:silent
137137

138138
# New line preferences
139139
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
@@ -230,3 +230,21 @@ dotnet_naming_style.begins_with_i.required_prefix = I
230230
dotnet_naming_style.begins_with_i.required_suffix =
231231
dotnet_naming_style.begins_with_i.word_separator =
232232
dotnet_naming_style.begins_with_i.capitalization = pascal_case
233+
234+
[*.{cs,vb}]
235+
dotnet_style_coalesce_expression = true:suggestion
236+
dotnet_style_null_propagation = true:suggestion
237+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
238+
dotnet_style_prefer_auto_properties = true:silent
239+
dotnet_style_object_initializer = true:suggestion
240+
dotnet_style_collection_initializer = true:suggestion
241+
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
242+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
243+
dotnet_style_prefer_conditional_expression_over_return = true:silent
244+
dotnet_style_explicit_tuple_names = true:suggestion
245+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
246+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
247+
tab_width = 2
248+
indent_size = 2
249+
end_of_line = crlf
250+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion

DemoWPF/DemoWPF.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<UseApplicationTrust>false</UseApplicationTrust>
2121
<BootstrapperEnabled>true</BootstrapperEnabled>
2222
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
23-
<UseWPF>true</UseWPF>
23+
<UseWPF>True</UseWPF>
2424
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
2525
<Configurations>Debug;Release</Configurations>
2626
</PropertyGroup>

ReoGrid/ReoGridWPF.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,20 @@
3434
<PackageIcon>icon.png</PackageIcon>
3535
<RepositoryUrl>https://github.com/unvell/ReoGrid/</RepositoryUrl>
3636
<RepositoryType>git</RepositoryType>
37-
<VersionPrefix>3.0.0</VersionPrefix>
37+
<VersionPrefix>3.2.0</VersionPrefix>
3838
<VersionSuffix></VersionSuffix>
3939
<PackageId>unvell.ReoGridWPF.dll</PackageId>
4040
<Description>Powerful and lightweight open source .NET spreadsheet component. Compatible with Excel 2007 format or later. Simple APIs to open/edit/save/print an Excel spreadsheet in the .NET application.</Description>
4141
<SignAssembly>true</SignAssembly>
4242
<ApplicationIcon>favicon.ico</ApplicationIcon>
43-
<Copyright>2012-2021 (c) Jingwood, unvell, all rights reserved.</Copyright>
43+
<Copyright>2012-2025 (c) Jingwood, unvell, all rights reserved.</Copyright>
4444
<PackageTags>spreadsheet excel drawing grid workbook worksheet chart data formula script macro outline print</PackageTags>
4545
<PackageReleaseNotes>https://github.com/unvell/ReoGrid/releases/tag/v3.0.0</PackageReleaseNotes>
46+
<PackageReadmeFile>README.md</PackageReadmeFile>
4647
</PropertyGroup>
4748

4849
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WPFDebug|AnyCPU'">
50+
<DefineConstants>TRACE;DEBUG;WPF;VP_DEBUG_OFF;ALWAYS_CELL_CLIP;FORMULA;LANG_JP;OUTLINE;DRAWING;COMMENT;PRINT;RICHTEXT;</DefineConstants>
4951
<LangVersion>default</LangVersion>
5052
</PropertyGroup>
5153
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WPFRelease|AnyCPU'">
@@ -80,6 +82,7 @@
8082
<Page Remove="iOS\**" />
8183
<Page Remove="Test\**" />
8284
<Page Remove="WinForm\**" />
85+
<None Include="..\README.md" Pack="true" PackagePath="\" />
8386
</ItemGroup>
8487
<ItemGroup>
8588
<Reference Update="System.Core">

ReoGridWPF.sln

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.31129.286
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.11.35208.52
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8A70DFD7-B3E4-4E79-A6DD-99DC39A80D22}"
77
ProjectSection(SolutionItems) = preProject
8+
.editorconfig = .editorconfig
89
Samples\background_color_patterns.rgf = Samples\background_color_patterns.rgf
910
Samples\border_styles.rgf = Samples\border_styles.rgf
1011
Samples\calendar_2008_1.rgf = Samples\calendar_2008_1.rgf
@@ -19,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1920
Samples\outline.rgf = Samples\outline.rgf
2021
Samples\printable_report.rgf = Samples\printable_report.rgf
2122
Samples\project_cost_summary.rgf = Samples\project_cost_summary.rgf
23+
README.md = README.md
2224
README.txt = README.txt
2325
EndProjectSection
2426
EndProject

0 commit comments

Comments
 (0)