Merge pull request #62 from remyvd/Amendment167to169

Amendment 167 to 169
RemyDuijkeren · Aug 28, 2018 · 5ee1065 · 5ee1065
2 parents 0870d45 + 66c0289
commit 5ee1065
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 41 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,7 @@
 #      general configuration      #
 #---------------------------------#
 version: '{build}-{branch}'
-image: Visual Studio 2017
+image: Visual Studio 2017 Preview
 branches:
   except:
     - gh-pages

diff --git a/build.cake b/build.cake
@@ -1,9 +1,9 @@
 #tool nuget:?package=xunit.runner.console
 #tool nuget:?package=GitVersion.CommandLine
 #tool nuget:?package=OpenCover
-#tool nuget:?package=coveralls.net
+//#tool nuget:?package=coveralls.net
 #addin nuget:?package=Cake.Figlet
-#addin nuget:?package=Cake.Coveralls
+//#addin nuget:?package=Cake.Coveralls
 
 var target = Argument("target", "Default");
 var configuration = Argument("configuration", "Release");
@@ -48,21 +48,21 @@ Does(() =>
     var versionInfo = GitVersion();
     var buildVersion = EnvironmentVariable("APPVEYOR_BUILD_NUMBER") ?? "0";
     var assemblyVersion =  versionInfo.Major + ".0.0.0"; // Minor and Patch versions should work with base Major version
-	var fileVersion = versionInfo.MajorMinorPatch + "." + buildVersion;
-	var informationalVersion = versionInfo.FullSemVer;
-	var nuGetVersion = versionInfo.NuGetVersion;
+    var fileVersion = versionInfo.MajorMinorPatch + "." + buildVersion;
+    var informationalVersion = versionInfo.FullSemVer;
+    var nuGetVersion = versionInfo.NuGetVersion;
 
     Information("BuildVersion: " + buildVersion);
     Information("AssemblyVersion: " + assemblyVersion);
     Information("FileVersion: " + fileVersion);
     Information("InformationalVersion: " + informationalVersion);
     Information("NuGetVersion: " + nuGetVersion);
-	
+    
     if (AppVeyor.IsRunningOnAppVeyor)
     {
         AppVeyor.UpdateBuildVersion(informationalVersion + ".build." + buildVersion);
     }	
-	
+    
     Information("Update Directory.build.props");
     var file = File("./src/Directory.build.props");
     XmlPoke(file, "/Project/PropertyGroup/Version", nuGetVersion);
@@ -133,35 +133,35 @@ Task("Package")
     }
  });
 
-Task("Upload-Coverage-CoverallsIo")
-.WithCriteria(() => HasEnvironmentVariable("COVERALLS_REPO_TOKEN"))
-.WithCriteria(() => !AppVeyor.Environment.PullRequest.IsPullRequest)
-.IsDependentOn("Coverage")
-.Does(() =>
-{
-    if (AppVeyor.IsRunningOnAppVeyor)
-    {
-        CoverallsNet(artifactsDir.Path + "/coverage.xml", CoverallsNetReportType.OpenCover, new CoverallsNetSettings()
-        {
-            RepoToken = EnvironmentVariable("COVERALLS_REPO_TOKEN"),
-            CommitId = AppVeyor.Environment.Repository.Commit.Id,
-            CommitBranch = AppVeyor.Environment.Repository.Branch,
-            CommitAuthor = AppVeyor.Environment.Repository.Commit.Author,
-            CommitEmail = AppVeyor.Environment.Repository.Commit.Email,
-            CommitMessage = AppVeyor.Environment.Repository.Commit.Message,
-            JobId = Convert.ToInt32(EnvironmentVariable("APPVEYOR_BUILD_NUMBER")),
-            ServiceName = "appveyor"
-        });
-    }
-    else
-    {
-        CoverallsNet(artifactsDir.Path + "/coverage.xml", CoverallsNetReportType.OpenCover, new CoverallsNetSettings()
-        {
-            RepoToken = EnvironmentVariable("COVERALLS_REPO_TOKEN"),
-            ServiceName = "local"
-        });        
-    }
-});
+//Task("Upload-Coverage-CoverallsIo")
+//.WithCriteria(() => HasEnvironmentVariable("COVERALLS_REPO_TOKEN"))
+//.WithCriteria(() => !AppVeyor.Environment.PullRequest.IsPullRequest)
+//.IsDependentOn("Coverage")
+//.Does(() =>
+//{
+//    if (AppVeyor.IsRunningOnAppVeyor)
+//    {
+//        CoverallsNet(artifactsDir.Path + "/coverage.xml", CoverallsNetReportType.OpenCover, new CoverallsNetSettings()
+//        {
+//            RepoToken = EnvironmentVariable("COVERALLS_REPO_TOKEN"),
+//            CommitId = AppVeyor.Environment.Repository.Commit.Id,
+//            CommitBranch = AppVeyor.Environment.Repository.Branch,
+//            CommitAuthor = AppVeyor.Environment.Repository.Commit.Author,
+//            CommitEmail = AppVeyor.Environment.Repository.Commit.Email,
+//            CommitMessage = AppVeyor.Environment.Repository.Commit.Message,
+//            JobId = Convert.ToInt32(EnvironmentVariable("APPVEYOR_BUILD_NUMBER")),
+//            ServiceName = "appveyor"
+//        });
+//    }
+//    else
+//    {
+//        CoverallsNet(artifactsDir.Path + "/coverage.xml", CoverallsNetReportType.OpenCover, new CoverallsNetSettings()
+//        {
+//            RepoToken = EnvironmentVariable("COVERALLS_REPO_TOKEN"),
+//            ServiceName = "local"
+//        });        
+//    }
+//});
 
 Task("Upload-AppVeyor-Artifacts")
 .WithCriteria(() => AppVeyor.IsRunningOnAppVeyor)
@@ -195,7 +195,7 @@ Task("Default")
 Task("AppVeyor")
 .IsDependentOn("Package")
 .IsDependentOn("Upload-AppVeyor-Artifacts")
-.IsDependentOn("Upload-Coverage-CoverallsIo")
+//.IsDependentOn("Upload-Coverage-CoverallsIo")
 .IsDependentOn("Publish-NuGet");
 
 RunTarget(target);
diff --git a/src/NodaMoney/CurrencyRegistry.cs b/src/NodaMoney/CurrencyRegistry.cs
@@ -224,7 +224,7 @@ private static IDictionary<string, Currency> InitializeIsoCurrencies()
                 ["ISO-4217::PAB"] = new Currency("PAB", "590", 2, "Panamanian balboa", "B/."),
                 ["ISO-4217::PEN"] = new Currency("PEN", "604", 2, "Peruvian sol", "S/."),
                 ["ISO-4217::PGK"] = new Currency("PGK", "598", 2, "Papua New Guinean kina", "K"),
-                ["ISO-4217::PHP"] = new Currency("PHP", "608", 2, "Philippine Piso", "₱"), // or P or PHP or PhP
+                ["ISO-4217::PHP"] = new Currency("PHP", "608", 2, "Philippine Peso", "₱"), // or P or PHP or PhP
                 ["ISO-4217::PKR"] = new Currency("PKR", "586", 2, "Pakistani rupee", "Rs"),
                 ["ISO-4217::PLN"] = new Currency("PLN", "985", 2, "Polish złoty", "zł"),
                 ["ISO-4217::PYG"] = new Currency("PYG", "600", 0, "Paraguayan guaraní", "₲"),
@@ -263,7 +263,7 @@ private static IDictionary<string, Currency> InitializeIsoCurrencies()
                 ["ISO-4217::UYI"] = new Currency("UYI", "940", 0, "Uruguay Peso en Unidades Indexadas (UI) (funds code)", Currency.CurrencySign), // List two
                 ["ISO-4217::UYU"] = new Currency("UYU", "858", 2, "Uruguayan peso", "$"), // or $U
                 ["ISO-4217::UZS"] = new Currency("UZS", "860", 2, "Uzbekistan som", "лв"), // or сўм ?
-                ["ISO-4217::VES"] = new Currency("VES", "928", 2, "Venezuelan Bolívar Soberano", "Bs."), // or Bs.F.
+                ["ISO-4217::VES"] = new Currency("VES", "928", 2, "Venezuelan Bolívar Soberano", "Bs.", validFrom: new DateTime(2018, 8, 20)), // or Bs.F. , Amendment 167 talks about delay but from multiple sources on the web the date seems to be 20 aug.
                 ["ISO-4217::VND"] = new Currency("VND", "704", 0, "Vietnamese dong", "₫"),
                 ["ISO-4217::VUV"] = new Currency("VUV", "548", 0, "Vanuatu vatu", "VT"),
                 ["ISO-4217::WST"] = new Currency("WST", "882", 2, "Samoan tala", "WS$"), // sometimes SAT, ST or T
@@ -290,9 +290,10 @@ private static IDictionary<string, Currency> InitializeIsoCurrencies()
                 ["ISO-4217::ZWL"] = new Currency("ZWL", "932", 2, "Zimbabwean dollar", "$"),
                 ["ISO-4217::STN"] = new Currency("STN", "930", 2, "Dobra", "Db", validFrom: new DateTime(2018, 1, 1)), // New Currency of São Tomé and Príncipe from 1 Jan 2018 (Amendment 164)
                 ["ISO-4217::STD"] = new Currency("STD", "678", 2, "Dobra", "Db", validTo: new DateTime(2018, 1, 1)), // To be replaced Currency of São Tomé and Príncipe from 1 Jan 2018 (Amendment 164),  inflation has rendered the cêntimo obsolete
+                ["ISO-4217::UYW"] = new Currency("UYW", "927", 2, "Unidad Previsional", "Db", validFrom: new DateTime(2018, 8, 29)), // The Central Bank of Uruguay is applying for new Fund currency code (Amendment 169)
 
                 // Historic ISO-4217 currencies (list three)
-                ["ISO-4217-HISTORIC::VEF"] = new Currency("VEF", "937", 2, "Venezuelan bolívar", "Bs.", "ISO-4217-HISTORIC", new DateTime(2018, 6, 4)), // replaced by VEF, The conversion rate is 1000 (old) Bolívar to 1 (new) Bolívar Soberano (1000:1). The expiration date of the current bolívar will be defined later and communicated by the Central Bank of Venezuela in due time.
+                ["ISO-4217-HISTORIC::VEF"] = new Currency("VEF", "937", 2, "Venezuelan bolívar", "Bs.", "ISO-4217-HISTORIC", new DateTime(2018, 8, 20)), // replaced by VEF, The conversion rate is 1000 (old) Bolívar to 1 (new) Bolívar Soberano (1000:1). The expiration date of the current bolívar will be defined later and communicated by the Central Bank of Venezuela in due time.
                 ["ISO-4217-HISTORIC::MRO"] = new Currency("MRO", "478", Z07, "Mauritanian ouguiya", "UM", "ISO-4217-HISTORIC", new DateTime(2018, 1, 1)), // replaced by MRU
                 ["ISO-4217-HISTORIC::ESA"] = new Currency("ESA", "996", NotApplicable, "Spanish peseta (account A)", "Pta", "ISO-4217-HISTORIC", new DateTime(2002, 3, 1)), // replaced by ESP (EUR)
                 ["ISO-4217-HISTORIC::ESB"] = new Currency("ESB", "995", NotApplicable, "Spanish peseta (account B)", "Pta", "ISO-4217-HISTORIC", new DateTime(2002, 3, 1)), // replaced by ESP (EUR)