Skip to content

Commit b152549

Browse files
niemyjskiniemyjski
committed
Merged Exceptionless and Exceptionless.Portable packages into a single package.
1 parent 0086311 commit b152549

File tree

55 files changed

+200
-316
lines changed

Some content is hidden

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

55 files changed

+200
-316
lines changed

‎Exceptionless.Net.sln

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1717
Libraries\Settings.ps1 = Libraries\Settings.ps1
1818
EndProjectSection
1919
EndProject
20-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.Portable", "src\Exceptionless.Portable\Exceptionless.Portable.xproj", "{C3664CAF-6DE9-4049-951F-516C10FBA012}"
20+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless", "src\Exceptionless\Exceptionless.xproj", "{C3664CAF-6DE9-4049-951F-516C10FBA012}"
2121
EndProject
2222
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.Tests", "src\Exceptionless.Tests\Exceptionless.Tests.xproj", "{7961053F-A83D-48AE-9ABC-7EA134973223}"
2323
EndProject
2424
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{D363E15F-621D-40E4-8C96-DEE41A7070FF}"
2525
EndProject
26-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless", "src\Platforms\Exceptionless\Exceptionless.xproj", "{9D15AED5-DE27-46B9-A8DB-654F2DE3A36E}"
27-
EndProject
2826
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.Log4net", "src\Platforms\Exceptionless.Log4net\Exceptionless.Log4net.xproj", "{40447BEF-BE34-46C2-B05B-2DF671586AD7}"
2927
EndProject
3028
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Exceptionless.NLog", "src\Platforms\Exceptionless.NLog\Exceptionless.NLog.xproj", "{A210FAF7-885E-44F4-85D4-F6D279EAFE82}"
@@ -106,10 +104,6 @@ Global
106104
{7961053F-A83D-48AE-9ABC-7EA134973223}.Debug|Any CPU.Build.0 = Debug|Any CPU
107105
{7961053F-A83D-48AE-9ABC-7EA134973223}.Release|Any CPU.ActiveCfg = Release|Any CPU
108106
{7961053F-A83D-48AE-9ABC-7EA134973223}.Release|Any CPU.Build.0 = Release|Any CPU
109-
{9D15AED5-DE27-46B9-A8DB-654F2DE3A36E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
110-
{9D15AED5-DE27-46B9-A8DB-654F2DE3A36E}.Debug|Any CPU.Build.0 = Debug|Any CPU
111-
{9D15AED5-DE27-46B9-A8DB-654F2DE3A36E}.Release|Any CPU.ActiveCfg = Release|Any CPU
112-
{9D15AED5-DE27-46B9-A8DB-654F2DE3A36E}.Release|Any CPU.Build.0 = Release|Any CPU
113107
{40447BEF-BE34-46C2-B05B-2DF671586AD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
114108
{40447BEF-BE34-46C2-B05B-2DF671586AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
115109
{40447BEF-BE34-46C2-B05B-2DF671586AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -187,7 +181,6 @@ Global
187181
HideSolutionNode = FALSE
188182
EndGlobalSection
189183
GlobalSection(NestedProjects) = preSolution
190-
{9D15AED5-DE27-46B9-A8DB-654F2DE3A36E} = {D363E15F-621D-40E4-8C96-DEE41A7070FF}
191184
{40447BEF-BE34-46C2-B05B-2DF671586AD7} = {D363E15F-621D-40E4-8C96-DEE41A7070FF}
192185
{A210FAF7-885E-44F4-85D4-F6D279EAFE82} = {D363E15F-621D-40E4-8C96-DEE41A7070FF}
193186
{A3139129-3FB8-451D-90D6-4BF6A5C8B479} = {D363E15F-621D-40E4-8C96-DEE41A7070FF}

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Exceptionless .NET Clients
22
[![Build status](https://ci.appveyor.com/api/projects/status/xk17pk0u7a5r7yrw/branch/master?svg=true)](https://ci.appveyor.com/project/Exceptionless/exceptionless-net)
3-
[![NuGet Version](http://img.shields.io/nuget/v/Exceptionless.Portable.svg?style=flat)](https://www.nuget.org/packages/Exceptionless.Portable/)
3+
[![NuGet Version](http://img.shields.io/nuget/v/Exceptionless.svg?style=flat)](https://www.nuget.org/packages/Exceptionless/)
44
[![Slack Status](https://slack.exceptionless.com/badge.svg)](https://slack.exceptionless.com)
55
[![Donate](https://img.shields.io/badge/donorbox-donate-blue.svg)](https://donorbox.org/exceptionless)
66

‎src/Exceptionless.Portable.Signed/project.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"version": "99.99.99-dev",
3+
"title": "[DEPRECATED] Exceptionless Portable Class Library",
4+
"authors": [ "Exceptionless" ],
5+
"copyright": "Copyright (c) 2016 Exceptionless. All rights reserved.",
6+
"description": "[DEPRECATED] Please install the Exceptionless.Signed package instead.",
7+
"packOptions": {
8+
"tags": [ "Exceptionless", "Error", "Report", "Reporting", "Exception", "Logging", "Log", "ELMAH", "pcl" ],
9+
"owners": [ "Exceptionless" ],
10+
"projectUrl": "http://exceptionless.io",
11+
"releaseNotes": "https://github.com/exceptionless/Exceptionless.Net/releases",
12+
"iconUrl": "https://be.exceptionless.io/img/exceptionless-32.png",
13+
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
14+
"repository": {
15+
"type": "git",
16+
"url": "https://github.com/exceptionless/Exceptionless.Net"
17+
},
18+
"files": {
19+
"include": [ "readme.txt" ]
20+
}
21+
},
22+
"buildOptions": {
23+
"compile": {
24+
"include": [
25+
"../GlobalAssemblyInfo.cs"
26+
]
27+
},
28+
"keyFile": "../Exceptionless.snk"
29+
},
30+
"dependencies": {
31+
"Exceptionless.Signed":{
32+
"target": "project"
33+
}
34+
},
35+
"frameworks": {
36+
"netstandard1.2": {},
37+
"netstandard1.3": {},
38+
"netstandard1.4": {},
39+
"netstandard1.5": {},
40+
".NETPortable,Version=v4.6,Profile=Profile151": {},
41+
"net45": {}
42+
}
43+
}

‎src/Exceptionless.Portable.Signed/readme.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The Exceptionless.Portable.Signed package has been deprecated. Please install the Exceptionless.Signed package.

‎src/Exceptionless.Portable/project.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "99.99.99-dev",
3+
"title": "[DEPRECATED] Exceptionless Portable Class Library",
4+
"authors": [ "Exceptionless" ],
5+
"copyright": "Copyright (c) 2016 Exceptionless. All rights reserved.",
6+
"description": "[DEPRECATED] Please install the Exceptionless package instead.",
7+
"packOptions": {
8+
"tags": [ "Exceptionless", "Error", "Report", "Reporting", "Exception", "Logging", "Log", "ELMAH", "pcl" ],
9+
"owners": [ "Exceptionless" ],
10+
"projectUrl": "http://exceptionless.io",
11+
"releaseNotes": "https://github.com/exceptionless/Exceptionless.Net/releases",
12+
"iconUrl": "https://be.exceptionless.io/img/exceptionless-32.png",
13+
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
14+
"repository": {
15+
"type": "git",
16+
"url": "https://github.com/exceptionless/Exceptionless.Net"
17+
},
18+
"files": {
19+
"include": [ "readme.txt" ]
20+
}
21+
},
22+
"buildOptions": {
23+
"compile": {
24+
"include": [
25+
"../GlobalAssemblyInfo.cs"
26+
]
27+
}
28+
},
29+
"dependencies": {
30+
"Exceptionless":{
31+
"target": "project"
32+
}
33+
},
34+
"frameworks": {
35+
"netstandard1.2": {},
36+
"netstandard1.3": {},
37+
"netstandard1.4": {},
38+
"netstandard1.5": {},
39+
".NETPortable,Version=v4.6,Profile=Profile151": {},
40+
"net45": {}
41+
}
42+
}

‎src/Exceptionless.Portable/readme.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The Exceptionless.Portable package has been deprecated. Please install the Exceptionless package.

‎src/Exceptionless.Signed/project.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"version": "99.99.99-dev",
3-
"title": "Exceptionless Portable Class Library",
3+
"title": "Exceptionless client for non visual (ie. Console and Services) applications.",
44
"authors": [ "Exceptionless" ],
55
"copyright": "Copyright (c) 2016 Exceptionless. All rights reserved.",
66
"description": "Exceptionless client for portable applications. Exceptionless is a cloud based error reporting service that sends your exceptions to http://exceptionless.io and provides aggregated views and analytics.",
77
"packOptions": {
8-
"tags": [ "Exceptionless", "Error", "Report", "Reporting", "Exception", "Logging", "Log", "ELMAH", "pcl" ],
8+
"tags": [ "Exceptionless", "Error", "Report", "Reporting", "Exception", "Logging", "Log", "ELMAH", "pcl", "NETSTANDARD", "Core" ],
99
"owners": [ "Exceptionless" ],
1010
"projectUrl": "http://exceptionless.io",
1111
"releaseNotes": "https://github.com/exceptionless/Exceptionless.Net/releases",
@@ -16,22 +16,22 @@
1616
"url": "https://github.com/exceptionless/Exceptionless.Net"
1717
},
1818
"files": {
19-
"include": [ "../Exceptionless.Portable/readme.txt" ]
19+
"include": [ "../Exceptionless/readme.txt" ]
2020
}
2121
},
2222
"buildOptions": {
2323
"compile": {
2424
"include": [
25-
"../Exceptionless.Portable/**/*.cs",
25+
"../Exceptionless/**/*.cs",
2626
"../GlobalAssemblyInfo.cs"
2727
],
2828
"exclude": [
29-
"../Exceptionless.Portable/obj/"
29+
"../Exceptionless/obj/"
3030
]
3131
},
3232
"embed": {
3333
"mappings": {
34-
"Exceptionless.Json.Dynamic.snk": "../Exceptionless.Portable/Newtonsoft.Json/Dynamic.snk"
34+
"Exceptionless.Json.Dynamic.snk": "../Exceptionless/Newtonsoft.Json/Dynamic.snk"
3535
}
3636
},
3737
"keyFile": "../Exceptionless.snk",
@@ -43,7 +43,6 @@
4343
"xmlDoc": true
4444
},
4545
"frameworks": {
46-
4746
"netstandard1.2": {
4847
"buildOptions": {
4948
"debugType": "portable",

‎src/Exceptionless.Tests/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<section name="exceptionless" type="Exceptionless.ExceptionlessSection, Exceptionless.Portable" />
4+
<section name="exceptionless" type="Exceptionless.ExceptionlessSection, Exceptionless" />
55
</configSections>
66

77
<exceptionless apiKey="LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw" serverUrl="http://localhost:50000" enabled="true">

‎src/Exceptionless.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"dependencies": {
88
"BenchmarkDotNet": "0.9.6",
9-
"Exceptionless.Portable": {
9+
"Exceptionless": {
1010
"target": "project"
1111
},
1212
"Exceptionless.RandomData": "1.0.22.0",

‎src/Exceptionless/Exceptionless.Portable.xproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)