Skip to content

Commit 76f1dfa

Browse files
niemyjskiniemyjski
committed
Removed depreciated config settings and updated targeted frameworks
1 parent 6943b0c commit 76f1dfa

19 files changed

+92
-95
lines changed

‎Source/Samples/SampleConsole/App.config

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<configuration>
33
<configSections>
44
<section name="exceptionless" type="Exceptionless.ExceptionlessSection, Exceptionless.Extras"/>
5-
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5+
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
66
</configSections>
77

8-
<exceptionless apiKey="LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw" serverUrl="http://localhost:50000" enableSSL="false" tags="Tag1,Tag2" enableLogging="true">
8+
<exceptionless apiKey="LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw" serverUrl="http://localhost:50000" tags="Tag1,Tag2">
99
<settings>
1010
<add name="TraceLogLimit" value="25"/>
1111
<add name="IncludeConditionalData" value="true"/>
@@ -22,17 +22,17 @@
2222
<log4net>
2323
<appender name="exceptionless" type="Exceptionless.Log4net.ExceptionlessAppender,Exceptionless.Log4net">
2424
<layout type="log4net.Layout.PatternLayout">
25-
<conversionPattern value="%-4timestamp [%thread] %-5level %logger %ndc - %message%newline" />
25+
<conversionPattern value="%-4timestamp [%thread] %-5level %logger %ndc - %message%newline"/>
2626
</layout>
2727
</appender>
2828

2929
<root>
30-
<level value="DEBUG" />
31-
<appender-ref ref="exceptionless" />
30+
<level value="DEBUG"/>
31+
<appender-ref ref="exceptionless"/>
3232
</root>
3333
</log4net>
3434

3535
<startup>
36-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
36+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
3737
</startup>
38-
</configuration>
38+
</configuration>

‎Source/Samples/SampleConsole/Exceptionless.SampleConsole.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Exceptionless.SampleConsole</RootNamespace>
1111
<AssemblyName>SampleConsole</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>

‎Source/Samples/SampleMvc/Exceptionless.SampleMvc.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Exceptionless.SampleMvc</RootNamespace>
1515
<AssemblyName>Exceptionless.SampleMvc</AssemblyName>
16-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>true</UseIISExpress>
1919
<IISExpressSSLPort />
@@ -79,9 +79,9 @@
7979
<Reference Include="System.Web.Entity" />
8080
<Reference Include="System.Web.ApplicationServices" />
8181
<Reference Include="System.ComponentModel.DataAnnotations" />
82-
<Reference Include="System.Web.Extensions" />
8382
<Reference Include="System.Web" />
8483
<Reference Include="System.Web.Abstractions" />
84+
<Reference Include="System.Web.Extensions" />
8585
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8686
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
8787
<Private>True</Private>

‎Source/Samples/SampleMvc/Web.config

Lines changed: 59 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,112 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
For more information on how to configure your ASP.NET application, please visit
4-
http://go.microsoft.com/fwlink/?LinkId=152368
5-
-->
1+
<?xml version="1.0"?>
62
<configuration>
73
<appSettings>
8-
<add key="Exceptionless:ApiKey" value="LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw" />
9-
<add key="Exceptionless:ServerUrl" value="http://localhost:50000" />
4+
<add key="Exceptionless:ApiKey" value="LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw"/>
5+
<add key="Exceptionless:ServerUrl" value="http://localhost:50000"/>
106

11-
<add key="webpages:Version" value="3.0.0.0" />
12-
<add key="webpages:Enabled" value="false" />
7+
<add key="webpages:Version" value="3.0.0.0"/>
8+
<add key="webpages:Enabled" value="false"/>
139
</appSettings>
1410
<system.web>
15-
<httpRuntime targetFramework="4.5.1" />
16-
<compilation debug="true" targetFramework="4.5.1" />
11+
<httpRuntime targetFramework="4.5.1"/>
12+
<compilation debug="true" targetFramework="4.5.2"/>
1713
<customErrors mode="Off" defaultRedirect="/home/error">
18-
<error statusCode="404" redirect="/home/notfound" />
14+
<error statusCode="404" redirect="/home/notfound"/>
1915
</customErrors>
2016
<pages>
2117
<namespaces>
22-
<add namespace="System.Web.Helpers" />
23-
<add namespace="System.Web.Mvc" />
24-
<add namespace="System.Web.Mvc.Ajax" />
25-
<add namespace="System.Web.Mvc.Html" />
26-
<add namespace="System.Web.Routing" />
27-
<add namespace="System.Web.WebPages" />
18+
<add namespace="System.Web.Helpers"/>
19+
<add namespace="System.Web.Mvc"/>
20+
<add namespace="System.Web.Mvc.Ajax"/>
21+
<add namespace="System.Web.Mvc.Html"/>
22+
<add namespace="System.Web.Routing"/>
23+
<add namespace="System.Web.WebPages"/>
2824
</namespaces>
2925
</pages>
3026
</system.web>
3127
<system.webServer>
32-
<validation validateIntegratedModeConfiguration="false" />
28+
<validation validateIntegratedModeConfiguration="false"/>
3329
<modules>
34-
<remove name="ExceptionlessModule" />
35-
<add name="ExceptionlessModule" type="Exceptionless.Mvc.ExceptionlessModule, Exceptionless.Mvc" />
30+
<remove name="ExceptionlessModule"/>
31+
<add name="ExceptionlessModule" type="Exceptionless.Mvc.ExceptionlessModule, Exceptionless.Mvc"/>
3632
</modules>
37-
<handlers>
38-
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
39-
<remove name="OPTIONSVerbHandler" />
40-
<remove name="TRACEVerbHandler" />
41-
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
42-
</handlers></system.webServer>
33+
<handlers>
34+
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
35+
<remove name="OPTIONSVerbHandler"/>
36+
<remove name="TRACEVerbHandler"/>
37+
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
38+
</handlers>
39+
</system.webServer>
4340
<runtime>
4441
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
4542
<dependentAssembly>
46-
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31BF3856AD364E35" culture="neutral" />
47-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
43+
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
44+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
4845
</dependentAssembly>
4946
<dependentAssembly>
50-
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
51-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
47+
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
48+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
5249
</dependentAssembly>
5350
<dependentAssembly>
54-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
55-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
51+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
52+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
5653
</dependentAssembly>
5754
<dependentAssembly>
58-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
59-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
55+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
56+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
6057
</dependentAssembly>
6158
<dependentAssembly>
62-
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
63-
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
59+
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
60+
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0"/>
6461
</dependentAssembly>
6562
<dependentAssembly>
66-
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
67-
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
63+
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
64+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
6865
</dependentAssembly>
6966
<dependentAssembly>
70-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
71-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
67+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
68+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
7269
</dependentAssembly>
7370
<dependentAssembly>
74-
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
75-
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
71+
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
72+
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
7673
</dependentAssembly>
7774
<dependentAssembly>
78-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
79-
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
75+
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
76+
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
8077
</dependentAssembly>
8178
<dependentAssembly>
82-
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
83-
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0" />
79+
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
80+
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0"/>
8481
</dependentAssembly>
8582
<dependentAssembly>
86-
<assemblyIdentity name="YamlDotNet" publicKeyToken="2b53052c5884d7a1" culture="neutral" />
87-
<bindingRedirect oldVersion="0.0.0.0-2.0.1.20271" newVersion="2.0.1.20271" />
83+
<assemblyIdentity name="YamlDotNet" publicKeyToken="2b53052c5884d7a1" culture="neutral"/>
84+
<bindingRedirect oldVersion="0.0.0.0-2.0.1.20271" newVersion="2.0.1.20271"/>
8885
</dependentAssembly>
8986
<dependentAssembly>
90-
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
91-
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
87+
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
88+
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
9289
</dependentAssembly>
9390
<dependentAssembly>
94-
<assemblyIdentity name="SimpleInjector" publicKeyToken="984cb50dea722e99" culture="neutral" />
95-
<bindingRedirect oldVersion="0.0.0.0-2.7.1.0" newVersion="2.7.1.0" />
91+
<assemblyIdentity name="SimpleInjector" publicKeyToken="984cb50dea722e99" culture="neutral"/>
92+
<bindingRedirect oldVersion="0.0.0.0-2.7.1.0" newVersion="2.7.1.0"/>
9693
</dependentAssembly>
9794
<dependentAssembly>
98-
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
99-
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
95+
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
96+
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
10097
</dependentAssembly>
10198
<dependentAssembly>
102-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
103-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
99+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
100+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
104101
</dependentAssembly>
105102
<dependentAssembly>
106-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
107-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
103+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
104+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
108105
</dependentAssembly>
109106
<dependentAssembly>
110-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
111-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
107+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
108+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
112109
</dependentAssembly>
113110
</assemblyBinding>
114111
</runtime>
115-
</configuration>
112+
</configuration>

‎Source/Samples/SampleNancy/ExceptionlessModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Exceptionless.SampleNancy {
55
public class ExceptionlessModule : NancyModule {
66
public ExceptionlessModule() {
77
Get["/"] = _ => "Hello!";
8-
Get["/error"] = _ => { throw new Exception("Unhandled Exception"); };
8+
Get["/boom"] = _ => { throw new Exception("Unhandled Exception"); };
99
Get["/custom"] = _ => {
1010
new Exception("Handled Exception").ToExceptionless().AddRequestInfo(Context).Submit();
1111
return "ok, handled";

‎Source/Samples/SampleNancy/Web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<section name="exceptionless" type="Exceptionless.ExceptionlessSection, Exceptionless.Extras" />
55
</configSections>
66

7-
<exceptionless apiKey="LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw" serverUrl="http://localhost:50000" enableSSL="false">
7+
<exceptionless apiKey="LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw" serverUrl="http://localhost:50000">
88
<settings>
99
<add name="TraceLogLimit" value="25" />
1010
<add name="IncludeConditionalData" value="false" />

‎Source/Samples/SampleWcf/Service1.svc.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public string GetData(int value) {
1010

1111
public CompositeType GetDataUsingDataContract(CompositeType composite) {
1212
if (composite == null)
13-
throw new ArgumentNullException("composite");
13+
throw new ArgumentNullException(nameof(composite));
1414

1515
if (composite.BoolValue)
1616
composite.StringValue += "Suffix";

‎Source/Samples/SampleWcf/Web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<section name="exceptionless" type="Exceptionless.ExceptionlessSection, Exceptionless.Extras"/>
55
</configSections>
66

7-
<exceptionless apiKey="LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw" serverUrl="http://localhost:50000" enableSSL="false">
7+
<exceptionless apiKey="LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw" serverUrl="http://localhost:50000">
88
<settings>
99
<add name="TraceLogLimit" value="25"/>
1010
</settings>

‎Source/Samples/SampleWeb/Exceptionless.SampleWeb.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<OldToolsVersion>4.0</OldToolsVersion>
1818
<UpgradeBackupLocation>
1919
</UpgradeBackupLocation>
20-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2121
<TargetFrameworkProfile />
2222
<UseIISExpress>true</UseIISExpress>
2323
<IISExpressSSLPort />
@@ -26,6 +26,7 @@
2626
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
2727
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
2828
<RestorePackages>true</RestorePackages>
29+
<UseGlobalApplicationHostFile />
2930
</PropertyGroup>
3031
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3132
<DebugSymbols>true</DebugSymbols>

‎Source/Samples/SampleWeb/Web.config

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<configuration>
33
<configSections>
4-
<section name="exceptionless" type="Exceptionless.ExceptionlessSection, Exceptionless.Extras" requirePermission="false" />
4+
<section name="exceptionless" type="Exceptionless.ExceptionlessSection, Exceptionless.Extras" requirePermission="false"/>
55
</configSections>
66
<exceptionless apiKey="LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw" serverUrl="http://localhost:50000">
77
<settings>
@@ -26,16 +26,15 @@
2626
</behaviors>
2727
<services>
2828
<service behaviorConfiguration="Debug" name="Exceptionless.SampleWeb.TestService">
29-
<endpoint address="" behaviorConfiguration="Exceptionless.SampleWeb.TestServiceAspNetAjaxBehavior"
30-
binding="webHttpBinding" contract="Exceptionless.SampleWeb.TestService"/>
29+
<endpoint address="" behaviorConfiguration="Exceptionless.SampleWeb.TestServiceAspNetAjaxBehavior" binding="webHttpBinding" contract="Exceptionless.SampleWeb.TestService"/>
3130
</service>
3231
</services>
3332
<serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
3433
</system.serviceModel>
3534
<system.web>
3635
<!--<trust level="Medium" />-->
3736
<httpRuntime targetFramework="4.5.1"/>
38-
<compilation debug="true" targetFramework="4.5.1"/>
37+
<compilation debug="true" targetFramework="4.5.2"/>
3938
<authentication mode="Windows"/>
4039
<customErrors mode="On" defaultRedirect="~/Error.aspx"/>
4140
<httpModules>

0 commit comments

Comments
 (0)