Skip to content

Commit 36f521d

Browse files
jacrysjacrys
committed
Merge branch 'v2.0.0'
2 parents bc41338 + 2e6997a commit 36f521d

File tree

15 files changed

+37
-294
lines changed

15 files changed

+37
-294
lines changed

‎ResumeSharpLib.sln‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ Global
1212
Debug|Any CPU = Debug|Any CPU
1313
Release|Any CPU = Release|Any CPU
1414
EndGlobalSection
15-
GlobalSection(SolutionProperties) = preSolution
16-
HideSolutionNode = FALSE
17-
EndGlobalSection
1815
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1916
{45C5B3D0-0611-40ED-92DB-E04FD7533AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2017
{45C5B3D0-0611-40ED-92DB-E04FD7533AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -25,4 +22,7 @@ Global
2522
{BF72CDF4-ADC9-4681-8F8A-8C8DEB4DF70F}.Release|Any CPU.ActiveCfg = Release|Any CPU
2623
{BF72CDF4-ADC9-4681-8F8A-8C8DEB4DF70F}.Release|Any CPU.Build.0 = Release|Any CPU
2724
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
2828
EndGlobal

‎ResumeSharpLib/Models/Award.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Newtonsoft.Json;
1+

2+
using Newtonsoft.Json;
23
using NodaTime;
34

45
namespace ResumeSharpLib

‎ResumeSharpLib/Models/Basics.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Newtonsoft.Json;
1+
using System.Collections.Generic;
2+
using Newtonsoft.Json;
23

34
namespace ResumeSharpLib
45
{

‎ResumeSharpLib/Models/Education.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Newtonsoft.Json;
1+
using System.Collections.Generic;
2+
using Newtonsoft.Json;
23
using NodaTime;
34

45
namespace ResumeSharpLib

‎ResumeSharpLib/Models/Interest.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Newtonsoft.Json;
1+
using System.Collections.Generic;
2+
using Newtonsoft.Json;
23

34
namespace ResumeSharpLib
45
{

‎ResumeSharpLib/Models/JsonResume.cs‎

Lines changed: 0 additions & 260 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88

99
namespace ResumeSharpLib
1010
{
11-
using System;
1211
using System.Collections.Generic;
1312

14-
using System.Globalization;
1513
using Newtonsoft.Json;
16-
using Newtonsoft.Json.Converters;
1714
using NodaTime;
1815
using NodaTime.Serialization.JsonNet;
1916

@@ -59,244 +56,6 @@ public partial class JsonResume
5956
public List<Project> Projects { get; set; }
6057
}
6158

62-
public partial class Basics
63-
{
64-
[JsonProperty("name")]
65-
public string Name { get; set; }
66-
67-
[JsonProperty("label")]
68-
public string Label { get; set; }
69-
70-
[JsonProperty("picture")]
71-
public string Picture { get; set; }
72-
73-
[JsonProperty("email")]
74-
public string Email { get; set; }
75-
76-
[JsonProperty("phone")]
77-
public string Phone { get; set; }
78-
79-
[JsonProperty("website")]
80-
public string Website { get; set; }
81-
82-
[JsonProperty("summary")]
83-
public string Summary { get; set; }
84-
85-
[JsonProperty("location")]
86-
public Location Location { get; set; }
87-
88-
[JsonProperty("profiles")]
89-
public List<Profile> Profiles { get; set; }
90-
}
91-
92-
public partial class Location
93-
{
94-
[JsonProperty("address")]
95-
public string Address { get; set; }
96-
97-
[JsonProperty("postalCode")]
98-
public string PostalCode { get; set; }
99-
100-
[JsonProperty("city")]
101-
public string City { get; set; }
102-
103-
[JsonProperty("countryCode")]
104-
public string CountryCode { get; set; }
105-
106-
[JsonProperty("region")]
107-
public string Region { get; set; }
108-
}
109-
110-
public partial class Profile
111-
{
112-
[JsonProperty("network")]
113-
public string Network { get; set; }
114-
115-
[JsonProperty("username")]
116-
public string Username { get; set; }
117-
118-
[JsonProperty("url")]
119-
public string Url { get; set; }
120-
}
121-
122-
public partial class Work
123-
{
124-
[JsonProperty("organization", NullValueHandling = NullValueHandling.Ignore)]
125-
public string Organization { get; set; }
126-
127-
[JsonProperty("position")]
128-
public string Position { get; set; }
129-
130-
[JsonProperty("website")]
131-
public string Website { get; set; }
132-
133-
[JsonProperty("startDate")]
134-
public OffsetDateTime StartDate { get; set; }
135-
136-
[JsonProperty("endDate")]
137-
public OffsetDateTime EndDate { get; set; }
138-
139-
[JsonProperty("summary")]
140-
public string Summary { get; set; }
141-
142-
[JsonProperty("highlights")]
143-
public List<string> Highlights { get; set; }
144-
145-
[JsonProperty("company", NullValueHandling = NullValueHandling.Ignore)]
146-
public string Company { get; set; }
147-
}
148-
149-
public partial class Volunteer
150-
{
151-
[JsonProperty("organization", NullValueHandling = NullValueHandling.Ignore)]
152-
public string Organization { get; set; }
153-
154-
[JsonProperty("position")]
155-
public string Position { get; set; }
156-
157-
[JsonProperty("website")]
158-
public string Website { get; set; }
159-
160-
[JsonProperty("startDate")]
161-
public OffsetDateTime StartDate { get; set; }
162-
163-
[JsonProperty("endDate")]
164-
public OffsetDateTime EndDate { get; set; }
165-
166-
[JsonProperty("summary")]
167-
public string Summary { get; set; }
168-
169-
[JsonProperty("highlights")]
170-
public List<string> Highlights { get; set; }
171-
172-
[JsonProperty("company", NullValueHandling = NullValueHandling.Ignore)]
173-
public string Company { get; set; }
174-
}
175-
176-
public partial class Education
177-
{
178-
[JsonProperty("institution")]
179-
public string Institution { get; set; }
180-
181-
[JsonProperty("area")]
182-
public string Area { get; set; }
183-
184-
[JsonProperty("studyType")]
185-
public string StudyType { get; set; }
186-
187-
[JsonProperty("startDate")]
188-
public OffsetDateTime StartDate { get; set; }
189-
190-
[JsonProperty("endDate")]
191-
public OffsetDateTime EndDate { get; set; }
192-
193-
[JsonProperty("gpa")]
194-
public string Gpa { get; set; }
195-
196-
[JsonProperty("courses")]
197-
public List<string> Courses { get; set; }
198-
}
199-
200-
public partial class Award
201-
{
202-
[JsonProperty("title")]
203-
public string Title { get; set; }
204-
205-
[JsonProperty("date")]
206-
public OffsetDateTime Date { get; set; }
207-
208-
[JsonProperty("awarder")]
209-
public string Awarder { get; set; }
210-
211-
[JsonProperty("summary")]
212-
public string Summary { get; set; }
213-
}
214-
215-
public partial class Certificate
216-
{
217-
[JsonProperty("name")]
218-
public string Name { get; set; }
219-
[JsonProperty("date")]
220-
public OffsetDateTime Date { get; set; }
221-
[JsonProperty("issuer")]
222-
public string Issuer { get; set; }
223-
[JsonProperty("url")]
224-
public string Url { get; set; }
225-
}
226-
227-
public partial class Publication
228-
{
229-
[JsonProperty("name")]
230-
public string Name { get; set; }
231-
232-
[JsonProperty("publisher")]
233-
public string Publisher { get; set; }
234-
235-
[JsonProperty("releaseDate")]
236-
public OffsetDateTime ReleaseDate { get; set; }
237-
238-
[JsonProperty("website")]
239-
public string Website { get; set; }
240-
241-
[JsonProperty("summary")]
242-
public string Summary { get; set; }
243-
}
244-
245-
public partial class Skill
246-
{
247-
[JsonProperty("name")]
248-
public string Name { get; set; }
249-
250-
[JsonProperty("level")]
251-
public string Level { get; set; }
252-
253-
[JsonProperty("keywords")]
254-
public List<string> Keywords { get; set; }
255-
}
256-
257-
public partial class Language
258-
{
259-
[JsonProperty("language")]
260-
public string LanguageLanguage { get; set; }
261-
262-
[JsonProperty("fluency")]
263-
public string Fluency { get; set; }
264-
}
265-
266-
public partial class Interest
267-
{
268-
[JsonProperty("name")]
269-
public string Name { get; set; }
270-
271-
[JsonProperty("keywords")]
272-
public List<string> Keywords { get; set; }
273-
}
274-
275-
public partial class Reference
276-
{
277-
[JsonProperty("name")]
278-
public string Name { get; set; }
279-
280-
[JsonProperty("reference")]
281-
public string ReferenceReference { get; set; }
282-
}
283-
284-
public partial class Project
285-
{
286-
[JsonProperty("name")]
287-
public string Name { get; set; }
288-
[JsonProperty("description")]
289-
public string Description { get; set; }
290-
[JsonProperty("highlights")]
291-
public List<string> Highlights { get; set; }
292-
[JsonProperty("startDate")]
293-
public OffsetDateTime StartDate { get; set; }
294-
[JsonProperty("endDate")]
295-
public OffsetDateTime EndDate { get; set; }
296-
[JsonProperty("url")]
297-
public string Url { get; set; }
298-
}
299-
30059
public partial class JsonResume
30160
{
30261
/// <summary>
@@ -306,23 +65,4 @@ public partial class JsonResume
30665
/// <returns></returns>
30766
public static JsonResume FromJson(string json) => JsonConvert.DeserializeObject<JsonResume>(json, Converter.Settings);
30867
}
309-
310-
public static class Serialize
311-
{
312-
/// <summary>
313-
/// Convert the JsonResume object to json
314-
/// </summary>
315-
/// <param name="self"></param>
316-
/// <returns></returns>
317-
public static string ToJson(this JsonResume self) => JsonConvert.SerializeObject(self, Converter.Settings);
318-
}
319-
320-
internal static class Converter
321-
{
322-
public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
323-
{
324-
MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
325-
DateParseHandling = DateParseHandling.None
326-
}.ConfigureForNodaTime(NodaTime.DateTimeZoneProviders.Tzdb);
327-
}
32868
}

‎ResumeSharpLib/Models/Project.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Newtonsoft.Json;
1+
using System.Collections.Generic;
2+
using Newtonsoft.Json;
23
using NodaTime;
34

45
namespace ResumeSharpLib

‎ResumeSharpLib/Models/Serializers.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
using Newtonsoft.Json;
2-
using System;
3-
using System.Collections.Generic;
4-
using System.Text;
52

63
namespace ResumeSharpLib
74
{

‎ResumeSharpLib/Models/Skill.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Newtonsoft.Json;
1+
using System.Collections.Generic;
2+
using Newtonsoft.Json;
23

34
namespace ResumeSharpLib
45
{

‎ResumeSharpLib/Models/Volunteer.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Newtonsoft.Json;
1+
using System.Collections.Generic;
2+
using Newtonsoft.Json;
23
using NodaTime;
34

45
namespace ResumeSharpLib

0 commit comments

Comments
 (0)