Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor namespaces #33

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
</PropertyGroup>

<ItemGroup Condition="'$(IsTestProject)' == 'true'">
<ItemGroup Condition=" $([System.Text.RegularExpressions.Regex]::IsMatch('$(MSBuildProjectName)', '\.Tests$')) ">
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
<PackageReference Include="NUnit"/>
<PackageReference Include="NUnit3TestAdapter"/>
Expand Down
22 changes: 11 additions & 11 deletions NoStringEvaluating.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ VisualStudioVersion = 17.3.32611.2
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating", "src\NoStringEvaluating\NoStringEvaluating.csproj", "{40AB411F-6002-4A69-A73F-17C5B7FC1508}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Tests", "src\NoStringEvaluating.Tests\NoStringEvaluating.Tests.csproj", "{48E04BE8-5BA6-409A-964E-13206F95BC8D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Tests", "tests\NoStringEvaluating.Tests\NoStringEvaluating.Tests.csproj", "{48E04BE8-5BA6-409A-964E-13206F95BC8D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{EA941063-94B8-4F97-A507-B5A7FD6A0B79}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "src\ConsoleApp\ConsoleApp.csproj", "{6A870F87-7BD9-4DB3-ACA2-0F2EFF9FB1D3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "tests\ConsoleApp\ConsoleApp.csproj", "{6A870F87-7BD9-4DB3-ACA2-0F2EFF9FB1D3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{88F0773E-1AA1-4C00-A8D8-F09B76A70BE9}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -19,24 +19,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Extensions.Microsoft.DependencyInjection", "src\NoStringEvaluating.Extensions.Microsoft.DependencyInjection\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.csproj", "{03E4E4C4-C186-4865-AC39-8E5E192D7F14}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests", "src\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests.csproj", "{95AC9D45-49F2-41A2-88BC-E800F932C356}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests", "tests\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests.csproj", "{95AC9D45-49F2-41A2-88BC-E800F932C356}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ci", "Ci", "{F2A9F436-5A49-486D-B4E1-B1B38924F61B}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ci", "ci", "{F2A9F436-5A49-486D-B4E1-B1B38924F61B}"
ProjectSection(SolutionItems) = preProject
.github\workflows\project-build.yml = .github\workflows\project-build.yml
.github\workflows\project-publish.yml = .github\workflows\project-publish.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cpm", "Cpm", "{D8A099DF-55FC-4F56-B15A-D969456AB5ED}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "style", "style", "{622175A5-34F5-4088-B32D-4BA905CE7C8C}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
CodeAnalysis.ruleset = CodeAnalysis.ruleset
stylecop.json = stylecop.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Style", "Style", "{622175A5-34F5-4088-B32D-4BA905CE7C8C}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cpm", "cpm", "{CC0CCADA-6B57-49BC-8FC4-0BB920C8A654}"
ProjectSection(SolutionItems) = preProject
CodeAnalysis.ruleset = CodeAnalysis.ruleset
stylecop.json = stylecop.json
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Global
Expand Down Expand Up @@ -96,8 +96,8 @@ Global
{6A870F87-7BD9-4DB3-ACA2-0F2EFF9FB1D3} = {EA941063-94B8-4F97-A507-B5A7FD6A0B79}
{95AC9D45-49F2-41A2-88BC-E800F932C356} = {EA941063-94B8-4F97-A507-B5A7FD6A0B79}
{F2A9F436-5A49-486D-B4E1-B1B38924F61B} = {88F0773E-1AA1-4C00-A8D8-F09B76A70BE9}
{D8A099DF-55FC-4F56-B15A-D969456AB5ED} = {88F0773E-1AA1-4C00-A8D8-F09B76A70BE9}
{622175A5-34F5-4088-B32D-4BA905CE7C8C} = {88F0773E-1AA1-4C00-A8D8-F09B76A70BE9}
{CC0CCADA-6B57-49BC-8FC4-0BB920C8A654} = {88F0773E-1AA1-4C00-A8D8-F09B76A70BE9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DFE0D26A-3674-46D1-80F0-2AA1855DA356}
Expand Down

This file was deleted.

16 changes: 0 additions & 16 deletions src/NoStringEvaluating.Tests/NoStringEvaluating.Tests.csproj

This file was deleted.

1 change: 1 addition & 0 deletions src/NoStringEvaluating/Factories/BooleanFactory.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NoStringEvaluating.Models.Values;
using NoStringEvaluating.Services.Value;

namespace NoStringEvaluating.Factories;

Expand Down
1 change: 1 addition & 0 deletions src/NoStringEvaluating/Factories/DateTimeFactory.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NoStringEvaluating.Models.Values;
using NoStringEvaluating.Services.Value;

namespace NoStringEvaluating.Factories;

Expand Down
1 change: 1 addition & 0 deletions src/NoStringEvaluating/Factories/NumberListFactory.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NoStringEvaluating.Models.Values;
using NoStringEvaluating.Services.Value;

namespace NoStringEvaluating.Factories;

Expand Down
1 change: 1 addition & 0 deletions src/NoStringEvaluating/Factories/ObjectFactory.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NoStringEvaluating.Models.Values;
using NoStringEvaluating.Services.Value;

namespace NoStringEvaluating.Factories;

Expand Down
1 change: 1 addition & 0 deletions src/NoStringEvaluating/Factories/ValueFactory.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NoStringEvaluating.Models.Values;
using NoStringEvaluating.Services.Value;

namespace NoStringEvaluating.Factories;

Expand Down
1 change: 1 addition & 0 deletions src/NoStringEvaluating/Factories/WordFactory.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NoStringEvaluating.Models.Values;
using NoStringEvaluating.Services.Value;

namespace NoStringEvaluating.Factories;

Expand Down
1 change: 1 addition & 0 deletions src/NoStringEvaluating/Factories/WordListFactory.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NoStringEvaluating.Models.Values;
using NoStringEvaluating.Services.Value;

namespace NoStringEvaluating.Factories;

Expand Down
72 changes: 36 additions & 36 deletions src/NoStringEvaluating/NoStringEvaluating.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Microsoft.Extensions.ObjectPool;
using NoStringEvaluating.Models.Values;

namespace NoStringEvaluating.Models.Values;
namespace NoStringEvaluating.Services.Value;

/// <summary>
/// Contains list of ids for extra types
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace NoStringEvaluating.Models.Values;
namespace NoStringEvaluating.Services.Value;

internal readonly struct ValueKeeperContainerReleaser(ValueKeeperContainer container) : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NoStringEvaluating\NoStringEvaluating.csproj" />
<ProjectReference Include="..\..\src\NoStringEvaluating\NoStringEvaluating.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using NoStringEvaluating.Services.Checking;
using NoStringEvaluating.Services.Parsing;
using NoStringEvaluating.Services.Parsing.NodeReaders;
using NoStringEvaluating.Services.Value;

namespace ConsoleApp;

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<ProjectReference Include="..\..\src\NoStringEvaluating.Extensions.Microsoft.DependencyInjection\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.csproj" />
</ItemGroup>

</Project>
11 changes: 11 additions & 0 deletions tests/NoStringEvaluating.Tests/NoStringEvaluating.Tests.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<ProjectReference Include="..\..\src\NoStringEvaluating\NoStringEvaluating.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Spectre.Console" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using NoStringEvaluating.Factories;
using NoStringEvaluating.Models.Values;
using NoStringEvaluating.Services.Value;

namespace NoStringEvaluating.Tests.UnitTests.Helpers;

Expand Down