diff --git a/.gitignore b/.gitignore index b0d1d47..72de34f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1,388 @@ -#ignore outputs of project -[Tt]esting.db -lint.db -build*/ -src/SharpArch/CommonAssemblyInfo.cs -#ignore thumbnails created by windows -Thumbs.db -#Ignore files build by Visual Studio -*.obj +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo *.user -*.aps -*.pch -*.vspscc +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c -*.ncb -*.suo +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr *.tlb +*.tli *.tlh -*.bak -*.cache -*.ilk +*.tmp +*.tmp_proj +*_wpftmp.csproj *.log -[Bb]in -[Dd]ebug*/ -*.lib -*.sbr -obj/ -[Rr]elease*/ +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in _ReSharper*/ -[Tt]est[Rr]esult* \ No newline at end of file +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Nuget personal access tokens and Credentials +nuget.config + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +.idea/ +*.sln.iml \ No newline at end of file diff --git a/Solution/Thought.vCards.UnitTests/Helper.cs b/Solution/Thought.vCards.UnitTests/Helper.cs index 7b7fe92..ee77330 100644 --- a/Solution/Thought.vCards.UnitTests/Helper.cs +++ b/Solution/Thought.vCards.UnitTests/Helper.cs @@ -5,7 +5,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { /// diff --git a/Solution/Thought.vCards.UnitTests/Properties/AssemblyInfo.cs b/Solution/Thought.vCards.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index b63e245..0000000 --- a/Solution/Thought.vCards.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -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("vCard Library Unit Tests")] -[assembly: AssemblyDescription("Unit tests written for the NUnit framework. Download NUnit from www.nunit.org.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Thought Project")] -[assembly: AssemblyProduct("vCard Class Library for .NET")] -[assembly: AssemblyCopyright("Copyright © 2007 David Pinch")] -[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("85621c9b-d85e-4d07-bfe3-699a6684c36c")] - -// 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 Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("0.2.0.0")] -[assembly: AssemblyFileVersion("0.2.0.0")] diff --git a/Solution/Thought.vCards.UnitTests/Properties/vssver2.scc b/Solution/Thought.vCards.UnitTests/Properties/vssver2.scc deleted file mode 100644 index dcc166f..0000000 Binary files a/Solution/Thought.vCards.UnitTests/Properties/vssver2.scc and /dev/null differ diff --git a/Solution/Thought.vCards.UnitTests/Resources/vssver2.scc b/Solution/Thought.vCards.UnitTests/Resources/vssver2.scc deleted file mode 100644 index 28f72d2..0000000 Binary files a/Solution/Thought.vCards.UnitTests/Resources/vssver2.scc and /dev/null differ diff --git a/Solution/Thought.vCards.UnitTests/SampleCards.Designer.cs b/Solution/Thought.vCards.UnitTests/SampleCards.Designer.cs index b0ffc17..ece18cb 100644 --- a/Solution/Thought.vCards.UnitTests/SampleCards.Designer.cs +++ b/Solution/Thought.vCards.UnitTests/SampleCards.Designer.cs @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.239 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace Tests { +namespace Thought.vCards.UnitTests { using System; @@ -19,10 +19,10 @@ namespace Tests { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class SampleCards { + public class SampleCards { private static global::System.Resources.ResourceManager resourceMan; @@ -36,10 +36,10 @@ internal SampleCards() { /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tests.SampleCards", typeof(SampleCards).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Thought.vCards.UnitTests.SampleCards", typeof(SampleCards).Assembly); resourceMan = temp; } return resourceMan; @@ -51,7 +51,7 @@ internal SampleCards() { /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + public static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -60,49 +60,70 @@ internal SampleCards() { } } - internal static byte[] Outlook2007 { + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] Outlook2007 { get { object obj = ResourceManager.GetObject("Outlook2007", resourceCulture); return ((byte[])(obj)); } } - internal static byte[] OutlookCertificate { + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] OutlookCertificate { get { object obj = ResourceManager.GetObject("OutlookCertificate", resourceCulture); return ((byte[])(obj)); } } - internal static byte[] OutlookSimple { + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] OutlookSimple { get { object obj = ResourceManager.GetObject("OutlookSimple", resourceCulture); return ((byte[])(obj)); } } - internal static byte[] PalmAgentSamples { + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] PalmAgentSamples { get { object obj = ResourceManager.GetObject("PalmAgentSamples", resourceCulture); return ((byte[])(obj)); } } - internal static byte[] RfcAuthors { + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] RfcAuthors { get { object obj = ResourceManager.GetObject("RfcAuthors", resourceCulture); return ((byte[])(obj)); } } - internal static byte[] UnicodeNameSample { + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] UnicodeNameSample { get { object obj = ResourceManager.GetObject("UnicodeNameSample", resourceCulture); return ((byte[])(obj)); } } - internal static byte[] XPalmWithPhoto { + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] XPalmWithPhoto { get { object obj = ResourceManager.GetObject("XPalmWithPhoto", resourceCulture); return ((byte[])(obj)); diff --git a/Solution/Thought.vCards.UnitTests/Samples/Outlook2007.cs b/Solution/Thought.vCards.UnitTests/Samples/Outlook2007.cs index 1c33683..0d3ad83 100644 --- a/Solution/Thought.vCards.UnitTests/Samples/Outlook2007.cs +++ b/Solution/Thought.vCards.UnitTests/Samples/Outlook2007.cs @@ -5,7 +5,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests.Samples +namespace Thought.vCards.UnitTests.Samples { [TestFixture] public class Outlook2007 diff --git a/Solution/Thought.vCards.UnitTests/Samples/OutlookTests.cs b/Solution/Thought.vCards.UnitTests/Samples/OutlookTests.cs index 1e0bd7f..eefdc0c 100644 --- a/Solution/Thought.vCards.UnitTests/Samples/OutlookTests.cs +++ b/Solution/Thought.vCards.UnitTests/Samples/OutlookTests.cs @@ -1,11 +1,11 @@ - + using System; using System.IO; using System.Security.Cryptography.X509Certificates; using NUnit.Framework; using Thought.vCards; -namespace Tests.Samples +namespace Thought.vCards.UnitTests.Samples { /* =================================================================== @@ -437,7 +437,7 @@ public void ParseUnicodeSimple() new StreamReader(new MemoryStream(SampleCards.UnicodeNameSample))); Assert.NotNull(card); - Assert.AreEqual("", card.GivenName); + Assert.AreEqual("陈丽君", card.GivenName); } #endregion diff --git a/Solution/Thought.vCards.UnitTests/Samples/PalmAgentSampleTests.cs b/Solution/Thought.vCards.UnitTests/Samples/PalmAgentSampleTests.cs index d7ff904..0c882e7 100644 --- a/Solution/Thought.vCards.UnitTests/Samples/PalmAgentSampleTests.cs +++ b/Solution/Thought.vCards.UnitTests/Samples/PalmAgentSampleTests.cs @@ -4,7 +4,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests.Samples +namespace Thought.vCards.UnitTests.Samples { /* =================================================================== diff --git a/Solution/Thought.vCards.UnitTests/Samples/RfcAuthorTests.cs b/Solution/Thought.vCards.UnitTests/Samples/RfcAuthorTests.cs index 60c163e..ffa387a 100644 --- a/Solution/Thought.vCards.UnitTests/Samples/RfcAuthorTests.cs +++ b/Solution/Thought.vCards.UnitTests/Samples/RfcAuthorTests.cs @@ -4,7 +4,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] public class RfcAuthorTests diff --git a/Solution/Thought.vCards.UnitTests/Samples/XPalmWithPhotoTests.cs b/Solution/Thought.vCards.UnitTests/Samples/XPalmWithPhotoTests.cs index b1b9df3..4f0c587 100644 --- a/Solution/Thought.vCards.UnitTests/Samples/XPalmWithPhotoTests.cs +++ b/Solution/Thought.vCards.UnitTests/Samples/XPalmWithPhotoTests.cs @@ -5,7 +5,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests.Samples +namespace Thought.vCards.UnitTests.Samples { /* =================================================================== diff --git a/Solution/Thought.vCards.UnitTests/TestTesult.xml b/Solution/Thought.vCards.UnitTests/TestTesult.xml deleted file mode 100644 index 5a3e0c4..0000000 --- a/Solution/Thought.vCards.UnitTests/TestTesult.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Solution/Thought.vCards.UnitTests/Thought.vCards.UnitTests.csproj b/Solution/Thought.vCards.UnitTests/Thought.vCards.UnitTests.csproj index e668254..c8f553a 100644 --- a/Solution/Thought.vCards.UnitTests/Thought.vCards.UnitTests.csproj +++ b/Solution/Thought.vCards.UnitTests/Thought.vCards.UnitTests.csproj @@ -1,145 +1,34 @@  - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {D7A4725B-CB7B-4F10-8DD1-DE2E4AECA498} - Library - Properties - Tests - Thought.vCards.UnitTests - - - - - 3.5 - v4.0 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll - - - ..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll - - - ..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll - - - - - - - - - - - - - - True - True - SampleCards.resx - - - - - - - - - - - - - - - - - - - - Designer - ResXFileCodeGenerator - SampleCards.Designer.cs - - - - - - - - - - - - - - - - {A53D3CEB-F7AF-41AB-AA04-4D3CF684BBAF} - Thought.vCards - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - + + + net472 + {D7A4725B-CB7B-4F10-8DD1-DE2E4AECA498} + David Pinch, Thought Project, Jamie Howarth + vCard Class Library for .NET + Thought Project + 0.2.0 + LGPL + Unit tests written for the NUnit framework. Download NUnit from www.nunit.org. + + + + + + + + + + + + True + True + SampleCards.resx + + + + + PublicResXFileCodeGenerator + SampleCards.Designer.cs + + \ No newline at end of file diff --git a/Solution/Thought.vCards.UnitTests/mssccprj.scc b/Solution/Thought.vCards.UnitTests/mssccprj.scc deleted file mode 100644 index 95e4a00..0000000 --- a/Solution/Thought.vCards.UnitTests/mssccprj.scc +++ /dev/null @@ -1,5 +0,0 @@ -SCC = This is a Source Code Control file - -[FairMetric.Tests.csproj] -SCC_Aux_Path = "D:\FairMetricVSS" -SCC_Project_Name = "$/Solution/FairMetric.Tests", HAAAAAAA diff --git a/Solution/Thought.vCards.UnitTests/packages.config b/Solution/Thought.vCards.UnitTests/packages.config deleted file mode 100644 index 27a3819..0000000 --- a/Solution/Thought.vCards.UnitTests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Solution/Thought.vCards.UnitTests/vCardCertificateTests.cs b/Solution/Thought.vCards.UnitTests/vCardCertificateTests.cs index 4a74bde..9881ff2 100644 --- a/Solution/Thought.vCards.UnitTests/vCardCertificateTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardCertificateTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] public class vCardCertificateTests diff --git a/Solution/Thought.vCards.UnitTests/vCardDeliveryAddressTests.cs b/Solution/Thought.vCards.UnitTests/vCardDeliveryAddressTests.cs index 29b0b61..946defe 100644 --- a/Solution/Thought.vCards.UnitTests/vCardDeliveryAddressTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardDeliveryAddressTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] public class vCardDeliveryAddressTests diff --git a/Solution/Thought.vCards.UnitTests/vCardEmailAddressTests.cs b/Solution/Thought.vCards.UnitTests/vCardEmailAddressTests.cs index 52fe28a..eadc42d 100644 --- a/Solution/Thought.vCards.UnitTests/vCardEmailAddressTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardEmailAddressTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] diff --git a/Solution/Thought.vCards.UnitTests/vCardPhoneTests.cs b/Solution/Thought.vCards.UnitTests/vCardPhoneTests.cs index 1b0135f..ef875c2 100644 --- a/Solution/Thought.vCards.UnitTests/vCardPhoneTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardPhoneTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] public class vCardPhoneTests diff --git a/Solution/Thought.vCards.UnitTests/vCardPhotoTests.cs b/Solution/Thought.vCards.UnitTests/vCardPhotoTests.cs index aafa550..eaf5445 100644 --- a/Solution/Thought.vCards.UnitTests/vCardPhotoTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardPhotoTests.cs @@ -5,7 +5,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] public class vCardPhotoTests @@ -19,22 +19,22 @@ public class vCardPhotoTests /// local network. This will save bandwidth costs for the author. /// private const string TestPhotoUrl = - "http://www.thoughtproject.com/Common/Download.gif"; + "https://en.gravatar.com/userimage/5706801/e459ccda7c6b32bb4e14da3725cf7db4.jpeg"; /// /// The height of the test image in pixels. /// - private const int TestPhotoHeight = 16; + private const int TestPhotoHeight = 80; /// /// The size (in bytes) of the test image. /// - private const int TestPhotoSize = 579; + private const int TestPhotoSize = 2400; /// /// The width of the test photo in pixels. /// - private const int TestPhotoWidth = 16; + private const int TestPhotoWidth = 80; // diff --git a/Solution/Thought.vCards.UnitTests/vCardPropertyTests.cs b/Solution/Thought.vCards.UnitTests/vCardPropertyTests.cs index 4574335..dd0473b 100644 --- a/Solution/Thought.vCards.UnitTests/vCardPropertyTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardPropertyTests.cs @@ -3,7 +3,7 @@ using Thought.vCards; using NUnit.Framework; -namespace Tests +namespace Thought.vCards.UnitTests { /// diff --git a/Solution/Thought.vCards.UnitTests/vCardSourceTests.cs b/Solution/Thought.vCards.UnitTests/vCardSourceTests.cs index 78d35ce..d34abf9 100644 --- a/Solution/Thought.vCards.UnitTests/vCardSourceTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardSourceTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] diff --git a/Solution/Thought.vCards.UnitTests/vCardStandardReaderTests.cs b/Solution/Thought.vCards.UnitTests/vCardStandardReaderTests.cs index 82e1392..1c76546 100644 --- a/Solution/Thought.vCards.UnitTests/vCardStandardReaderTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardStandardReaderTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] diff --git a/Solution/Thought.vCards.UnitTests/vCardStandardWriterTests.cs b/Solution/Thought.vCards.UnitTests/vCardStandardWriterTests.cs index 09817d3..b8b8789 100644 --- a/Solution/Thought.vCards.UnitTests/vCardStandardWriterTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardStandardWriterTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] public class vCardStandardWriterTests diff --git a/Solution/Thought.vCards.UnitTests/vCardSubpropertyCollectionTests.cs b/Solution/Thought.vCards.UnitTests/vCardSubpropertyCollectionTests.cs index 0c5185e..fed88b7 100644 --- a/Solution/Thought.vCards.UnitTests/vCardSubpropertyCollectionTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardSubpropertyCollectionTests.cs @@ -1,9 +1,7 @@ - using System; using NUnit.Framework; -using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] diff --git a/Solution/Thought.vCards.UnitTests/vCardSubpropertyTests.cs b/Solution/Thought.vCards.UnitTests/vCardSubpropertyTests.cs index 46f3763..5bcd894 100644 --- a/Solution/Thought.vCards.UnitTests/vCardSubpropertyTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardSubpropertyTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] public class vCardSubpropertyTests diff --git a/Solution/Thought.vCards.UnitTests/vCardTests.cs b/Solution/Thought.vCards.UnitTests/vCardTests.cs index 2b53b0b..6a12f47 100644 --- a/Solution/Thought.vCards.UnitTests/vCardTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardTests.cs @@ -4,7 +4,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] diff --git a/Solution/Thought.vCards.UnitTests/vCardWebSiteTests.cs b/Solution/Thought.vCards.UnitTests/vCardWebSiteTests.cs index 73c86e0..ec21d80 100644 --- a/Solution/Thought.vCards.UnitTests/vCardWebSiteTests.cs +++ b/Solution/Thought.vCards.UnitTests/vCardWebSiteTests.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using Thought.vCards; -namespace Tests +namespace Thought.vCards.UnitTests { [TestFixture] public class vCardWebSiteTests diff --git a/Solution/Thought.vCards.UnitTests/vCards.VisualState.xml b/Solution/Thought.vCards.UnitTests/vCards.VisualState.xml deleted file mode 100644 index ba3c58c..0000000 --- a/Solution/Thought.vCards.UnitTests/vCards.VisualState.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - [0-1000]C:\vCards\Solution\Thought.vCards.UnitTests\vCards.nunit - [0-1203]C:\vCards\Solution\Thought.vCards.UnitTests\bin\Debug\Thought.vCards.UnitTests.dll - false - - - - - - - - - - \ No newline at end of file diff --git a/Solution/Thought.vCards.UnitTests/vCards.nunit b/Solution/Thought.vCards.UnitTests/vCards.nunit deleted file mode 100644 index 95d0c7d..0000000 --- a/Solution/Thought.vCards.UnitTests/vCards.nunit +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Solution/Thought.vCards.UnitTests/vssver2.scc b/Solution/Thought.vCards.UnitTests/vssver2.scc deleted file mode 100644 index 0f2e617..0000000 Binary files a/Solution/Thought.vCards.UnitTests/vssver2.scc and /dev/null differ diff --git a/Solution/Thought.vCards/Properties/AssemblyInfo.cs b/Solution/Thought.vCards/Properties/AssemblyInfo.cs deleted file mode 100644 index ececf18..0000000 --- a/Solution/Thought.vCards/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,41 +0,0 @@ - -using System; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Resources; - -// 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("vCard Class Library for .NET")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Thought Project")] -[assembly: AssemblyProduct("vCard Class Library for .NET")] -[assembly: AssemblyCopyright("Copyright © 2007-2009 David Pinch")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: CLSCompliant(true)] - -// 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("ab0c24ea-9dd4-45f9-9880-a1be0e3ae343")] - -// 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 Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("0.4.0.1")] -[assembly: AssemblyFileVersion("0.4.0.1")] -[assembly: NeutralResourcesLanguageAttribute("en-US")] diff --git a/Solution/Thought.vCards/Thought.vCards.csproj b/Solution/Thought.vCards/Thought.vCards.csproj index ba6364d..ba6af38 100644 --- a/Solution/Thought.vCards/Thought.vCards.csproj +++ b/Solution/Thought.vCards/Thought.vCards.csproj @@ -1,164 +1,28 @@  - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {A53D3CEB-F7AF-41AB-AA04-4D3CF684BBAF} - Library - Properties - Thought.vCards - Thought.vCards - - - 3.5 - - - true - v4.0 - http://localhost/Thought.Net.vCards/ - true - Web - true - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\Thought.vCards.xml - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - - - Thought.vCards.snk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - WarningMessages.resx - - - - - - - - - - Designer - ResXFileCodeGenerator - WarningMessages.Designer.cs - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - - - - - + + + {A53D3CEB-F7AF-41AB-AA04-4D3CF684BBAF} + netstandard20 + Thought Project + vCard Class Library for .NET + Copyright © 2007-2009 David Pinch + LGPL-2.1-or-later + 0.4.0.1 + 0.4.0.1 + 2.0.0 + David Pinch, Thought Project, Jamie Howarth + true + true + + + + + + + + + + + + \ No newline at end of file diff --git a/Solution/Thought.vCards/vCardStandardWriter.cs b/Solution/Thought.vCards/vCardStandardWriter.cs index f042f4f..b8cb77c 100644 --- a/Solution/Thought.vCards/vCardStandardWriter.cs +++ b/Solution/Thought.vCards/vCardStandardWriter.cs @@ -1432,8 +1432,8 @@ public static string EncodeQuotedPrintable(string value) } else { - builder.Append('='); - //builder.Append(v.ToString("X2")); + // builder.Append('='); + // builder.Append(v.ToString("X2")); var char_Bytes = System.Text.Encoding.UTF8.GetBytes(new char[] { c }); foreach (var char_byte in char_Bytes) {