Skip to content

Commit 7f765cb

Browse files
SteveDesmond-caSteveDesmond-ca
committed
Rename namespaces
1 parent 3078108 commit 7f765cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+153
-153
lines changed

Diff for: ‎.github/workflows/nuget.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: dotnet pack -c Release -p:ContinuousIntegrationBuild=true
2424

2525
- name: Publish app
26-
run: dotnet nuget push src/LibYear/bin/Release/libyear.$(echo ${{ github.ref }} | sed 's/refs\/tags\///').nupkg -k ${{ secrets.NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json
26+
run: dotnet nuget push src/LibYear/bin/Release/LibYear.$(echo ${{ github.ref }} | sed 's/refs\/tags\///').nupkg -k ${{ secrets.NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json
2727

2828
- name: Publish library
29-
run: dotnet nuget push src/LibYear.Lib/bin/Release/libyear-lib.$(echo ${{ github.ref }} | sed 's/refs\/tags\///').nupkg -k ${{ secrets.NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json
29+
run: dotnet nuget push src/LibYear.Core/bin/Release/LibYear.Core.$(echo ${{ github.ref }} | sed 's/refs\/tags\///').nupkg -k ${{ secrets.NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json

Diff for: ‎dotnet-libyear.sln

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.26228.9
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibYear.App", "src\LibYear\LibYear.App.csproj", "{013F1FC6-1C75-4989-97A6-915BC58A70F9}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibYear", "src\LibYear\LibYear.csproj", "{013F1FC6-1C75-4989-97A6-915BC58A70F9}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibYear.App.Tests", "test\LibYear.Tests\LibYear.App.Tests.csproj", "{1E796120-4E44-4CA2-B489-532D7D865F37}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibYear.Tests", "test\LibYear.Tests\LibYear.Tests.csproj", "{1E796120-4E44-4CA2-B489-532D7D865F37}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibYear.Lib", "src\LibYear.Lib\LibYear.Lib.csproj", "{94B51E20-1080-48AE-9160-FBB488050069}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibYear.Core", "src\LibYear.Core\LibYear.Core.csproj", "{94B51E20-1080-48AE-9160-FBB488050069}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibYear.Lib.Tests", "test\LibYear.Lib.Tests\LibYear.Lib.Tests.csproj", "{634DD86D-CA73-4C34-B5E6-125C87A47337}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibYear.Core.Tests", "test\LibYear.Core.Tests\LibYear.Core.Tests.csproj", "{634DD86D-CA73-4C34-B5E6-125C87A47337}"
1313
EndProject
1414
Global
1515
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Diff for: ‎src/LibYear.Lib/FileTypes/CsProjFile.cs renamed to ‎src/LibYear.Core/FileTypes/CsProjFile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace LibYear.Lib.FileTypes;
1+
namespace LibYear.Core.FileTypes;
22

33
public class CsProjFile : XmlProjectFile
44
{

Diff for: ‎src/LibYear.Lib/FileTypes/DirectoryBuildPropsFile.cs renamed to ‎src/LibYear.Core/FileTypes/DirectoryBuildPropsFile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace LibYear.Lib.FileTypes;
1+
namespace LibYear.Core.FileTypes;
22

33
public class DirectoryBuildPropsFile : XmlProjectFile
44
{

Diff for: ‎src/LibYear.Lib/FileTypes/DirectoryBuildTargetsFile.cs renamed to ‎src/LibYear.Core/FileTypes/DirectoryBuildTargetsFile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace LibYear.Lib.FileTypes;
1+
namespace LibYear.Core.FileTypes;
22

33
public class DirectoryBuildTargetsFile : XmlProjectFile
44
{

Diff for: ‎src/LibYear.Lib/FileTypes/IProjectFile.cs renamed to ‎src/LibYear.Core/FileTypes/IProjectFile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace LibYear.Lib.FileTypes;
1+
namespace LibYear.Core.FileTypes;
22

33
public interface IProjectFile
44
{

Diff for: ‎src/LibYear.Lib/FileTypes/PackagesConfigFile.cs renamed to ‎src/LibYear.Core/FileTypes/PackagesConfigFile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace LibYear.Lib.FileTypes;
1+
namespace LibYear.Core.FileTypes;
22

33
public class PackagesConfigFile : XmlProjectFile
44
{

Diff for: ‎src/LibYear.Lib/FileTypes/ProjectJsonFile.cs renamed to ‎src/LibYear.Core/FileTypes/ProjectJsonFile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Newtonsoft.Json.Linq;
22

3-
namespace LibYear.Lib.FileTypes;
3+
namespace LibYear.Core.FileTypes;
44

55
public class ProjectJsonFile : IProjectFile
66
{

Diff for: ‎src/LibYear.Lib/FileTypes/XmlProjectFile.cs renamed to ‎src/LibYear.Core/FileTypes/XmlProjectFile.cs

+79-79
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
using System.Xml.Linq;
2-
3-
namespace LibYear.Lib.FileTypes;
4-
5-
public abstract class XmlProjectFile : IProjectFile
6-
{
7-
private readonly XDocument _xmlContents;
8-
private readonly string _elementName;
9-
private readonly string[] _packageAttributeNames;
10-
private readonly string _versionAttributeName;
11-
private static readonly object _lock = new();
12-
13-
public string FileName { get; }
14-
public IDictionary<string, PackageVersion?> Packages { get; }
15-
16-
protected XmlProjectFile(string filename, string elementName, string[] packageAttributeNames, string versionAttributeName)
17-
{
18-
FileName = filename;
19-
20-
_elementName = elementName;
21-
_packageAttributeNames = packageAttributeNames;
22-
_versionAttributeName = versionAttributeName;
23-
24-
lock (_lock)
25-
{
26-
using var stream = new FileStream(FileName, FileMode.Open, FileAccess.Read, FileShare.Read);
27-
_xmlContents = XDocument.Load(stream);
28-
}
29-
30-
Packages = _xmlContents.Descendants(elementName)
31-
.ToDictionary(
32-
d => packageAttributeNames.Select(p => d.Attribute(p)?.Value ?? d.Element(p)?.Value).FirstOrDefault(v => v != null)!,
33-
d => ParseCurrentVersion(d, versionAttributeName)
34-
);
35-
}
36-
37-
public void Update(IEnumerable<Result> results)
38-
{
39-
lock (_lock)
40-
{
41-
foreach (var result in results.Where(r => r.Latest != null))
42-
{
43-
foreach (var element in GetElements(result))
44-
UpdateElement(element, result.Latest!.Version.ToString());
45-
}
46-
47-
using var stream = new FileStream(FileName, FileMode.Open, FileAccess.Write);
48-
new StreamWriter(stream).WriteAsync(_xmlContents.ToString()).GetAwaiter().GetResult();
49-
}
50-
}
51-
52-
private static PackageVersion? ParseCurrentVersion(XElement element, string versionAttributeName)
53-
{
54-
var version = element.Attribute(versionAttributeName)?.Value ?? element.Element(versionAttributeName)?.Value ?? string.Empty;
55-
return !string.IsNullOrEmpty(version) ? PackageVersion.Parse(version) : null;
56-
}
57-
58-
private void UpdateElement(XElement element, string latestVersion)
59-
{
60-
var attribute = element.Attribute(_versionAttributeName);
61-
if (attribute != null)
62-
{
63-
attribute.Value = latestVersion;
64-
return;
65-
}
66-
67-
var e = element.Element(_versionAttributeName);
68-
if (e != null)
69-
e.Value = latestVersion;
70-
}
71-
72-
private IEnumerable<XElement> GetElements(Result result)
73-
{
74-
return _xmlContents.Descendants(_elementName)
75-
.Where(d => _packageAttributeNames.Any(attributeName => (d.Attribute(attributeName)?.Value ?? d.Element(attributeName)?.Value) == result.Name
76-
&& (d.Attribute(_versionAttributeName)?.Value ?? d.Element(_versionAttributeName)?.Value) == result.Installed?.Version.ToString()
77-
)
78-
);
79-
}
1+
using System.Xml.Linq;
2+
3+
namespace LibYear.Core.FileTypes;
4+
5+
public abstract class XmlProjectFile : IProjectFile
6+
{
7+
private readonly XDocument _xmlContents;
8+
private readonly string _elementName;
9+
private readonly string[] _packageAttributeNames;
10+
private readonly string _versionAttributeName;
11+
private static readonly object _lock = new();
12+
13+
public string FileName { get; }
14+
public IDictionary<string, PackageVersion?> Packages { get; }
15+
16+
protected XmlProjectFile(string filename, string elementName, string[] packageAttributeNames, string versionAttributeName)
17+
{
18+
FileName = filename;
19+
20+
_elementName = elementName;
21+
_packageAttributeNames = packageAttributeNames;
22+
_versionAttributeName = versionAttributeName;
23+
24+
lock (_lock)
25+
{
26+
using var stream = new FileStream(FileName, FileMode.Open, FileAccess.Read, FileShare.Read);
27+
_xmlContents = XDocument.Load(stream);
28+
}
29+
30+
Packages = _xmlContents.Descendants(elementName)
31+
.ToDictionary(
32+
d => packageAttributeNames.Select(p => d.Attribute(p)?.Value ?? d.Element(p)?.Value).FirstOrDefault(v => v != null)!,
33+
d => ParseCurrentVersion(d, versionAttributeName)
34+
);
35+
}
36+
37+
public void Update(IEnumerable<Result> results)
38+
{
39+
lock (_lock)
40+
{
41+
foreach (var result in results.Where(r => r.Latest != null))
42+
{
43+
foreach (var element in GetElements(result))
44+
UpdateElement(element, result.Latest!.Version.ToString());
45+
}
46+
47+
using var stream = new FileStream(FileName, FileMode.Open, FileAccess.Write);
48+
new StreamWriter(stream).WriteAsync(_xmlContents.ToString()).GetAwaiter().GetResult();
49+
}
50+
}
51+
52+
private static PackageVersion? ParseCurrentVersion(XElement element, string versionAttributeName)
53+
{
54+
var version = element.Attribute(versionAttributeName)?.Value ?? element.Element(versionAttributeName)?.Value ?? string.Empty;
55+
return !string.IsNullOrEmpty(version) ? PackageVersion.Parse(version) : null;
56+
}
57+
58+
private void UpdateElement(XElement element, string latestVersion)
59+
{
60+
var attribute = element.Attribute(_versionAttributeName);
61+
if (attribute != null)
62+
{
63+
attribute.Value = latestVersion;
64+
return;
65+
}
66+
67+
var e = element.Element(_versionAttributeName);
68+
if (e != null)
69+
e.Value = latestVersion;
70+
}
71+
72+
private IEnumerable<XElement> GetElements(Result result)
73+
{
74+
return _xmlContents.Descendants(_elementName)
75+
.Where(d => _packageAttributeNames.Any(attributeName => (d.Attribute(attributeName)?.Value ?? d.Element(attributeName)?.Value) == result.Name
76+
&& (d.Attribute(_versionAttributeName)?.Value ?? d.Element(_versionAttributeName)?.Value) == result.Installed?.Version.ToString()
77+
)
78+
);
79+
}
8080
}

Diff for: ‎src/LibYear.Lib/FileUtils.cs renamed to ‎src/LibYear.Core/FileUtils.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using LibYear.Lib.FileTypes;
1+
using LibYear.Core.FileTypes;
22

3-
namespace LibYear.Lib;
3+
namespace LibYear.Core;
44

55
public static class FileUtils
66
{

Diff for: ‎src/LibYear.Lib/IPackageVersionChecker.cs renamed to ‎src/LibYear.Core/IPackageVersionChecker.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using LibYear.Lib.FileTypes;
1+
using LibYear.Core.FileTypes;
22

3-
namespace LibYear.Lib;
3+
namespace LibYear.Core;
44

55
public interface IPackageVersionChecker
66
{

Diff for: ‎src/LibYear.Lib/IProjectFileManager.cs renamed to ‎src/LibYear.Core/IProjectFileManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using LibYear.Lib.FileTypes;
1+
using LibYear.Core.FileTypes;
22

3-
namespace LibYear.Lib;
3+
namespace LibYear.Core;
44

55
public interface IProjectFileManager
66
{

Diff for: ‎src/LibYear.Lib/LibYear.Lib.csproj renamed to ‎src/LibYear.Core/LibYear.Core.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Version>5.0.0</Version>
3+
<Version>5.0.1</Version>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<Product>libyear</Product>
7-
<PackageId>libyear-lib</PackageId>
7+
<PackageId>LibYear.Core</PackageId>
88
<Authors>ecoAPM LLC</Authors>
99
<Company>ecoAPM LLC</Company>
1010
<Copyright>ecoAPM LLC</Copyright>

Diff for: ‎src/LibYear.Lib/PackageVersion.cs renamed to ‎src/LibYear.Core/PackageVersion.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using NuGet.Versioning;
22

3-
namespace LibYear.Lib;
3+
namespace LibYear.Core;
44

55
public sealed class PackageVersion : NuGetVersion
66
{

Diff for: ‎src/LibYear.Lib/PackageVersionChecker.cs renamed to ‎src/LibYear.Core/PackageVersionChecker.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using LibYear.Lib.FileTypes;
1+
using LibYear.Core.FileTypes;
22
using NuGet.Common;
33
using NuGet.Protocol.Core.Types;
44

5-
namespace LibYear.Lib;
5+
namespace LibYear.Core;
66

77
public class PackageVersionChecker : IPackageVersionChecker
88
{

Diff for: ‎src/LibYear.Lib/ProjectFileManager.cs renamed to ‎src/LibYear.Core/ProjectFileManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using LibYear.Lib.FileTypes;
1+
using LibYear.Core.FileTypes;
22

3-
namespace LibYear.Lib;
3+
namespace LibYear.Core;
44

55
public class ProjectFileManager : IProjectFileManager
66
{

Diff for: ‎src/LibYear.Lib/Release.cs renamed to ‎src/LibYear.Core/Release.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using NuGet.Protocol.Core.Types;
22

3-
namespace LibYear.Lib;
3+
namespace LibYear.Core;
44

55
public class Release
66
{

Diff for: ‎src/LibYear.Lib/Result.cs renamed to ‎src/LibYear.Core/Result.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace LibYear.Lib;
1+
namespace LibYear.Core;
22

33
public class Result
44
{

Diff for: ‎src/LibYear/LibYear.App.csproj renamed to ‎src/LibYear/LibYear.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Version>5.0.0</Version>
3+
<Version>5.0.1</Version>
44
<OutputType>Exe</OutputType>
55
<PackAsTool>true</PackAsTool>
66
<Product>libyear</Product>
7-
<PackageId>libyear</PackageId>
7+
<PackageId>LibYear</PackageId>
88
<ToolCommandName>dotnet-libyear</ToolCommandName>
99
<TargetFramework>net6.0</TargetFramework>
1010
<Authors>ecoAPM LLC</Authors>
@@ -21,8 +21,8 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all"/>
25-
<ProjectReference Include="../LibYear.Lib/LibYear.Lib.csproj"/>
26-
<None Include="../../README.md" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="."/>
24+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
25+
<ProjectReference Include="../LibYear.Core/LibYear.Core.csproj" />
26+
<None Include="../../README.md" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="." />
2727
</ItemGroup>
2828
</Project>

Diff for: ‎src/LibYear/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Collections.Concurrent;
2-
using LibYear.Lib;
2+
using LibYear.Core;
33
using NuGet.Configuration;
44
using NuGet.Protocol.Core.Types;
55

6-
namespace LibYear.App;
6+
namespace LibYear;
77

88
public static class Program
99
{

Diff for: ‎src/LibYear/Runner.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Text;
2-
using LibYear.Lib;
3-
using LibYear.Lib.FileTypes;
2+
using LibYear.Core;
3+
using LibYear.Core.FileTypes;
44

5-
namespace LibYear.App;
5+
namespace LibYear;
66

77
public class Runner
88
{

Diff for: ‎test/LibYear.Lib.Tests/FileTypes/CsProjFileTests.cs renamed to ‎test/LibYear.Core.Tests/FileTypes/CsProjFileTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using LibYear.Lib.FileTypes;
1+
using LibYear.Core.FileTypes;
22
using Xunit;
33

4-
namespace LibYear.Lib.Tests.FileTypes;
4+
namespace LibYear.Core.Tests.FileTypes;
55

66
public class CsProjFileTests
77
{

Diff for: ‎test/LibYear.Lib.Tests/FileTypes/Directory.Build.props renamed to ‎test/LibYear.Core.Tests/FileTypes/Directory.Build.props

File renamed without changes.

Diff for: ‎test/LibYear.Lib.Tests/FileTypes/Directory.Build.targets renamed to ‎test/LibYear.Core.Tests/FileTypes/Directory.Build.targets

File renamed without changes.

Diff for: ‎test/LibYear.Lib.Tests/FileTypes/DirectoryBuildPropsTests.cs renamed to ‎test/LibYear.Core.Tests/FileTypes/DirectoryBuildPropsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using LibYear.Lib.FileTypes;
1+
using LibYear.Core.FileTypes;
22
using Xunit;
33

4-
namespace LibYear.Lib.Tests.FileTypes;
4+
namespace LibYear.Core.Tests.FileTypes;
55

66
public class DirectoryBuildPropsTests
77
{

Diff for: ‎test/LibYear.Lib.Tests/FileTypes/DirectoryBuildTargetsTests.cs renamed to ‎test/LibYear.Core.Tests/FileTypes/DirectoryBuildTargetsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using LibYear.Lib.FileTypes;
1+
using LibYear.Core.FileTypes;
22
using Xunit;
33

4-
namespace LibYear.Lib.Tests.FileTypes;
4+
namespace LibYear.Core.Tests.FileTypes;
55

66
public class DirectoryBuildTargetsTests
77
{

0 commit comments

Comments
 (0)