Skip to content

Commit d026187

Browse files
traf72traf72
committed
Migrate Sample project to .NET Core
1 parent 0891696 commit d026187

25 files changed

+113
-641
lines changed

‎ExcelReportGenerator.Samples/App.config‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@
33
<connectionStrings>
44
<add name="AdventureWorks" connectionString="Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=AdventureWorks;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False" />
55
</connectionStrings>
6-
7-
<startup>
8-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
9-
</startup>
106
</configuration>

‎ExcelReportGenerator.Samples/Customizations/CustomReportGenerator.cs‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using ExcelReportGenerator.Rendering;
1+
using System;
2+
using ExcelReportGenerator.Rendering;
23
using ExcelReportGenerator.Rendering.Providers;
34
using ExcelReportGenerator.Rendering.Providers.VariableProviders;
45
using ExcelReportGenerator.Rendering.TemplateProcessors;
5-
using System;
66

77
namespace ExcelReportGenerator.Samples.Customizations
88
{
@@ -16,43 +16,30 @@ public CustomReportGenerator(object report) : base(report)
1616
{
1717
}
1818

19-
public override Type SystemFunctionsType
20-
{
21-
get { return typeof(CustomSystemFunctions); }
22-
}
19+
public override Type SystemFunctionsType => typeof(CustomSystemFunctions);
2320

24-
public override SystemVariableProvider SystemVariableProvider
25-
{
26-
get { return new CustomSystemVariableProvider(); }
27-
}
21+
public override SystemVariableProvider SystemVariableProvider => new CustomSystemVariableProvider();
2822

29-
public override IInstanceProvider InstanceProvider
30-
{
31-
get { return _instanceProvider ?? (_instanceProvider = new CustomInstanceProvider(Report)); }
32-
}
23+
public override IInstanceProvider InstanceProvider => _instanceProvider ??= new CustomInstanceProvider(Report);
3324

34-
public override ITemplateProcessor TemplateProcessor
35-
{
36-
get
37-
{
38-
return _templateProcessor ?? (_templateProcessor = new CustomTemplateProcessor(PropertyValueProvider, SystemVariableProvider, MethodCallValueProvider, DataItemValueProvider));
39-
}
40-
}
25+
public override ITemplateProcessor TemplateProcessor => _templateProcessor ??=
26+
new CustomTemplateProcessor(PropertyValueProvider, SystemVariableProvider, MethodCallValueProvider,
27+
DataItemValueProvider);
4128

4229
public override PanelParsingSettings PanelParsingSettings
4330
{
4431
get
4532
{
46-
return _panelParsingSettings ?? (_panelParsingSettings = new PanelParsingSettings
33+
return _panelParsingSettings ??= new PanelParsingSettings
4734
{
4835
PanelPrefixSeparator = "_",
4936
SimplePanelPrefix = "simple",
5037
DataSourcePanelPrefix = "data",
5138
DynamicDataSourcePanelPrefix = "dynamic",
5239
TotalsPanelPrefix = "total",
53-
PanelPropertiesSeparators = new[] { "," },
54-
PanelPropertyNameValueSeparator = "=",
55-
});
40+
PanelPropertiesSeparators = new[] {","},
41+
PanelPropertyNameValueSeparator = "="
42+
};
5643
}
5744
}
5845
}

‎ExcelReportGenerator.Samples/Customizations/CustomSystemFunctions.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ namespace ExcelReportGenerator.Samples.Customizations
44
{
55
public class CustomSystemFunctions : SystemFunctions
66
{
7-
public static string ConvertGender(string gender)
8-
{
9-
return gender == "M" ? "Male" : "Female";
10-
}
7+
public static string ConvertGender(string gender) => gender == "M" ? "Male" : "Female";
118
}
129
}

‎ExcelReportGenerator.Samples/Customizations/CustomSystemVariableProvider.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ namespace ExcelReportGenerator.Samples.Customizations
55
{
66
public class CustomSystemVariableProvider : SystemVariableProvider
77
{
8-
public string ReportTime
9-
{
10-
get { return DateTime.Now.ToString("g"); }
11-
}
8+
public string ReportTime => DateTime.Now.ToString("g");
129
}
1310
}

‎ExcelReportGenerator.Samples/Customizations/CustomTemplateProcessor.cs‎

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,26 @@ public CustomTemplateProcessor(IPropertyValueProvider propertyValueProvider, Sys
1212
{
1313
}
1414

15-
public override string LeftTemplateBorder
16-
{
17-
get { return "<"; }
18-
}
15+
public override string LeftTemplateBorder => "<";
1916

20-
public override string RightTemplateBorder
21-
{
22-
get { return ">"; }
23-
}
17+
public override string RightTemplateBorder => ">";
2418

25-
public override string MemberLabelSeparator
26-
{
27-
get { return "-"; }
28-
}
19+
public override string MemberLabelSeparator => "-";
2920

30-
public override string PropertyMemberLabel
31-
{
32-
get { return "prop"; }
33-
}
21+
public override string PropertyMemberLabel => "prop";
3422

35-
public override string MethodCallMemberLabel
36-
{
37-
get { return "meth"; }
38-
}
23+
public override string MethodCallMemberLabel => "meth";
3924

40-
public override string DataItemMemberLabel
41-
{
42-
get { return "dataitem"; }
43-
}
25+
public override string DataItemMemberLabel => "dataitem";
4426

45-
public override string SystemVariableMemberLabel
46-
{
47-
get { return "var"; }
48-
}
27+
public override string SystemVariableMemberLabel => "var";
4928

50-
public override string SystemFunctionMemberLabel
51-
{
52-
get { return "func"; }
53-
}
29+
public override string SystemFunctionMemberLabel => "func";
5430

55-
public override string DataItemSelfTemplate
56-
{
57-
get { return "self"; }
58-
}
31+
public override string DataItemSelfTemplate => "self";
5932

60-
public override string HorizontalPageBreakLabel
61-
{
62-
get { return "hbreak"; }
63-
}
33+
public override string HorizontalPageBreakLabel => "hbreak";
6434

65-
public override string VerticalPageBreakLabel
66-
{
67-
get { return "vbreak"; }
68-
}
35+
public override string VerticalPageBreakLabel => "vbreak";
6936
}
7037
}

‎ExcelReportGenerator.Samples/DataProvider.cs‎

Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,47 @@
1-
using ExcelReportGenerator.Attributes;
2-
using ExcelReportGenerator.Enums;
3-
using ExcelReportGenerator.Samples.Extensions;
4-
using System;
1+
using System;
52
using System.Collections.Generic;
63
using System.Data;
74
using System.Data.SqlClient;
5+
using ExcelReportGenerator.Attributes;
6+
using ExcelReportGenerator.Enums;
7+
using ExcelReportGenerator.Samples.Extensions;
88

99
namespace ExcelReportGenerator.Samples
1010
{
1111
public class DataProvider
1212
{
1313
public IDataReader GetEmployeesAsIDataReader(string department = null)
1414
{
15-
IDbConnection con = ConnectionFactory.Create();
16-
using (IDbCommand command = con.CreateCommand())
17-
{
18-
command.CommandText = Query;
19-
command.Parameters.Add(new SqlParameter("@department", string.IsNullOrWhiteSpace(department) ? (object)DBNull.Value : department));
20-
return command.ExecuteReader(CommandBehavior.CloseConnection);
21-
}
15+
var con = ConnectionFactory.Create();
16+
using var command = con.CreateCommand();
17+
command.CommandText = Query;
18+
command.Parameters.Add(new SqlParameter("@department", string.IsNullOrWhiteSpace(department) ? (object)DBNull.Value : department));
19+
return command.ExecuteReader(CommandBehavior.CloseConnection);
2220
}
2321

2422
public DataTable GetEmployeesAsDataTable(string department = null)
2523
{
26-
using (IDataReader reader = GetEmployeesAsIDataReader(department))
27-
{
28-
var dataTable = new DataTable();
29-
dataTable.Load(reader);
30-
return dataTable;
31-
}
24+
using var reader = GetEmployeesAsIDataReader(department);
25+
var dataTable = new DataTable();
26+
dataTable.Load(reader);
27+
return dataTable;
3228
}
3329

3430
public DataSet GetEmployeesAsDataSet(string department = null)
3531
{
36-
using (var con = (SqlConnection)ConnectionFactory.Create())
37-
{
38-
using (var command = new SqlCommand(Query, con))
39-
{
40-
command.Parameters.Add(new SqlParameter("@department", string.IsNullOrWhiteSpace(department) ? (object)DBNull.Value : department));
41-
var adapter = new SqlDataAdapter(command);
42-
var dataSet = new DataSet();
43-
adapter.Fill(dataSet);
44-
return dataSet;
45-
}
46-
}
32+
using var con = (SqlConnection)ConnectionFactory.Create();
33+
using var command = new SqlCommand(Query, con);
34+
command.Parameters.Add(new SqlParameter("@department", string.IsNullOrWhiteSpace(department) ? (object)DBNull.Value : department));
35+
var adapter = new SqlDataAdapter(command);
36+
var dataSet = new DataSet();
37+
adapter.Fill(dataSet);
38+
return dataSet;
4739
}
4840

4941
public IEnumerable<Result> GetEmployeesAsIEnumerable(string department = null)
5042
{
5143
IList<Result> result = new List<Result>();
52-
using (IDataReader reader = GetEmployeesAsIDataReader(department))
44+
using (var reader = GetEmployeesAsIDataReader(department))
5345
{
5446
while (reader.Read())
5547
{
@@ -74,7 +66,7 @@ public IEnumerable<Result> GetEmployeesAsIEnumerable(string department = null)
7466
public IEnumerable<IDictionary<string, object>> GetEmployeesAsIEnumerableOfDictionary(string department = null)
7567
{
7668
IList<IDictionary<string, object>> result = new List<IDictionary<string, object>>();
77-
using (IDataReader reader = GetEmployeesAsIDataReader(department))
69+
using (var reader = GetEmployeesAsIDataReader(department))
7870
{
7971
while (reader.Read())
8072
{
@@ -97,11 +89,8 @@ public IEnumerable<IDictionary<string, object>> GetEmployeesAsIEnumerableOfDicti
9789
return result;
9890
}
9991

100-
private string Query
101-
{
102-
get
103-
{
104-
return @"
92+
private static string Query =>
93+
@"
10594
SELECT
10695
p.LastName
10796
, p.FirstName
@@ -139,8 +128,6 @@ ORDER BY
139128
, p.FirstName
140129
, p.MiddleName
141130
";
142-
}
143-
}
144131

145132
public class Result
146133
{

0 commit comments

Comments
 (0)