Merge branch 'v2.0.0'

ResumeSharpLib.sln

@@ -12,9 +12,6 @@ Global
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{45C5B3D0-0611-40ED-92DB-E04FD7533AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{45C5B3D0-0611-40ED-92DB-E04FD7533AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -25,4 +22,7 @@ Global
 		{BF72CDF4-ADC9-4681-8F8A-8C8DEB4DF70F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF72CDF4-ADC9-4681-8F8A-8C8DEB4DF70F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal

ResumeSharpLib/Models/Award.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+
+using Newtonsoft.Json;
 using NodaTime;
 
 namespace ResumeSharpLib

ResumeSharpLib/Models/Basics.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace ResumeSharpLib
 {

ResumeSharpLib/Models/Education.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 using NodaTime;
 
 namespace ResumeSharpLib

ResumeSharpLib/Models/Interest.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace ResumeSharpLib
 {

ResumeSharpLib/Models/JsonResume.cs

@@ -8,12 +8,9 @@
 
 namespace ResumeSharpLib
 {
-	using System;
 	using System.Collections.Generic;
 
-	using System.Globalization;
 	using Newtonsoft.Json;
-	using Newtonsoft.Json.Converters;
 	using NodaTime;
     using NodaTime.Serialization.JsonNet;
 
@@ -59,244 +56,6 @@ public partial class JsonResume
 		public List<Project> Projects { get; set; }
     }
 
-    public partial class Basics
-    {
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("label")]
-        public string Label { get; set; }
-
-        [JsonProperty("picture")]
-        public string Picture { get; set; }
-
-        [JsonProperty("email")]
-        public string Email { get; set; }
-
-        [JsonProperty("phone")]
-        public string Phone { get; set; }
-
-        [JsonProperty("website")]
-        public string Website { get; set; }
-
-        [JsonProperty("summary")]
-        public string Summary { get; set; }
-
-        [JsonProperty("location")]
-        public Location Location { get; set; }
-
-        [JsonProperty("profiles")]
-        public List<Profile> Profiles { get; set; }
-    }
-
-    public partial class Location
-    {
-        [JsonProperty("address")]
-        public string Address { get; set; }
-
-        [JsonProperty("postalCode")]
-        public string PostalCode { get; set; }
-
-        [JsonProperty("city")]
-        public string City { get; set; }
-
-        [JsonProperty("countryCode")]
-        public string CountryCode { get; set; }
-
-        [JsonProperty("region")]
-        public string Region { get; set; }
-    }
-
-    public partial class Profile
-    {
-        [JsonProperty("network")]
-        public string Network { get; set; }
-
-        [JsonProperty("username")]
-        public string Username { get; set; }
-
-        [JsonProperty("url")]
-        public string Url { get; set; }
-    }
-
-    public partial class Work
-    {
-        [JsonProperty("organization", NullValueHandling = NullValueHandling.Ignore)]
-        public string Organization { get; set; }
-
-        [JsonProperty("position")]
-        public string Position { get; set; }
-
-        [JsonProperty("website")]
-        public string Website { get; set; }
-
-        [JsonProperty("startDate")]
-        public OffsetDateTime StartDate { get; set; }
-
-        [JsonProperty("endDate")]
-        public OffsetDateTime EndDate { get; set; }
-
-        [JsonProperty("summary")]
-        public string Summary { get; set; }
-
-        [JsonProperty("highlights")]
-        public List<string> Highlights { get; set; }
-
-        [JsonProperty("company", NullValueHandling = NullValueHandling.Ignore)]
-        public string Company { get; set; }
-    }
-
-    public partial class Volunteer
-    {
-        [JsonProperty("organization", NullValueHandling = NullValueHandling.Ignore)]
-        public string Organization { get; set; }
-
-        [JsonProperty("position")]
-        public string Position { get; set; }
-
-        [JsonProperty("website")]
-        public string Website { get; set; }
-
-        [JsonProperty("startDate")]
-        public OffsetDateTime StartDate { get; set; }
-
-        [JsonProperty("endDate")]
-        public OffsetDateTime EndDate { get; set; }
-
-        [JsonProperty("summary")]
-        public string Summary { get; set; }
-
-        [JsonProperty("highlights")]
-        public List<string> Highlights { get; set; }
-
-        [JsonProperty("company", NullValueHandling = NullValueHandling.Ignore)]
-        public string Company { get; set; }
-    }
-
-    public partial class Education
-    {
-        [JsonProperty("institution")]
-        public string Institution { get; set; }
-
-        [JsonProperty("area")]
-        public string Area { get; set; }
-
-        [JsonProperty("studyType")]
-        public string StudyType { get; set; }
-
-        [JsonProperty("startDate")]
-        public OffsetDateTime StartDate { get; set; }
-
-        [JsonProperty("endDate")]
-        public OffsetDateTime EndDate { get; set; }
-
-        [JsonProperty("gpa")]
-        public string Gpa { get; set; }
-
-        [JsonProperty("courses")]
-        public List<string> Courses { get; set; }
-    }
-
-    public partial class Award
-	{
-		[JsonProperty("title")]
-		public string Title { get; set; }
-
-		[JsonProperty("date")]
-		public OffsetDateTime Date { get; set; }
-
-		[JsonProperty("awarder")]
-		public string Awarder { get; set; }
-
-		[JsonProperty("summary")]
-		public string Summary { get; set; }
-	}
-
-    public partial class Certificate
-    {
-        [JsonProperty("name")]
-        public string Name { get; set; }
-        [JsonProperty("date")]
-        public OffsetDateTime Date { get; set; }
-        [JsonProperty("issuer")]
-        public string Issuer { get; set; }
-        [JsonProperty("url")]
-        public string Url { get; set; }
-    }
-
-    public partial class Publication
-    {
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("publisher")]
-        public string Publisher { get; set; }
-
-        [JsonProperty("releaseDate")]
-        public OffsetDateTime ReleaseDate { get; set; }
-
-        [JsonProperty("website")]
-        public string Website { get; set; }
-
-        [JsonProperty("summary")]
-        public string Summary { get; set; }
-    }
-
-    public partial class Skill
-    {
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("level")]
-        public string Level { get; set; }
-
-        [JsonProperty("keywords")]
-        public List<string> Keywords { get; set; }
-    }
-
-    public partial class Language
-    {
-        [JsonProperty("language")]
-        public string LanguageLanguage { get; set; }
-
-        [JsonProperty("fluency")]
-        public string Fluency { get; set; }
-    }
-
-    public partial class Interest
-	{
-		[JsonProperty("name")]
-		public string Name { get; set; }
-
-		[JsonProperty("keywords")]
-		public List<string> Keywords { get; set; }
-	}
-
-	public partial class Reference
-	{
-		[JsonProperty("name")]
-		public string Name { get; set; }
-
-		[JsonProperty("reference")]
-		public string ReferenceReference { get; set; }
-	}
-
-	public partial class Project
-    {
-        [JsonProperty("name")]
-        public string Name { get; set; }
-        [JsonProperty("description")]
-        public string Description { get; set; }
-        [JsonProperty("highlights")]
-        public List<string> Highlights { get; set; }
-        [JsonProperty("startDate")]
-        public OffsetDateTime StartDate { get; set; }
-        [JsonProperty("endDate")]
-        public OffsetDateTime EndDate { get; set; }
-        [JsonProperty("url")]
-        public string Url { get; set; }
-    }
-
     public partial class JsonResume
 	{
 		/// <summary>
@@ -306,23 +65,4 @@ public partial class JsonResume
 		/// <returns></returns>
 		public static JsonResume FromJson(string json) => JsonConvert.DeserializeObject<JsonResume>(json, Converter.Settings);
 	}
-
-	public static class Serialize
-	{
-		/// <summary>
-		/// Convert the JsonResume object to json
-		/// </summary>
-		/// <param name="self"></param>
-		/// <returns></returns>
-		public static string ToJson(this JsonResume self) => JsonConvert.SerializeObject(self, Converter.Settings);
-	}
-
-    internal static class Converter
-    {
-        public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
-        {
-            MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
-            DateParseHandling = DateParseHandling.None
-        }.ConfigureForNodaTime(NodaTime.DateTimeZoneProviders.Tzdb);
-    }
 }

ResumeSharpLib/Models/Project.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 using NodaTime;
 
 namespace ResumeSharpLib

ResumeSharpLib/Models/Serializers.cs

@@ -1,7 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace ResumeSharpLib
 {

ResumeSharpLib/Models/Skill.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace ResumeSharpLib
 {

ResumeSharpLib/Models/Volunteer.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 using NodaTime;
 
 namespace ResumeSharpLib

ResumeSharpLib/Models/Work.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 using NodaTime;
 
 namespace ResumeSharpLib

ResumeSharpLib/ResumeSharpLib.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;net9.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>ResumeSharpLib</PackageId>
     <Description>A library for creating and manipulating Json Resume object it in C#</Description>
@@ -15,7 +15,19 @@
     <RepositoryType>public</RepositoryType>
     <RepositoryUrl>https://github.com/jacrys/ResumeSharpLib</RepositoryUrl>
     <RepositoryCommit></RepositoryCommit>
+    <IncludeSymbols>True</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <Title>ResumeSharpLib</Title>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NodaTime" Version="3.2.0" />