Skip to content

Commit 13dd65f

Browse files
Felix-CodingClimberFelix-CodingClimber
authored
Merge pull request #6 from Felix-CodingClimber/dev-felix
Fixed major problem with namespace and class collisions.
2 parents df477da + d9e6b1f commit 13dd65f

27 files changed

+212
-321
lines changed

‎DotNetElements.Core.Result/Result.cs‎

Lines changed: 0 additions & 277 deletions
This file was deleted.

DotNetElements.Core.Result.Examples/DotNetElements.Core.Result.Examples.csproj renamed to DotNetElements.Core.ResultObject.Examples/DotNetElements.Core.ResultObject.Examples.csproj

File renamed without changes.

DotNetElements.Core.Result.Examples/ExampleError.cs renamed to DotNetElements.Core.ResultObject.Examples/ExampleError.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace DotNetElements.Core.Result.Examples;
1+
namespace DotNetElements.Core.ResultObject.Examples;
22

33
public enum ExampleError
44
{

DotNetElements.Core.Result.Examples/ExampleErrorResult.cs renamed to DotNetElements.Core.ResultObject.Examples/ExampleErrorResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace DotNetElements.Core.Result.Examples;
1+
namespace DotNetElements.Core.ResultObject.Examples;
22

33
[ErrorResult<ExampleError>]
44
public partial class ExampleErrorResult<TValue>;

DotNetElements.Core.Result.Examples/Program.cs renamed to DotNetElements.Core.ResultObject.Examples/Program.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using DotNetElements.Core.Result;
2-
using DotNetElements.Core.Result.Examples;
1+
using DotNetElements.Core.ResultObject;
2+
using DotNetElements.Core.ResultObject.Examples;
33

4-
using static DotNetElements.Core.Result.Examples.ExampleErrorResultHelper;
4+
using static DotNetElements.Core.ResultObject.Examples.ExampleErrorResultHelper;
55

66
ExampleErrorResult<string> result = GetExampleResult();
77

DotNetElements.Core.Result.SourceGenerator.Tests/CSharpCompilationDebugHelper.cs renamed to DotNetElements.Core.ResultObject.SourceGenerator.Tests/CSharpCompilationDebugHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Microsoft.CodeAnalysis;
22
using Microsoft.CodeAnalysis.CSharp;
33

4-
namespace DotNetElements.Core.Result.Tests;
4+
namespace DotNetElements.Core.ResultObject.Tests;
55

66
internal static class CSharpCompilationDebugHelper
77
{

DotNetElements.Core.Result.SourceGenerator.Tests/DotNetElements.Core.Result.SourceGenerator.Tests.csproj renamed to DotNetElements.Core.ResultObject.SourceGenerator.Tests/DotNetElements.Core.ResultObject.SourceGenerator.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<ProjectReference Include="..\DotNetElements.Core.Result.SourceGenerator\DotNetElements.Core.Result.SourceGenerator.csproj" />
28-
<ProjectReference Include="..\DotNetElements.Core.Result\DotNetElements.Core.Result.csproj" />
27+
<ProjectReference Include="..\DotNetElements.Core.ResultObject.SourceGenerator\DotNetElements.Core.ResultObject.SourceGenerator.csproj" />
28+
<ProjectReference Include="..\DotNetElements.Core.ResultObject\DotNetElements.Core.ResultObject.csproj" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

DotNetElements.Core.Result.SourceGenerator.Tests/ErrorResultGeneratorSnapshotTests.cs renamed to DotNetElements.Core.ResultObject.SourceGenerator.Tests/ErrorResultGeneratorSnapshotTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Runtime.InteropServices;
2-
using DotNetElements.Core.Result.SourceGenerator;
2+
using DotNetElements.Core.ResultObject.SourceGenerator;
33
using Microsoft.CodeAnalysis;
44
using Microsoft.CodeAnalysis.CSharp;
55

6-
namespace DotNetElements.Core.Result.Tests;
6+
namespace DotNetElements.Core.ResultObject.Tests;
77

88
[TestClass]
99
[UsesVerify]
@@ -13,10 +13,10 @@ public partial class ErrorResultGeneratorSnapshotTests
1313
public Task GeneratesErrorResultCorrectly()
1414
{
1515
string source =
16-
@"
17-
using DotNetElements.Core.Result;
16+
@"
17+
using DotNetElements.Core.ResultObject;
1818
19-
namespace DotNetElements.Core.Result.Examples;
19+
namespace DotNetElements.Core.ResultObject.Examples;
2020
2121
[ErrorResult<int>]
2222
public partial class ExampleResult<TValue>;

DotNetElements.Core.Result.SourceGenerator.Tests/ModuleInitializer.cs renamed to DotNetElements.Core.ResultObject.SourceGenerator.Tests/ModuleInitializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Runtime.CompilerServices;
22

3-
namespace DotNetElements.Core.Result.Tests;
3+
namespace DotNetElements.Core.ResultObject.Tests;
44

55
public static class ModuleInitializer
66
{

0 commit comments

Comments
 (0)