Skip to content

Commit

Permalink
Merged projects, improved testing and removed .NET 4.0-4.5 support
Browse files Browse the repository at this point in the history
- merged NodaMoney.Serialization.AspNet with NodaMoney
- improved ISO4127 testing and enabled them
- Fix #79
- removed .NET 4.0 and .NET 4.5 support
  • Loading branch information
remyvd committed Mar 29, 2020
1 parent 2588910 commit fb3dacf
Show file tree
Hide file tree
Showing 23 changed files with 425 additions and 381 deletions.
7 changes: 0 additions & 7 deletions NodaMoney.sln
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,13 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C8B3C22E-2C66-43E1-B1C3-71E7A384B2C2}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
appveyor.yml = appveyor.yml
src\CustomDictionary.xml = src\CustomDictionary.xml
src\Directory.build.props = src\Directory.build.props
README.md = README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodaMoney", "src\NodaMoney\NodaMoney.csproj", "{58F0FE5E-E139-4ABF-B9A5-969DBBE69F52}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodaMoney.Serialization.AspNet", "src\NodaMoney.Serialization.AspNet\NodaMoney.Serialization.AspNet.csproj", "{6BBD36B9-D035-4A5D-8770-CC7E30B636A6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodaMoney.Tests", "tests\NodaMoney.Tests\NodaMoney.Tests.csproj", "{CC01DEB3-F862-49A1-9EB5-50A4E52B82E7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{324D342A-2588-4422-AFB1-FA0359EE825D}"
Expand All @@ -31,10 +28,6 @@ Global
{58F0FE5E-E139-4ABF-B9A5-969DBBE69F52}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{58F0FE5E-E139-4ABF-B9A5-969DBBE69F52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58F0FE5E-E139-4ABF-B9A5-969DBBE69F52}.Release|Any CPU.Build.0 = Release|Any CPU
{6BBD36B9-D035-4A5D-8770-CC7E30B636A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BBD36B9-D035-4A5D-8770-CC7E30B636A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BBD36B9-D035-4A5D-8770-CC7E30B636A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BBD36B9-D035-4A5D-8770-CC7E30B636A6}.Release|Any CPU.Build.0 = Release|Any CPU
{CC01DEB3-F862-49A1-9EB5-50A4E52B82E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC01DEB3-F862-49A1-9EB5-50A4E52B82E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC01DEB3-F862-49A1-9EB5-50A4E52B82E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
Binary file not shown.

This file was deleted.

13 changes: 6 additions & 7 deletions src/NodaMoney/NodaMoney.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyTitle>NodaMoney</AssemblyTitle>
Expand All @@ -7,7 +7,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageId>NodaMoney</PackageId>
<PackageTags>Noda;Money;Currency;ExchangeRate</PackageTags>
<TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1;net40;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1;</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>disable</Nullable>
</PropertyGroup>
Expand Down Expand Up @@ -39,11 +39,10 @@
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<ItemGroup>
<Reference Include="System.Web.Extensions">
<HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Web.Extensions.dll</HintPath>
</Reference>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using System;
#if !NETCOREAPP
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Globalization;
using System.Web.Script.Serialization;

namespace NodaMoney.Serialization.AspNet
namespace NodaMoney.Serialization
{
/// <summary>Provides a custom Money converter for the JavaScriptSerializer in ASP.NET.</summary>
/// <code>
Expand Down Expand Up @@ -62,4 +63,5 @@ public override IDictionary<string, object> Serialize(object obj, JavaScriptSeri
return dictionary;
}
}
}
}
#endif
4 changes: 4 additions & 0 deletions tests/NodaMoney.Tests/CurrencyBuilderSpec.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System;
using FluentAssertions;
using Xunit;
using NodaMoney.Tests.Helpers;

namespace NodaMoney.Tests.CurrencyBuilderSpec
{
[Collection(nameof(NoParallelization))]
public class GivenIWantToCreateCustomCurrency
{
[Fact]
Expand Down Expand Up @@ -151,6 +153,7 @@ public void WhenSymbolIsEmpty_ThenSymbolMustBeDefaultCurrencySign()
}
}

[Collection(nameof(NoParallelization))]
public class GivenIWantToUnregisterCurrency
{
[Fact]
Expand Down Expand Up @@ -225,6 +228,7 @@ public void WhenNamespaceIsEmpty_ThenThrowException()
}
}

[Collection(nameof(NoParallelization))]
public class GivenIWantToReplaceIsoCurrencyWithOwnVersion
{
[Fact]
Expand Down
Loading

0 comments on commit fb3dacf

Please sign in to comment.