Skip to content

Commit

Permalink
Merge pull request #222 from MindscapeHQ/Various-updates
Browse files Browse the repository at this point in the history
Various updates
  • Loading branch information
QuantumNightmare committed Jan 14, 2015
2 parents 79d9109 + 71ed126 commit d19c775
Show file tree
Hide file tree
Showing 40 changed files with 53 additions and 50 deletions.
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata minClientVersion="2.5">
<id>Mindscape.Raygun4Net.Core</id>
<version>4.1.0</version>
<version>4.2.0</version>
<title />
<authors>Mindscape</authors>
<owners />
Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net.Mvc.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Mindscape.Raygun4Net.Mvc.Tests")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
4 changes: 2 additions & 2 deletions Mindscape.Raygun4Net.Mvc.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata minClientVersion="2.5">
<id>Mindscape.Raygun4Net.Mvc</id>
<version>4.1.0</version>
<version>4.2.0</version>
<title />
<authors>Mindscape</authors>
<owners />
Expand All @@ -12,7 +12,7 @@
<projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
<licenseUrl>https://raw.github.com/MindscapeHQ/raygun4net/master/LICENSE</licenseUrl>
<dependencies>
<dependency id="Mindscape.Raygun4Net.Core" version="4.1.0" />
<dependency id="Mindscape.Raygun4Net.Core" version="4.2.0" />
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net.Mvc/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net.Signed.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata minClientVersion="2.5">
<id>Mindscape.Raygun4Net.Signed</id>
<version>4.1.0</version>
<version>4.2.0</version>
<title />
<authors>Mindscape</authors>
<owners />
Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape.Raygun4Net.Tests")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2012-2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2012-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
6 changes: 6 additions & 0 deletions Mindscape.Raygun4Net.Tests/RaygunSettingsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ public void IsRawDataIgnored_FalseByDefault()
Assert.IsFalse(RaygunSettings.Settings.IsRawDataIgnored);
}

[Test]
public void ApplicationVersion_EmptyByDefault()
{
Assert.IsEmpty(RaygunSettings.Settings.ApplicationVersion);
}

[Test]
public void IsNotReadOnly()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape.Raygun4Net.WebApi.Tests")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
4 changes: 2 additions & 2 deletions Mindscape.Raygun4Net.WebApi.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata minClientVersion="2.5">
<id>Mindscape.Raygun4Net.WebApi</id>
<version>4.1.0</version>
<version>4.2.0</version>
<title />
<authors>Mindscape</authors>
<owners />
Expand All @@ -12,7 +12,7 @@
<projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
<licenseUrl>https://raw.github.com/MindscapeHQ/raygun4net/master/LICENSE</licenseUrl>
<dependencies>
<dependency id="Mindscape.Raygun4Net.Core" version="4.1.0" />
<dependency id="Mindscape.Raygun4Net.Core" version="4.2.0" />
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net.WebApi/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape.Raygun4Net.WinRT.Tests")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net.WinRT/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2013-2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2013-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
4 changes: 2 additions & 2 deletions Mindscape.Raygun4Net.WinRT/RaygunClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using Mindscape.Raygun4Net.Messages;

using System.Threading.Tasks;
Expand Down Expand Up @@ -212,8 +213,7 @@ public async void Send(RaygunMessage raygunMessage)
{
client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("raygun4net-winrt", "1.0.0"));

HttpContent httpContent = new StringContent(SimpleJson.SerializeObject(raygunMessage));
httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/x-raygun-message");
HttpContent httpContent = new StringContent(SimpleJson.SerializeObject(raygunMessage), Encoding.UTF8, "application/json");
httpContent.Headers.Add("X-ApiKey", _apiKey);

try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape.Raygun4Net.WindowsPhone.Tests")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2013-2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2013-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net.WindowsPhone/RaygunClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ private void SendMessage(string message, bool wait, bool exit)
_exit = exit;

HttpWebRequest httpWebRequest = (HttpWebRequest)WebRequest.Create(RaygunSettings.Settings.ApiEndpoint);
httpWebRequest.ContentType = "application/x-raygun-message";
httpWebRequest.ContentType = "application/json; charset=utf-8";
httpWebRequest.Method = "POST";
httpWebRequest.Headers["X-Apikey"] = _apiKey;
httpWebRequest.AllowReadStreamBuffering = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle("Mindscape.Raygun4Net.WindowsPhone81.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape.Raygun4Net.WindowsPhone81.Tests")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape.Raygun4Net.Xamarin.Android.Tests")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2013-2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2013-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
1 change: 1 addition & 0 deletions Mindscape.Raygun4Net.Xamarin.Mac.Unified/RaygunClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ public void Send(RaygunMessage raygunMessage)
using (var client = new WebClient())
{
client.Headers.Add("X-ApiKey", _apiKey);
client.Headers.Add("content-type", "application/json; charset=utf-8");
client.Encoding = System.Text.Encoding.UTF8;

try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape.Raygun4Net.Xamarin.iOS.Tests")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@
<Compile Include="..\Mindscape.Raygun4Net\Messages\RaygunClientMessage.cs">
<Link>Messages\RaygunClientMessage.cs</Link>
</Compile>
<Compile Include="..\Mindscape.Raygun4Net\Messages\RaygunErrorMessage.cs">
<Link>Messages\RaygunErrorMessage.cs</Link>
</Compile>
<Compile Include="..\Mindscape.Raygun4Net\Messages\RaygunErrorStackTraceLineMessage.cs">
<Link>Messages\RaygunErrorStackTraceLineMessage.cs</Link>
</Compile>
Expand Down Expand Up @@ -168,6 +165,9 @@
<ObjcBindingApiDefinition Include="..\Mindscape.Raygun4Net.Xamarin.iOS\ApiDefinition.cs">
<Link>ApiDefinition.cs</Link>
</ObjcBindingApiDefinition>
<Compile Include="..\Mindscape.Raygun4Net4\Messages\RaygunErrorMessage.cs">
<Link>Messages\RaygunErrorMessage.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ObjcBindingNativeLibrary Include="libRaygun4iOS.a" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2013-2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2013-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata minClientVersion="2.5">
<id>Mindscape.Raygun4Net</id>
<version>4.1.0</version>
<version>4.2.0</version>
<title />
<authors>Mindscape</authors>
<owners />
Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2012-2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2012-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
13 changes: 1 addition & 12 deletions Mindscape.Raygun4Net/RaygunClientBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,10 @@ public abstract class RaygunClientBase
/// </summary>
public virtual RaygunIdentifierMessage UserInfo { get; set; }

private string applicationVersion;
/// <summary>
/// Gets or sets a custom application version identifier for all error messages sent to the Raygun.io endpoint.
/// </summary>
public string ApplicationVersion
{
get
{
return this.applicationVersion;
}
set
{
this.applicationVersion = value;
}
}
public string ApplicationVersion { get; set; }

protected bool CanSend(Exception exception)
{
Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net2.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Mindscape.Raygun4Net2.Tests")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
6 changes: 6 additions & 0 deletions Mindscape.Raygun4Net2.Tests/RaygunSettingsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ public void IsRawDataIgnored_FalseByDefault()
Assert.IsFalse(RaygunSettings.Settings.IsRawDataIgnored);
}

[Test]
public void ApplicationVersion_EmptyByDefault()
{
Assert.IsEmpty(RaygunSettings.Settings.ApplicationVersion);
}

[Test]
public void IsNotReadOnly()
{
Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net2/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Mindscape")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net4/Mindscape.Raygun4Net4.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{6D1C7E96-5E04-421D-8E8A-B3C8C02FD41D}</ProjectGuid>
<ProjectGuid>{2CF1FE1F-AD2D-40BD-9F99-57FF00445A9D}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mindscape.Raygun4Net</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion Mindscape.Raygun4Net4/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Mindscape Raygun4Net")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014")]
[assembly: AssemblyCopyright("Copyright © Mindscape 2014-2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
1 change: 1 addition & 0 deletions Mindscape.Raygun4Net4/RaygunClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ protected WebClient CreateWebClient()
{
var client = new WebClient();
client.Headers.Add("X-ApiKey", _apiKey);
client.Headers.Add("content-type", "application/json; charset=utf-8");
client.Encoding = System.Text.Encoding.UTF8;

if (WebProxy != null)
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit d19c775

Please sign in to comment.