Skip to content

Commit b438581

Browse files
authored
Better xplat and Xamarin support!
2 parents f0494c8 + e9b344e commit b438581

File tree

160 files changed

+729
-410
lines changed

Some content is hidden

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

160 files changed

+729
-410
lines changed

Exceptionless.Net.sln

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1818
EndProject
1919
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless", "src\Exceptionless\Exceptionless.xproj", "{C3664CAF-6DE9-4049-951F-516C10FBA012}"
2020
EndProject
21-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.Tests", "src\Exceptionless.Tests\Exceptionless.Tests.xproj", "{7961053F-A83D-48AE-9ABC-7EA134973223}"
21+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.Tests", "tests\Exceptionless.Tests\Exceptionless.Tests.xproj", "{7961053F-A83D-48AE-9ABC-7EA134973223}"
2222
EndProject
2323
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{D363E15F-621D-40E4-8C96-DEE41A7070FF}"
2424
EndProject
@@ -46,37 +46,37 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.Wpf", "src\Pl
4646
EndProject
4747
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{2CEE12C6-3840-4C01-A952-D3026B0A662A}"
4848
EndProject
49-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWindows", "src\Samples\Exceptionless.SampleWindows\Exceptionless.SampleWindows.csproj", "{34FE8E6E-247B-46DD-967E-46E45D1CAE6D}"
49+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWindows", "samples\\Exceptionless.SampleWindows\Exceptionless.SampleWindows.csproj", "{34FE8E6E-247B-46DD-967E-46E45D1CAE6D}"
5050
ProjectSection(ProjectDependencies) = postProject
5151
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
5252
EndProjectSection
5353
EndProject
54-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWpf", "src\Samples\Exceptionless.SampleWpf\Exceptionless.SampleWpf.csproj", "{C54027FA-B334-49C7-A58B-94B57677556C}"
54+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWpf", "samples\\Exceptionless.SampleWpf\Exceptionless.SampleWpf.csproj", "{C54027FA-B334-49C7-A58B-94B57677556C}"
5555
ProjectSection(ProjectDependencies) = postProject
5656
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
5757
EndProjectSection
5858
EndProject
59-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.SampleWebApi", "src\Samples\Exceptionless.SampleWebApi\Exceptionless.SampleWebApi.xproj", "{02EBBB5A-0F11-461E-9778-010F69C36545}"
59+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.SampleWebApi", "samples\\Exceptionless.SampleWebApi\Exceptionless.SampleWebApi.xproj", "{02EBBB5A-0F11-461E-9778-010F69C36545}"
6060
EndProject
61-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleNancy", "src\Samples\Exceptionless.SampleNancy\Exceptionless.SampleNancy.csproj", "{887A8565-4A10-44C8-82EF-F2F2D1D2BFBF}"
61+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleNancy", "samples\\Exceptionless.SampleNancy\Exceptionless.SampleNancy.csproj", "{887A8565-4A10-44C8-82EF-F2F2D1D2BFBF}"
6262
ProjectSection(ProjectDependencies) = postProject
6363
{76CC2F27-1B94-4375-A082-A167CFC5E6CB} = {76CC2F27-1B94-4375-A082-A167CFC5E6CB}
6464
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
6565
EndProjectSection
6666
EndProject
67-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWcf", "src\Samples\Exceptionless.SampleWcf\Exceptionless.SampleWcf.csproj", "{D03FB8BA-EE59-42DD-840F-E7791B4609F0}"
67+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWcf", "samples\\Exceptionless.SampleWcf\Exceptionless.SampleWcf.csproj", "{D03FB8BA-EE59-42DD-840F-E7791B4609F0}"
6868
ProjectSection(ProjectDependencies) = postProject
6969
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
7070
{D4265DE5-6AA5-4566-8B51-4FC2158C8539} = {D4265DE5-6AA5-4566-8B51-4FC2158C8539}
7171
EndProjectSection
7272
EndProject
73-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWeb", "src\Samples\Exceptionless.SampleWeb\Exceptionless.SampleWeb.csproj", "{DAE5248F-75FC-42CC-96A7-34C470F28641}"
73+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleWeb", "samples\\Exceptionless.SampleWeb\Exceptionless.SampleWeb.csproj", "{DAE5248F-75FC-42CC-96A7-34C470F28641}"
7474
ProjectSection(ProjectDependencies) = postProject
7575
{C3664CAF-6DE9-4049-951F-516C10FBA012} = {C3664CAF-6DE9-4049-951F-516C10FBA012}
7676
{D4265DE5-6AA5-4566-8B51-4FC2158C8539} = {D4265DE5-6AA5-4566-8B51-4FC2158C8539}
7777
EndProjectSection
7878
EndProject
79-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleMvc", "src\Samples\Exceptionless.SampleMvc\Exceptionless.SampleMvc.csproj", "{B7075822-FBB6-4B3A-A639-37C39DC27BB6}"
79+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleMvc", "samples\\Exceptionless.SampleMvc\Exceptionless.SampleMvc.csproj", "{B7075822-FBB6-4B3A-A639-37C39DC27BB6}"
8080
ProjectSection(ProjectDependencies) = postProject
8181
{A3139129-3FB8-451D-90D6-4BF6A5C8B479} = {A3139129-3FB8-451D-90D6-4BF6A5C8B479}
8282
{E29380A2-85E5-468E-8D09-4E1CFDF5E90E} = {E29380A2-85E5-468E-8D09-4E1CFDF5E90E}
@@ -85,9 +85,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exceptionless.SampleMvc", "
8585
EndProject
8686
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.AspNetCore", "src\Platforms\Exceptionless.AspNetCore\Exceptionless.AspNetCore.xproj", "{F949CF8F-9D5F-454B-B20A-D8F9C22B70D9}"
8787
EndProject
88-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.SampleAspNetCore", "src\Samples\Exceptionless.SampleAspNetCore\Exceptionless.SampleAspNetCore.xproj", "{D7039656-8587-49CC-8657-5C9BDCFC1C80}"
88+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.SampleAspNetCore", "samples\\Exceptionless.SampleAspNetCore\Exceptionless.SampleAspNetCore.xproj", "{D7039656-8587-49CC-8657-5C9BDCFC1C80}"
8989
EndProject
90-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.SampleConsole", "src\Samples\Exceptionless.SampleConsole\Exceptionless.SampleConsole.xproj", "{23645F73-57D8-4D70-BE1A-37903A8E4A18}"
90+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.SampleConsole", "samples\\Exceptionless.SampleConsole\Exceptionless.SampleConsole.xproj", "{23645F73-57D8-4D70-BE1A-37903A8E4A18}"
9191
EndProject
9292
Global
9393
GlobalSection(SolutionConfigurationPlatforms) = preSolution

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ build_script:
3838
- ps: .\tools\Build.ps1
3939

4040
test_script:
41-
- dotnet test src\Exceptionless.Tests\
41+
- dotnet test tests\Exceptionless.Tests\
4242

4343
after_test:
4444
- ps: .\tools\Package.ps1

global.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"projects": [
33
"src",
44
"src/Platforms",
5-
"src/Samples"
5+
"samples",
6+
"tests"
67
],
78
"sdk": {
8-
"version": "1.0.0-preview2-003121"
9+
"version": "1.0.0-preview2-003131"
910
}
1011
}

src/Samples/Exceptionless.SampleAspNetCore/project.json renamed to samples/Exceptionless.SampleAspNetCore/project.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"buildOptions": {
33
"debugType": "portable",
44
"emitEntryPoint": true,
@@ -11,9 +11,9 @@
1111
"Exceptionless.AspNetCore": {
1212
"target": "project"
1313
},
14-
"Microsoft.AspNetCore.Mvc": "1.0.0",
14+
"Microsoft.AspNetCore.Mvc": "1.0.1",
1515
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
16-
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
16+
"Microsoft.AspNetCore.Server.Kestrel": "1.0.1",
1717
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
1818
"Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
1919
"Microsoft.Extensions.Configuration.Json": "1.0.0",
@@ -22,11 +22,15 @@
2222
"Microsoft.Extensions.Logging.Debug": "1.0.0",
2323
"Microsoft.NETCore.App": {
2424
"type": "platform",
25-
"version": "1.0.0"
25+
"version": "1.0.1"
2626
}
2727
},
2828
"frameworks": {
2929
"netcoreapp1.0": {
30+
"buildOptions": {
31+
"debugType": "portable",
32+
"define": [ "NETSTANDARD", "NETSTANDARD1_5" ]
33+
},
3034
"imports": [
3135
"dotnet5.6",
3236
"portable-net45+win8"

0 commit comments

Comments
 (0)