Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6d97c12
Replaced local lib reference to JSon.NET with NuGet reference
asbjornu Nov 22, 2013
5a9c89b
Added NuSpec file
asbjornu Nov 22, 2013
7d62598
Removed comments from AssemblyInfo, upped the version numbers and wro…
asbjornu Nov 25, 2013
38877ed
Changed some information in AssemblyInfo
asbjornu Nov 29, 2013
a4a119c
Changed version and id in the nuspec file to match the assembly
asbjornu Nov 29, 2013
3ee1dbf
Added a couple of nuspec changes as per issue #17.
asbjornu Nov 29, 2013
b6f491a
Looks like TeamCity's AssemblyInfoPatcher is unable to patch Assembly…
asbjornu Nov 29, 2013
a41195a
Enabled "NuGet Package Restore" on the solution
asbjornu Nov 29, 2013
b1cf1fa
Added the ignored NuGet.exe file
asbjornu Nov 29, 2013
04de4a9
Added <files> to the NuSpec.
asbjornu Nov 29, 2013
ae94805
Replace '$id$' with 'SharpRaven' and changed the path to something th…
asbjornu Dec 2, 2013
fe8c9bc
Moved the <files> element up one level
asbjornu Dec 2, 2013
ec63a0b
Removed one "SharpRaven" too many in the file path
asbjornu Dec 2, 2013
00323a2
Merged the branch 'master' into 'nuget' to get the latest unit testin…
asbjornu Dec 5, 2013
ac1eb5a
Merged branch 'unit-testing' into 'nuget' to get the .NET 4.0 change …
asbjornu Dec 5, 2013
c87c615
Added StringComparison.Ordinal to avoid culture problems
asbjornu Dec 5, 2013
1f09721
NuGet did some solution rejigging for reasons unbeknownst to me.
asbjornu Dec 5, 2013
b040916
Added documentation to the SharpRaven.Data.Module class.
asbjornu Dec 5, 2013
4bb8782
Added documentation to SharpRaven.Logging.IFilter
asbjornu Dec 5, 2013
4bcc7c8
Added failing test for the PhoneNumberFilter, proving it doesn't work…
asbjornu Dec 5, 2013
c4e644c
Fixed the PhoneNumberFilter to use the returned value from Replace(),…
asbjornu Dec 5, 2013
02d3bce
Added failing CreditCardFilter test, unveiling a bug in the filter th…
asbjornu Dec 5, 2013
3221db8
Changed existing CreditCardTest into a negative one due to it using a…
asbjornu Dec 6, 2013
a7ec75a
Added failing test for the PhoneNumberFilter, proving it doesn't work…
asbjornu Dec 6, 2013
c5e805b
Added failing test for the PhoneNumberFilter, proving it doesn't work…
asbjornu Dec 6, 2013
02e008d
Added failing CreditCardFilter test, unveiling a bug in the filter th…
asbjornu Dec 6, 2013
729c0df
Changed existing CreditCardTest into a negative one due to it using a…
asbjornu Dec 6, 2013
a22cb8f
Fixed CreditCardFilter so it actually scrubs the data and doesn't suf…
asbjornu Dec 6, 2013
d6105b2
Merged the old 'nuget' branch into the new one, based on master HEAD.
asbjornu Dec 6, 2013
4252252
Made releaseNotes a variable that I'm attempting to have specified wh…
asbjornu Dec 6, 2013
a247242
Upped the version number to 1.0.0.0
asbjornu Dec 13, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions SharpRaven.UnitTests/Logging/CreditCardFilterTests.cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
using NUnit.Framework;
using SharpRaven.Logging.Filters;
namespace SharpRaven.UnitTests.Logging
{
[TestFixture]
public class CreditCardFilterTests : FilterTestsBase<CreditCardFilter>
{
[Test]
public void InvalidCreditCardNumber_IsNotScrubbed()
{
InvalidValueIsNotScrubbed("1234-5678-9101-1121");
}
[Test]
public void ValidCreditCardNumber_IsScrubbed()
{
ValidValueIsScrubbed("5271-1902-4264-3112");
}
}
using NUnit.Framework;

using SharpRaven.Logging.Filters;

namespace SharpRaven.UnitTests.Logging
{
[TestFixture]
public class CreditCardFilterTests : FilterTestsBase<CreditCardFilter>
{
[Test]
public void InvalidCreditCardNumber_IsNotScrubbed()
{
InvalidValueIsNotScrubbed("1234-5678-9101-1121");
}


[Test]
public void ValidCreditCardNumber_IsScrubbed()
{
ValidValueIsScrubbed("5271-1902-4264-3112");
}
}
}
44 changes: 22 additions & 22 deletions SharpRaven.UnitTests/Logging/PhoneNumberFilterTests.cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
using NUnit.Framework;
using SharpRaven.Logging.Filters;
namespace SharpRaven.UnitTests.Logging
{
[TestFixture]
public class PhoneNumberFilterTests : FilterTestsBase<PhoneNumberFilter>
{
[Test]
public void InvalidPhoneNumber_IsNotScrubbed()
{
base.InvalidValueIsNotScrubbed("1531");
}
[Test]
public void ValidPhoneNumber_IsScrubbed()
{
ValidValueIsScrubbed("55518231234");
}
}
using NUnit.Framework;

using SharpRaven.Logging.Filters;

namespace SharpRaven.UnitTests.Logging
{
[TestFixture]
public class PhoneNumberFilterTests : FilterTestsBase<PhoneNumberFilter>
{
[Test]
public void InvalidPhoneNumber_IsNotScrubbed()
{
base.InvalidValueIsNotScrubbed("1531");
}


[Test]
public void ValidPhoneNumber_IsScrubbed()
{
ValidValueIsScrubbed("55518231234");
}
}
}
150 changes: 75 additions & 75 deletions SharpRaven.UnitTests/SharpRaven.UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{E1DBEBBF-9448-4D99-B378-2B8CF1629F31}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SharpRaven.UnitTests</RootNamespace>
<AssemblyName>SharpRaven.UnitTests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="schema.json" />
<Compile Include="Logging\CreditCardFilterTests.cs" />
<Compile Include="Logging\FilterTestsBase.cs" />
<Compile Include="Logging\PhoneNumberFilterTests.cs" />
<Compile Include="Logging\SocialSecurityFilterTests.cs" />
<Compile Include="SchemaHelper.cs" />
<Compile Include="SerializationTests.cs" />
<Compile Include="SchemaTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TestHelper.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SharpRaven\SharpRaven.csproj">
<Project>{CC80A2E1-AE39-44DE-8DA3-4EEF42F90FB1}</Project>
<Name>SharpRaven</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{E1DBEBBF-9448-4D99-B378-2B8CF1629F31}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SharpRaven.UnitTests</RootNamespace>
<AssemblyName>SharpRaven.UnitTests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="schema.json" />
<Compile Include="Logging\CreditCardFilterTests.cs" />
<Compile Include="Logging\FilterTestsBase.cs" />
<Compile Include="Logging\PhoneNumberFilterTests.cs" />
<Compile Include="Logging\SocialSecurityFilterTests.cs" />
<Compile Include="SchemaHelper.cs" />
<Compile Include="SerializationTests.cs" />
<Compile Include="SchemaTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TestHelper.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SharpRaven\SharpRaven.csproj">
<Project>{CC80A2E1-AE39-44DE-8DA3-4EEF42F90FB1}</Project>
<Name>SharpRaven</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
34 changes: 11 additions & 23 deletions SharpRaven/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,24 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("SharpRaven")]
[assembly: AssemblyDescription("A Sentry Client written in C# 4.0")]
[assembly: AssemblyDescription("SharpRaven is a C# client for Sentry https://www.getsentry.com")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("Sentry")]
[assembly: AssemblyProduct("SharpRaven")]
[assembly: AssemblyCopyright("Copyright © 2012")]
[assembly: AssemblyCopyright("Copyright © Sentry 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b5683941-1254-484e-b074-87cedd4fc78e")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.7.8.0")]
// AssemblyVersion the most formal version number and is akin to "API Version". It doesn't need to change unless there's breaking changes.
[assembly: AssemblyVersion("1.0.0.0")]

// AssemblyFileVersion is more informal and can be increased more rapidly and with less consideration than AssemblyVersion.
[assembly: AssemblyFileVersion("1.0.0.0")]

// AssemblyInformationalVersion is even more informal than AssemblyFileVersion and doesn't need a certain format. It will be used as the $version$ replacement string in NuGet and can contain suffixes like "-alpha".
// [assembly: AssemblyInformationalVersion("0.8.0.0")]

[assembly: InternalsVisibleTo("SharpRaven.UnitTests")]
5 changes: 4 additions & 1 deletion SharpRaven/SharpRaven.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -68,6 +68,9 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="SharpRaven.nuspec">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
Expand Down
24 changes: 24 additions & 0 deletions SharpRaven/SharpRaven.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>SharpRaven</id>
<version>$version$</version>
<title>.NET client for Sentry (getsentry.com)</title>
<authors>David Cramer, GetSentry.com</authors>
<owners>jsk, asbjornu, gmaclellan</owners>
<licenseUrl>https://github.com/getsentry/raven-csharp/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/getsentry/raven-csharp</projectUrl>
<iconUrl>https://www.getsentry.com/_static/getsentry/images/favicon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Raven is a C# client for Sentry (getsentry.com and github.com/getsentry/sentry)</description>
<releaseNotes>$releaseNotes$</releaseNotes>
<copyright>Copyright 2013 getsentry.com</copyright>
<tags>raven sentry logging</tags>
<dependencies>
<dependency id="Newtonsoft.Json" version="4.5.11" />
</dependencies>
</metadata>
<files>
<file src="SharpRaven\bin\Release\SharpRaven.*" target="lib" />
</files>
</package>
8 changes: 4 additions & 4 deletions packages/repositories.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\SharpRaven.UnitTests\packages.config" />
<repository path="..\SharpRaven\packages.config" />
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\SharpRaven.UnitTests\packages.config" />
<repository path="..\SharpRaven\packages.config" />
</repositories>