Skip to content

Commit 9ff393e

Browse files
traf72traf72
committed
Migrate the test and sample projects to the latest version of C#
1 parent ab190d3 commit 9ff393e

File tree

110 files changed

+15110
-14659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+15110
-14659
lines changed

‎ExcelReportGenerator.Samples/ConnectionFactory.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
using System.Data;
33
using System.Data.SqlClient;
44

5-
namespace ExcelReportGenerator.Samples
5+
namespace ExcelReportGenerator.Samples;
6+
7+
public static class ConnectionFactory
68
{
7-
public static class ConnectionFactory
9+
public static IDbConnection Create()
810
{
9-
public static IDbConnection Create()
10-
{
11-
var connection = new SqlConnection(ConfigurationManager.ConnectionStrings["AdventureWorks"].ConnectionString);
12-
connection.Open();
13-
return connection;
14-
}
11+
var connection = new SqlConnection(ConfigurationManager.ConnectionStrings["AdventureWorks"].ConnectionString);
12+
connection.Open();
13+
return connection;
1514
}
1615
}

‎ExcelReportGenerator.Samples/Customizations/CustomInstanceProvider.cs‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
using System;
2-
using ExcelReportGenerator.Rendering.Providers;
1+
using ExcelReportGenerator.Rendering.Providers;
32

4-
namespace ExcelReportGenerator.Samples.Customizations
3+
namespace ExcelReportGenerator.Samples.Customizations;
4+
5+
public class CustomInstanceProvider : DefaultInstanceProvider
56
{
6-
public class CustomInstanceProvider : DefaultInstanceProvider
7-
{
8-
private readonly object _defaultInstance;
7+
private readonly object _defaultInstance;
98

10-
public CustomInstanceProvider(object defaultInstance = null) : base(defaultInstance)
11-
{
12-
_defaultInstance = defaultInstance;
13-
}
9+
public CustomInstanceProvider(object defaultInstance = null) : base(defaultInstance)
10+
{
11+
_defaultInstance = defaultInstance;
12+
}
1413

15-
public override object GetInstance(Type type)
16-
{
17-
return type == null ? _defaultInstance : Ioc.Container.GetInstance(type);
18-
}
14+
public override object GetInstance(Type type)
15+
{
16+
return type == null ? _defaultInstance : Ioc.Container.GetInstance(type);
17+
}
1918

20-
public override T GetInstance<T>()
21-
{
22-
return (T)GetInstance(typeof(T));
23-
}
19+
public override T GetInstance<T>()
20+
{
21+
return (T)GetInstance(typeof(T));
2422
}
2523
}

‎ExcelReportGenerator.Samples/Customizations/CustomReportGenerator.cs‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,44 @@
1-
using System;
2-
using ExcelReportGenerator.Rendering;
1+
using ExcelReportGenerator.Rendering;
32
using ExcelReportGenerator.Rendering.Providers;
43
using ExcelReportGenerator.Rendering.Providers.VariableProviders;
54
using ExcelReportGenerator.Rendering.TemplateProcessors;
65

7-
namespace ExcelReportGenerator.Samples.Customizations
6+
namespace ExcelReportGenerator.Samples.Customizations;
7+
8+
public class CustomReportGenerator : DefaultReportGenerator
89
{
9-
public class CustomReportGenerator : DefaultReportGenerator
10-
{
11-
private IInstanceProvider _instanceProvider;
12-
private PanelParsingSettings _panelParsingSettings;
13-
private ITemplateProcessor _templateProcessor;
10+
private IInstanceProvider _instanceProvider;
11+
private PanelParsingSettings _panelParsingSettings;
12+
private ITemplateProcessor _templateProcessor;
1413

15-
public CustomReportGenerator(object report) : base(report)
16-
{
17-
}
14+
public CustomReportGenerator(object report) : base(report)
15+
{
16+
}
1817

19-
public override Type SystemFunctionsType => typeof(CustomSystemFunctions);
18+
public override Type SystemFunctionsType => typeof(CustomSystemFunctions);
2019

21-
public override SystemVariableProvider SystemVariableProvider => new CustomSystemVariableProvider();
20+
public override SystemVariableProvider SystemVariableProvider => new CustomSystemVariableProvider();
2221

23-
public override IInstanceProvider InstanceProvider => _instanceProvider ??= new CustomInstanceProvider(Report);
22+
public override IInstanceProvider InstanceProvider => _instanceProvider ??= new CustomInstanceProvider(Report);
2423

25-
public override ITemplateProcessor TemplateProcessor => _templateProcessor ??=
26-
new CustomTemplateProcessor(PropertyValueProvider, SystemVariableProvider, MethodCallValueProvider,
27-
DataItemValueProvider);
24+
public override ITemplateProcessor TemplateProcessor => _templateProcessor ??=
25+
new CustomTemplateProcessor(PropertyValueProvider, SystemVariableProvider, MethodCallValueProvider,
26+
DataItemValueProvider);
2827

29-
public override PanelParsingSettings PanelParsingSettings
28+
public override PanelParsingSettings PanelParsingSettings
29+
{
30+
get
3031
{
31-
get
32+
return _panelParsingSettings ??= new PanelParsingSettings
3233
{
33-
return _panelParsingSettings ??= new PanelParsingSettings
34-
{
35-
PanelPrefixSeparator = "_",
36-
SimplePanelPrefix = "simple",
37-
DataSourcePanelPrefix = "data",
38-
DynamicDataSourcePanelPrefix = "dynamic",
39-
TotalsPanelPrefix = "total",
40-
PanelPropertiesSeparators = new[] {","},
41-
PanelPropertyNameValueSeparator = "="
42-
};
43-
}
34+
PanelPrefixSeparator = "_",
35+
SimplePanelPrefix = "simple",
36+
DataSourcePanelPrefix = "data",
37+
DynamicDataSourcePanelPrefix = "dynamic",
38+
TotalsPanelPrefix = "total",
39+
PanelPropertiesSeparators = new[] {","},
40+
PanelPropertyNameValueSeparator = "="
41+
};
4442
}
4543
}
4644
}

‎ExcelReportGenerator.Samples/Customizations/CustomSystemFunctions.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
using ExcelReportGenerator.Rendering;
22

3-
namespace ExcelReportGenerator.Samples.Customizations
3+
namespace ExcelReportGenerator.Samples.Customizations;
4+
5+
public class CustomSystemFunctions : SystemFunctions
46
{
5-
public class CustomSystemFunctions : SystemFunctions
6-
{
7-
public static string ConvertGender(string gender) => gender == "M" ? "Male" : "Female";
8-
}
7+
public static string ConvertGender(string gender) => gender == "M" ? "Male" : "Female";
98
}

‎ExcelReportGenerator.Samples/Customizations/CustomSystemVariableProvider.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using ExcelReportGenerator.Rendering.Providers.VariableProviders;
2-
using System;
32

4-
namespace ExcelReportGenerator.Samples.Customizations
3+
namespace ExcelReportGenerator.Samples.Customizations;
4+
5+
public class CustomSystemVariableProvider : SystemVariableProvider
56
{
6-
public class CustomSystemVariableProvider : SystemVariableProvider
7-
{
8-
public string ReportTime => DateTime.Now.ToString("g");
9-
}
7+
public string ReportTime => DateTime.Now.ToString("g");
108
}

‎ExcelReportGenerator.Samples/Customizations/CustomTemplateProcessor.cs‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,33 @@
44
using ExcelReportGenerator.Rendering.Providers.VariableProviders;
55
using ExcelReportGenerator.Rendering.TemplateProcessors;
66

7-
namespace ExcelReportGenerator.Samples.Customizations
7+
namespace ExcelReportGenerator.Samples.Customizations;
8+
9+
public class CustomTemplateProcessor : DefaultTemplateProcessor
810
{
9-
public class CustomTemplateProcessor : DefaultTemplateProcessor
11+
public CustomTemplateProcessor(IPropertyValueProvider propertyValueProvider, SystemVariableProvider systemVariableProvider, IMethodCallValueProvider methodCallValueProvider = null, IGenericDataItemValueProvider<HierarchicalDataItem> dataItemValueProvider = null) : base(propertyValueProvider, systemVariableProvider, methodCallValueProvider, dataItemValueProvider)
1012
{
11-
public CustomTemplateProcessor(IPropertyValueProvider propertyValueProvider, SystemVariableProvider systemVariableProvider, IMethodCallValueProvider methodCallValueProvider = null, IGenericDataItemValueProvider<HierarchicalDataItem> dataItemValueProvider = null) : base(propertyValueProvider, systemVariableProvider, methodCallValueProvider, dataItemValueProvider)
12-
{
13-
}
13+
}
1414

15-
public override string LeftTemplateBorder => "<";
15+
public override string LeftTemplateBorder => "<";
1616

17-
public override string RightTemplateBorder => ">";
17+
public override string RightTemplateBorder => ">";
1818

19-
public override string MemberLabelSeparator => "-";
19+
public override string MemberLabelSeparator => "-";
2020

21-
public override string PropertyMemberLabel => "prop";
21+
public override string PropertyMemberLabel => "prop";
2222

23-
public override string MethodCallMemberLabel => "meth";
23+
public override string MethodCallMemberLabel => "meth";
2424

25-
public override string DataItemMemberLabel => "dataitem";
25+
public override string DataItemMemberLabel => "dataitem";
2626

27-
public override string SystemVariableMemberLabel => "var";
27+
public override string SystemVariableMemberLabel => "var";
2828

29-
public override string SystemFunctionMemberLabel => "func";
29+
public override string SystemFunctionMemberLabel => "func";
3030

31-
public override string DataItemSelfTemplate => "self";
31+
public override string DataItemSelfTemplate => "self";
3232

33-
public override string HorizontalPageBreakLabel => "hbreak";
33+
public override string HorizontalPageBreakLabel => "hbreak";
3434

35-
public override string VerticalPageBreakLabel => "vbreak";
36-
}
35+
public override string VerticalPageBreakLabel => "vbreak";
3736
}

0 commit comments

Comments
 (0)