Skip to content

Commit 8385a90

Browse files
niemyjskiniemyjski
committed
Fixed #59 Compiled against nancy 1.3
1 parent 75f5198 commit 8385a90

File tree

10 files changed

+57
-52
lines changed

10 files changed

+57
-52
lines changed

‎Source/Platforms/Nancy/Exceptionless.Nancy.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="Nancy, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\..\..\packages\Nancy.1.2.0\lib\net40\Nancy.dll</HintPath>
42+
<Reference Include="Nancy, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\..\..\packages\Nancy.1.3.0\lib\net40\Nancy.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="System" />

‎Source/Platforms/Nancy/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Nancy" version="1.2.0" targetFramework="net40" />
3+
<package id="Nancy" version="1.3.0" targetFramework="net4" />
44
</packages>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
</PropertyGroup>
4646
<ItemGroup>
4747
<Reference Include="Microsoft.CSharp" />
48-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
49-
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
48+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
49+
<HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
50+
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="NLog, Version=3.2.1.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
5353
<HintPath>..\..\..\packages\NLog.3.2.1\lib\net45\NLog.dll</HintPath>

‎Source/Samples/SampleMvc/Web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</dependentAssembly>
6969
<dependentAssembly>
7070
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
71-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
71+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
7272
</dependentAssembly>
7373
<dependentAssembly>
7474
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎Source/Samples/SampleMvc/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net451" />
1414
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net451" />
1515
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
16-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
16+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
1717
<package id="NLog" version="3.2.1" targetFramework="net451" />
1818
</packages>

‎Source/Samples/SampleNancy/Exceptionless.SampleNancy.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<IISExpressUseClassicPipelineMode />
2222
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
2323
<RestorePackages>true</RestorePackages>
24+
<UseGlobalApplicationHostFile />
2425
</PropertyGroup>
2526
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2627
<DebugSymbols>true</DebugSymbols>
@@ -40,12 +41,12 @@
4041
<WarningLevel>4</WarningLevel>
4142
</PropertyGroup>
4243
<ItemGroup>
43-
<Reference Include="Nancy, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\..\..\packages\Nancy.1.2.0\lib\net40\Nancy.dll</HintPath>
44+
<Reference Include="Nancy, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\..\..\packages\Nancy.1.3.0\lib\net40\Nancy.dll</HintPath>
4546
<Private>True</Private>
4647
</Reference>
47-
<Reference Include="Nancy.Hosting.Aspnet, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\..\..\packages\Nancy.Hosting.Aspnet.1.2.0\lib\net40\Nancy.Hosting.Aspnet.dll</HintPath>
48+
<Reference Include="Nancy.Hosting.Aspnet, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\..\..\packages\Nancy.Hosting.Aspnet.1.3.0\lib\net40\Nancy.Hosting.Aspnet.dll</HintPath>
4950
<Private>True</Private>
5051
</Reference>
5152
<Reference Include="System" />

‎Source/Samples/SampleNancy/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Nancy" version="1.2.0" targetFramework="net45" />
4-
<package id="Nancy.Hosting.Aspnet" version="1.2.0" targetFramework="net45" />
3+
<package id="Nancy" version="1.3.0" targetFramework="net45" />
4+
<package id="Nancy.Hosting.Aspnet" version="1.3.0" targetFramework="net45" />
55
</packages>

‎Source/Tests/Exceptionless.Tests.csproj

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
4-
<Import Project="..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
3+
<Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
54
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
65
<PropertyGroup>
76
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,7 +15,8 @@
1615
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\</SolutionDir>
1716
<TargetFrameworkProfile />
1817
<NuGetPackageImportStamp>25bd791a</NuGetPackageImportStamp>
19-
<NuGetPackageImportStamp>31a90b0c</NuGetPackageImportStamp>
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
2020
</PropertyGroup>
2121
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2222
<DebugSymbols>true</DebugSymbols>
@@ -42,8 +42,8 @@
4242
<HintPath>..\..\packages\Exceptionless.RandomData.1.0.15.0\lib\net40\Exceptionless.RandomData.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
45-
<Reference Include="Foundatio, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\Foundatio.1.0.272\lib\net45\Foundatio.dll</HintPath>
45+
<Reference Include="Foundatio, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\Foundatio.3.0.509\lib\net45\Foundatio.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
4949
<Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -62,24 +62,24 @@
6262
<SpecificVersion>False</SpecificVersion>
6363
<HintPath>..\..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
6464
</Reference>
65-
<Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
65+
<Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
66+
<HintPath>..\..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
67+
<Private>True</Private>
6868
</Reference>
69-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
70-
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
69+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
70+
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
71+
<Private>True</Private>
7272
</Reference>
73-
<Reference Include="Nito.AsyncEx, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Nito.AsyncEx.3.0.0\lib\net45\Nito.AsyncEx.dll</HintPath>
73+
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
77-
<Reference Include="Nito.AsyncEx.Concurrent, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\..\packages\Nito.AsyncEx.3.0.0\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
77+
<Reference Include="Nito.AsyncEx.Concurrent, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
78+
<HintPath>..\..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
7979
<Private>True</Private>
8080
</Reference>
81-
<Reference Include="Nito.AsyncEx.Enlightenment, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
82-
<HintPath>..\..\packages\Nito.AsyncEx.3.0.0\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
81+
<Reference Include="Nito.AsyncEx.Enlightenment, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
82+
<HintPath>..\..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
8383
<Private>True</Private>
8484
</Reference>
8585
<Reference Include="NLog, Version=3.2.1.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
@@ -89,8 +89,8 @@
8989
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
9090
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
9191
</Reference>
92-
<Reference Include="SimpleInjector, Version=2.8.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
93-
<HintPath>..\..\packages\SimpleInjector.2.8.0\lib\net45\SimpleInjector.dll</HintPath>
92+
<Reference Include="SimpleInjector, Version=3.0.5.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
93+
<HintPath>..\..\packages\SimpleInjector.3.0.5\lib\net45\SimpleInjector.dll</HintPath>
9494
<Private>True</Private>
9595
</Reference>
9696
<Reference Include="System" />
@@ -113,13 +113,17 @@
113113
<SpecificVersion>False</SpecificVersion>
114114
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
115115
</Reference>
116-
<Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
117-
<SpecificVersion>False</SpecificVersion>
118-
<HintPath>..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
116+
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
117+
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
118+
<Private>True</Private>
119119
</Reference>
120-
<Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
121-
<SpecificVersion>False</SpecificVersion>
122-
<HintPath>..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
120+
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
121+
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
122+
<Private>True</Private>
123+
</Reference>
124+
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
125+
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
126+
<Private>True</Private>
123127
</Reference>
124128
</ItemGroup>
125129
<ItemGroup>
@@ -170,8 +174,7 @@
170174
<PropertyGroup>
171175
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
172176
</PropertyGroup>
173-
<Error Condition="!Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
174-
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
177+
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
175178
</Target>
176179
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
177180
Other similar extension points exist, see Microsoft.Common.targets.

‎Source/Tests/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</dependentAssembly>
4747
<dependentAssembly>
4848
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
49-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
49+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
5050
</dependentAssembly>
5151
<dependentAssembly>
5252
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎Source/Tests/packages.config

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Exceptionless.RandomData" version="1.0.15.0" targetFramework="net451" />
4-
<package id="Foundatio" version="1.0.272" targetFramework="net451" />
4+
<package id="Foundatio" version="3.0.509" targetFramework="net451" />
55
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net451" />
66
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net451" />
77
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net451" />
@@ -10,16 +10,17 @@
1010
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net451" />
1111
<package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net451" />
1212
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net451" />
13-
<package id="Moq" version="4.2.1502.0911" targetFramework="net451" />
14-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
15-
<package id="Nito.AsyncEx" version="3.0.0" targetFramework="net451" />
13+
<package id="Moq" version="4.2.1507.0118" targetFramework="net451" />
14+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
15+
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
1616
<package id="NLog" version="3.2.1" targetFramework="net451" />
1717
<package id="Owin" version="1.0" targetFramework="net451" />
18-
<package id="SimpleInjector" version="2.8.0" targetFramework="net451" />
19-
<package id="xunit" version="2.0.0" targetFramework="net451" />
18+
<package id="SimpleInjector" version="3.0.5" targetFramework="net451" />
19+
<package id="xunit" version="2.1.0" targetFramework="net451" />
2020
<package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
21-
<package id="xunit.assert" version="2.0.0" targetFramework="net451" />
22-
<package id="xunit.core" version="2.0.0" targetFramework="net451" />
23-
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net451" />
24-
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net451" />
21+
<package id="xunit.assert" version="2.1.0" targetFramework="net451" />
22+
<package id="xunit.core" version="2.1.0" targetFramework="net451" />
23+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
24+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
25+
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net451" />
2526
</packages>

0 commit comments

Comments
 (0)