Skip to content

Commit 5c672d6

Browse files
craigfowlercraigfowler
committed
Merge branch 'release/1.1.0' into production
2 parents ac0cc67 + 6864259 commit 5c672d6

81 files changed

Lines changed: 783 additions & 404 deletions

File tree

Some content is hidden

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

‎CSF.Zpt.Abstractions/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
[assembly: AssemblyProduct("CSF.Zpt")]
99
[assembly: AssemblyCopyright("CSF Software Limited et al")]
1010
[assembly: AssemblyConfiguration("Release")]
11-
[assembly: AssemblyVersion("1.0.6.0")]
12-
[assembly: AssemblyFileVersion("1.0.6.1")]
11+
[assembly: AssemblyVersion("1.1.0.0")]
12+
[assembly: AssemblyFileVersion("1.1.0.6")]

‎CSF.Zpt.Cli/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
[assembly: AssemblyProduct("CSF.Zpt")]
99
[assembly: AssemblyCopyright("CSF Software Limited et al")]
1010
[assembly: AssemblyConfiguration("Release")]
11-
[assembly: AssemblyVersion("1.0.6.0")]
12-
[assembly: AssemblyFileVersion("1.0.6.1")]
11+
[assembly: AssemblyVersion("1.1.0.0")]
12+
[assembly: AssemblyFileVersion("1.1.0.6")]

‎CSF.Zpt.Log4net/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
[assembly: AssemblyProduct("CSF.Zpt")]
99
[assembly: AssemblyCopyright("CSF Software Limited et al")]
1010
[assembly: AssemblyConfiguration("Release")]
11-
[assembly: AssemblyVersion("1.0.6.0")]
12-
[assembly: AssemblyFileVersion("1.0.6.1")]
11+
[assembly: AssemblyVersion("1.1.0.0")]
12+
[assembly: AssemblyFileVersion("1.1.0.6")]

‎CSF.Zpt.Log4net/app.config.install.xdt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</switches>
7676
<sharedListeners>
7777
<add name="ZptLog4netListener"
78-
type="CSF.Zpt.SelfConfiguringLog4netTraceListener, CSF.Zpt.Log4net, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
78+
type="CSF.Zpt.SelfConfiguringLog4netTraceListener, CSF.Zpt.Log4net, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
7979
xdt:Transform="InsertIfMissing"
8080
xdt:Locator="Match(name)">
8181
<filter type="System.Diagnostics.EventTypeFilter" initializeData="Verbose"/>

‎CSF.Zpt.Log4net/web.config.install.xdt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</switches>
7676
<sharedListeners>
7777
<add name="ZptLog4netListener"
78-
type="CSF.Zpt.SelfConfiguringLog4netTraceListener, CSF.Zpt.Log4net, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
78+
type="CSF.Zpt.SelfConfiguringLog4netTraceListener, CSF.Zpt.Log4net, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730"
7979
xdt:Transform="InsertIfMissing"
8080
xdt:Locator="Match(name)">
8181
<filter type="System.Diagnostics.EventTypeFilter" initializeData="Verbose"/>

‎CSF.Zpt.MVC5/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
[assembly: AssemblyProduct("CSF.Zpt")]
99
[assembly: AssemblyCopyright("CSF Software Limited et al")]
1010
[assembly: AssemblyConfiguration("Release")]
11-
[assembly: AssemblyVersion("1.0.6.0")]
12-
[assembly: AssemblyFileVersion("1.0.6.1")]
11+
[assembly: AssemblyVersion("1.1.0.0")]
12+
[assembly: AssemblyFileVersion("1.1.0.6")]

‎CSF.Zpt.sln‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.Zpt.ScreenplayReportPro
104104
EndProject
105105
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.Zpt.ProfilingApp", "Tests\CSF.Zpt.ProfilingApp\CSF.Zpt.ProfilingApp.csproj", "{E187D1D5-CB19-4B93-8950-E53852EC99A8}"
106106
EndProject
107+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.Zpt.ExpressionEvaluators.PipeExpressions", "ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.PipeExpressions\CSF.Zpt.ExpressionEvaluators.PipeExpressions.csproj", "{3D708232-9C80-49E6-A163-33CC7505B890}"
108+
EndProject
107109
Global
108110
GlobalSection(SolutionConfigurationPlatforms) = preSolution
109111
Debug|Any CPU = Debug|Any CPU
@@ -321,6 +323,12 @@ Global
321323
{E187D1D5-CB19-4B93-8950-E53852EC99A8}.Release|Any CPU.Build.0 = Release|Any CPU
322324
{E187D1D5-CB19-4B93-8950-E53852EC99A8}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
323325
{E187D1D5-CB19-4B93-8950-E53852EC99A8}.Deploy|Any CPU.Build.0 = Release|Any CPU
326+
{3D708232-9C80-49E6-A163-33CC7505B890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
327+
{3D708232-9C80-49E6-A163-33CC7505B890}.Debug|Any CPU.Build.0 = Debug|Any CPU
328+
{3D708232-9C80-49E6-A163-33CC7505B890}.Release|Any CPU.ActiveCfg = Release|Any CPU
329+
{3D708232-9C80-49E6-A163-33CC7505B890}.Release|Any CPU.Build.0 = Release|Any CPU
330+
{3D708232-9C80-49E6-A163-33CC7505B890}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
331+
{3D708232-9C80-49E6-A163-33CC7505B890}.Deploy|Any CPU.Build.0 = Release|Any CPU
324332
EndGlobalSection
325333
GlobalSection(NestedProjects) = preSolution
326334
{BFD834D4-5724-4425-BCB3-6DEE6B03F743} = {F1251A40-9526-48DC-A665-F9AEB972AC33}
@@ -354,6 +362,7 @@ Global
354362
{22FABC32-0558-486B-9430-EE2E6F4B67D0} = {39927A41-7964-48BF-9D90-DAFA48D54F09}
355363
{697959B1-57CC-48A2-B2E6-E7E15D5B387D} = {39927A41-7964-48BF-9D90-DAFA48D54F09}
356364
{E187D1D5-CB19-4B93-8950-E53852EC99A8} = {39927A41-7964-48BF-9D90-DAFA48D54F09}
365+
{3D708232-9C80-49E6-A163-33CC7505B890} = {F2830FC9-EFCE-4DE8-8B24-2196A4F820BC}
357366
EndGlobalSection
358367
GlobalSection(MonoDevelopProperties) = preSolution
359368
Policies = $0

‎CSF.Zpt/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
[assembly: AssemblyProduct("CSF.Zpt")]
99
[assembly: AssemblyCopyright("CSF Software Limited et al")]
1010
[assembly: AssemblyConfiguration("Release")]
11-
[assembly: AssemblyVersion("1.0.6.0")]
12-
[assembly: AssemblyFileVersion("1.0.6.0")]
11+
[assembly: AssemblyVersion("1.1.0.0")]
12+
[assembly: AssemblyFileVersion("1.1.0.5")]

‎CSF.Zpt/PluginConfigurationSection.cs‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
using System.Configuration;
33
using System.Collections.Generic;
44
using System.Linq;
5-
using System.Reflection;
65
using CSF.Configuration;
7-
using System.IO;
8-
using CSF.IO;
6+
using System.Diagnostics;
97

108
namespace CSF.Zpt
119
{
@@ -135,6 +133,11 @@ public string GetDefaultExpressionEvaluatorTypeName()
135133
/// <returns>The default/singleton instance.</returns>
136134
public static IPluginConfiguration GetDefault()
137135
{
136+
ZptConstants.TraceSource.TraceEvent(TraceEventType.Verbose,
137+
0,
138+
$"Getting plugin configuration from a {nameof(ConfigurationReader)}");
139+
WriteStackTraceToDebug();
140+
138141
if(_singleton == null)
139142
{
140143
var reader = new ConfigurationReader();
@@ -144,6 +147,14 @@ public static IPluginConfiguration GetDefault()
144147
return _singleton?? new EmptyPluginConfiguration();
145148
}
146149

150+
[Conditional("DEBUG")]
151+
static void WriteStackTraceToDebug()
152+
{
153+
ZptConstants.TraceSource.TraceEvent(TraceEventType.Verbose,
154+
0,
155+
Environment.StackTrace);
156+
}
157+
147158
#endregion
148159
}
149160
}

‎CSF.Zpt/app.config.install.xdt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<sectionGroup name="CSF" xdt:Locator="Match(name)">
1111
<sectionGroup name="Zpt" xdt:Transform="Remove" xdt:Locator="Match(name)" />
1212
<sectionGroup name="Zpt" xdt:Transform="Insert">
13-
<section name="PluginConfigurationSection" type="CSF.Zpt.PluginConfigurationSection, CSF.Zpt, Version=1.0.6.1, Culture=neutral, PublicKeyToken=83989bab8a1a4730" />
13+
<section name="PluginConfigurationSection" type="CSF.Zpt.PluginConfigurationSection, CSF.Zpt, Version=1.1.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730" />
1414
</sectionGroup>
1515
</sectionGroup>
1616
</configSections>

0 commit comments

Comments
 (0)