Skip to content

Commit a0cce42

Browse files
nkolev92nkolev92
committed
address feedback
1 parent 85fae92 commit a0cce42

6 files changed

Lines changed: 58 additions & 225 deletions

File tree

‎src/NuGet.Core/NuGet.Packaging/NuspecReader.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,9 +437,9 @@ public RepositoryMetadata GetRepositoryMetadata()
437437

438438
if (licenseNode != null)
439439
{
440-
var type = licenseNode.Attribute(NuspecUtility.Type)?.Value.SafeTrim();
441-
var license = licenseNode.Value.SafeTrim();
442-
var versionValue = licenseNode.Attribute(NuspecUtility.Version)?.Value.SafeTrim();
440+
var type = licenseNode.Attribute(NuspecUtility.Type)?.Value?.Trim();
441+
var license = licenseNode.Value?.Trim();
442+
var versionValue = licenseNode.Attribute(NuspecUtility.Version)?.Value?.Trim();
443443

444444
var isKnownType = Enum.TryParse(type, ignoreCase: true, result: out LicenseType licenseType);
445445

‎src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/ManifestMetadata.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ private static PackageDependencyGroup CreatePackageDependencyGroup(PackageDepend
281281
{
282282
var dependenciesList = dependencyGroup.Packages.Select(dependency =>
283283
new PackageDependency(
284-
dependency.Id.SafeTrim()!,
284+
dependency.Id.Trim(),
285285
dependency.VersionRange,
286286
dependency.Include,
287287
dependency.Exclude)).ToList();

‎src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/ManifestReader.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private static void ReadMetadataValue(ManifestMetadata manifestMetadata, XElemen
7979
string? value = null;
8080
try
8181
{
82-
value = element.Value.SafeTrim();
82+
value = element.Value?.Trim();
8383
switch (element.Name.LocalName)
8484
{
8585
case "id":
@@ -180,9 +180,9 @@ private static IEnumerable<FrameworkReferenceGroup> ReadFrameworkReferenceGroups
180180

181181
private static LicenseMetadata ReadLicenseMetadata(XElement licenseNode)
182182
{
183-
var type = licenseNode.Attribute(NuspecUtility.Type)!.Value.SafeTrim();
184-
var license = licenseNode.Value.SafeTrim();
185-
var versionValue = licenseNode.Attribute(NuspecUtility.Version)?.Value.SafeTrim();
183+
var type = licenseNode.Attribute(NuspecUtility.Type)!.Value?.Trim();
184+
var license = licenseNode.Value?.Trim();
185+
var versionValue = licenseNode.Attribute(NuspecUtility.Version)?.Value?.Trim();
186186

187187
if (!Enum.TryParse(type, ignoreCase: true, result: out LicenseType licenseType))
188188
{
@@ -257,7 +257,7 @@ private static List<ManifestContentFiles> ReadContentFiles(XElement contentFiles
257257
let flattenAttribute = element.Attribute("flatten")
258258
select new ManifestContentFiles
259259
{
260-
Include = includeAttribute.Value.SafeTrim()!,
260+
Include = includeAttribute.Value.Trim(),
261261
Exclude = excludeAttribute == null ? null : excludeAttribute.Value,
262262
BuildAction = buildActionAttribute == null ? null : buildActionAttribute.Value,
263263
CopyToOutput = copyToOutputAttribute == null ? null : copyToOutputAttribute.Value,
@@ -415,14 +415,14 @@ private static ISet<PackageDependency> ReadDependencies(XElement containerElemen
415415
}
416416

417417
var slashes = new[] { '\\', '/' };
418-
var target = file.GetOptionalAttributeValue("target").SafeTrim()?.TrimStart(slashes);
419-
var exclude = file.GetOptionalAttributeValue("exclude").SafeTrim();
418+
var target = file.GetOptionalAttributeValue("target")?.Trim()?.TrimStart(slashes);
419+
var exclude = file.GetOptionalAttributeValue("exclude")?.Trim();
420420

421421
// Multiple sources can be specified by using semi-colon separated values.
422422
files.AddRange(srcElement.Value.Trim(';').Split(';').Select(s =>
423423
new ManifestFile
424424
{
425-
Source = s.SafeTrim(),
425+
Source = s?.Trim(),
426426
Target = target,
427427
Exclude = exclude
428428
}));

‎src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs‎

Lines changed: 41 additions & 212 deletions
Original file line numberDiff line numberDiff line change
@@ -156,271 +156,100 @@ private PackageBuilder(bool includeEmptyDirectories, bool deterministic, ILogger
156156
Properties = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
157157
}
158158

159-
public string Id
160-
{
161-
get;
162-
set;
163-
} = string.Empty; // Set to empty to enforce a stricter nullability contract.
164-
// This would get validate in the Save() method before writing the manifest
159+
// Set to empty to enforce a stricter nullability contract.
160+
// This would get validate in the Save() method before writing the manifest
161+
public string Id { get; set; } = string.Empty;
165162

166-
public NuGetVersion? Version
167-
{
168-
get;
169-
set;
170-
}
163+
public NuGetVersion? Version { get; set; }
171164

172165
public RepositoryMetadata? Repository { get; set; }
173166

174167
public LicenseMetadata? LicenseMetadata { get; set; }
175168

176-
public bool HasSnapshotVersion
177-
{
178-
get;
179-
set;
180-
}
169+
public bool HasSnapshotVersion { get; set; }
181170

182-
public string? Title
183-
{
184-
get;
185-
set;
186-
}
171+
public string? Title { get; set; }
187172

188-
public ISet<string> Authors
189-
{
190-
get;
191-
private set;
192-
}
173+
public ISet<string> Authors { get; private set; }
193174

194-
public ISet<string> Owners
195-
{
196-
get;
197-
private set;
198-
}
175+
public ISet<string> Owners { get; private set; }
199176

200-
public Uri? IconUrl
201-
{
202-
get;
203-
set;
204-
}
177+
public Uri? IconUrl { get; set; }
205178

206-
public string? Icon
207-
{
208-
get;
209-
set;
210-
}
179+
public string? Icon { get; set; }
211180

212-
public Uri? LicenseUrl
213-
{
214-
get;
215-
set;
216-
}
181+
public Uri? LicenseUrl { get; set; }
217182

218-
public Uri? ProjectUrl
219-
{
220-
get;
221-
set;
222-
}
183+
public Uri? ProjectUrl { get; set; }
223184

224-
public bool RequireLicenseAcceptance
225-
{
226-
get;
227-
set;
228-
}
185+
public bool RequireLicenseAcceptance { get; set; }
229186

230-
public bool EmitRequireLicenseAcceptance
231-
{
232-
get;
233-
set;
234-
} = true;
187+
public bool EmitRequireLicenseAcceptance { get; set; } = true;
235188

236-
public bool Serviceable
237-
{
238-
get;
239-
set;
240-
}
189+
public bool Serviceable { get; set; }
241190

242-
public bool DevelopmentDependency
243-
{
244-
get;
245-
set;
246-
}
191+
public bool DevelopmentDependency { get; set; }
247192

248-
public string? Description
249-
{
250-
get;
251-
set;
252-
}
193+
public string? Description { get; set; }
253194

254-
public string? Summary
255-
{
256-
get;
257-
set;
258-
}
195+
public string? Summary { get; set; }
259196

260-
public string? ReleaseNotes
261-
{
262-
get;
263-
set;
264-
}
197+
public string? ReleaseNotes { get; set; }
265198

266-
public string? Language
267-
{
268-
get;
269-
set;
270-
}
199+
public string? Language { get; set; }
271200

272-
public string? OutputName
273-
{
274-
get;
275-
set;
276-
}
201+
public string? OutputName { get; set; }
277202

278-
public ISet<string> Tags
279-
{
280-
get;
281-
private set;
282-
}
203+
public ISet<string> Tags { get; private set; }
283204

284205
public string? Readme { get; set; }
285206

286207
/// <summary>
287208
/// Exposes the additional properties extracted by the metadata
288209
/// extractor or received from the command line.
289210
/// </summary>
290-
public Dictionary<string, string> Properties
291-
{
292-
get;
293-
private set;
294-
}
211+
public Dictionary<string, string> Properties { get; private set; }
295212

296-
public string? Copyright
297-
{
298-
get;
299-
set;
300-
}
213+
public string? Copyright { get; set; }
301214

302-
public Collection<PackageDependencyGroup> DependencyGroups
303-
{
304-
get;
305-
private set;
306-
}
215+
public Collection<PackageDependencyGroup> DependencyGroups { get; private set; }
307216

308-
public ICollection<IPackageFile> Files
309-
{
310-
get;
311-
private set;
312-
}
217+
public ICollection<IPackageFile> Files { get; private set; }
313218

314-
public Collection<FrameworkAssemblyReference> FrameworkReferences
315-
{
316-
get;
317-
private set;
318-
}
219+
public Collection<FrameworkAssemblyReference> FrameworkReferences { get; private set; }
319220

320-
public Collection<FrameworkReferenceGroup> FrameworkReferenceGroups
321-
{
322-
get;
323-
private set;
324-
}
221+
public Collection<FrameworkReferenceGroup> FrameworkReferenceGroups { get; private set; }
325222

326-
public IList<NuGetFramework> TargetFrameworks
327-
{
328-
get;
329-
set;
330-
}
223+
public IList<NuGetFramework> TargetFrameworks { get; set; }
331224

332225
/// <summary>
333226
/// ContentFiles section from the manifest for content v2
334227
/// </summary>
335-
public ICollection<ManifestContentFiles> ContentFiles
336-
{
337-
get;
338-
private set;
339-
}
228+
public ICollection<ManifestContentFiles> ContentFiles { get; private set; }
340229

341-
public ICollection<PackageReferenceSet> PackageAssemblyReferences
342-
{
343-
get;
344-
set;
345-
}
230+
public ICollection<PackageReferenceSet> PackageAssemblyReferences { get; set; }
346231

347-
public ICollection<PackageType> PackageTypes
348-
{
349-
get;
350-
set;
351-
}
232+
public ICollection<PackageType> PackageTypes { get; set; }
352233

353-
IEnumerable<string> IPackageMetadata.Authors
354-
{
355-
get
356-
{
357-
return Authors;
358-
}
359-
}
234+
IEnumerable<string> IPackageMetadata.Authors => Authors;
360235

361-
IEnumerable<string> IPackageMetadata.Owners
362-
{
363-
get
364-
{
365-
return Owners;
366-
}
367-
}
236+
IEnumerable<string> IPackageMetadata.Owners => Owners;
368237

369-
string IPackageMetadata.Tags
370-
{
371-
get
372-
{
373-
return string.Join(" ", Tags);
374-
}
375-
}
238+
string IPackageMetadata.Tags => string.Join(" ", Tags);
376239

377-
IEnumerable<PackageReferenceSet> IPackageMetadata.PackageAssemblyReferences
378-
{
379-
get
380-
{
381-
return PackageAssemblyReferences;
382-
}
383-
}
240+
IEnumerable<PackageReferenceSet> IPackageMetadata.PackageAssemblyReferences => PackageAssemblyReferences;
384241

385-
IEnumerable<PackageDependencyGroup> IPackageMetadata.DependencyGroups
386-
{
387-
get
388-
{
389-
return DependencyGroups;
390-
}
391-
}
242+
IEnumerable<PackageDependencyGroup> IPackageMetadata.DependencyGroups => DependencyGroups;
392243

393-
IEnumerable<FrameworkAssemblyReference> IPackageMetadata.FrameworkReferences
394-
{
395-
get
396-
{
397-
return FrameworkReferences;
398-
}
399-
}
244+
IEnumerable<FrameworkAssemblyReference> IPackageMetadata.FrameworkReferences => FrameworkReferences;
400245

401-
IEnumerable<ManifestContentFiles> IPackageMetadata.ContentFiles
402-
{
403-
get
404-
{
405-
return ContentFiles;
406-
}
407-
}
246+
IEnumerable<ManifestContentFiles> IPackageMetadata.ContentFiles => ContentFiles;
408247

409-
IEnumerable<PackageType> IPackageMetadata.PackageTypes
410-
{
411-
get
412-
{
413-
return PackageTypes;
414-
}
415-
}
248+
IEnumerable<PackageType> IPackageMetadata.PackageTypes => PackageTypes;
416249

417250
IEnumerable<FrameworkReferenceGroup> IPackageMetadata.FrameworkReferenceGroups => FrameworkReferenceGroups;
418251

419-
public Version? MinClientVersion
420-
{
421-
get;
422-
set;
423-
}
252+
public Version? MinClientVersion { get; set; }
424253

425254
public void Save(Stream stream)
426255
{

‎src/NuGet.Core/NuGet.Packaging/PackageCreation/Extensions/StringExtensions.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4+
using System;
5+
46
namespace NuGet.Packaging
57
{
8+
[Obsolete("This class will be deleted in a future version of NuGet.Packaging.")]
69
internal static class StringExtensions
710
{
11+
[Obsolete("This class will be deleted in a future version of NuGet.Packaging.")]
812
public static string? SafeTrim(this string? value)
913
{
1014
return value == null ? null : value.Trim();

0 commit comments

Comments
 (0)