Skip to content

Commit

Permalink
Merge pull request #138 from MarkusMeyer13/master
Browse files Browse the repository at this point in the history
#106 Organize folder structure
  • Loading branch information
MarkusMeyer13 authored Mar 5, 2020
2 parents 6b8a902 + 87b23d6 commit 1657424
Show file tree
Hide file tree
Showing 49 changed files with 25 additions and 19 deletions.
18 changes: 12 additions & 6 deletions PlanB.Butler.Bot.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29403.142
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Bot", "PlanB.Butler.Bot\PlanB.Butler.Bot.csproj", "{C8440EB0-CF33-415D-8B72-12901F76F7C3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Library", "PlanB.Butler.Library\PlanB.Butler.Library\PlanB.Butler.Library.csproj", "{26210E9D-B09C-4AFA-891B-79CCBE5EC948}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Library.Test", "PlanB.Butler.Library\PlanB.Butler.Library.Test\PlanB.Butler.Library.Test.csproj", "{03872204-0270-48AF-902B-F7DA07019174}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Bot", "PlanB.Butler.Bot\PlanB.Butler.Bot\PlanB.Butler.Bot.csproj", "{AD86FDE0-D566-4332-96DF-406C9D7F5710}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Bot.Test", "PlanB.Butler.Bot\PlanB.Butler.Bot.Test\PlanB.Butler.Bot.Test.csproj", "{43FEFA53-4B93-46E3-AD14-A96439C3FBA3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C8440EB0-CF33-415D-8B72-12901F76F7C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8440EB0-CF33-415D-8B72-12901F76F7C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8440EB0-CF33-415D-8B72-12901F76F7C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C8440EB0-CF33-415D-8B72-12901F76F7C3}.Release|Any CPU.Build.0 = Release|Any CPU
{26210E9D-B09C-4AFA-891B-79CCBE5EC948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26210E9D-B09C-4AFA-891B-79CCBE5EC948}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26210E9D-B09C-4AFA-891B-79CCBE5EC948}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -27,6 +25,14 @@ Global
{03872204-0270-48AF-902B-F7DA07019174}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03872204-0270-48AF-902B-F7DA07019174}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03872204-0270-48AF-902B-F7DA07019174}.Release|Any CPU.Build.0 = Release|Any CPU
{AD86FDE0-D566-4332-96DF-406C9D7F5710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AD86FDE0-D566-4332-96DF-406C9D7F5710}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD86FDE0-D566-4332-96DF-406C9D7F5710}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AD86FDE0-D566-4332-96DF-406C9D7F5710}.Release|Any CPU.Build.0 = Release|Any CPU
{43FEFA53-4B93-46E3-AD14-A96439C3FBA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43FEFA53-4B93-46E3-AD14-A96439C3FBA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43FEFA53-4B93-46E3-AD14-A96439C3FBA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43FEFA53-4B93-46E3-AD14-A96439C3FBA3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void Init()
[ExpectedException(typeof(NullReferenceException))]
public void PlanNullIdentifierEmpty()
{
var result = NextOrder.GetChoice(string.Empty, this.plan);
var result = NextOrder.GetChoice(string.Empty, null);
Assert.IsNotNull(result);
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\PlanB.Butler.Library\PlanB.Butler.Library\PlanB.Butler.Library.csproj" />
<ProjectReference Include="..\..\PlanB.Butler.Library\PlanB.Butler.Library\PlanB.Butler.Library.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
22 changes: 11 additions & 11 deletions PlanB.Butler.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29721.120
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Bot", "PlanB.Butler.Bot\PlanB.Butler.Bot.csproj", "{40B90D6D-C3CD-4035-BAD6-2A39D1D4C541}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Library", "PlanB.Butler.Library\PlanB.Butler.Library\PlanB.Butler.Library.csproj", "{6D32C6F7-F75C-4918-BD92-B86985D88466}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Library.Test", "PlanB.Butler.Library\PlanB.Butler.Library.Test\PlanB.Butler.Library.Test.csproj", "{E95B13A2-25BE-458F-8631-85DF38EA6A60}"
Expand All @@ -13,18 +11,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Services", "Pl
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Services.Test", "PlanB.Butler.Services\PlanB.Butler.Services.Test\PlanB.Butler.Services.Test.csproj", "{5DC67115-3051-44E2-A69F-C9694D2BDD0D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlanB.Butler.Bot.Test", "PlanB.Butler.Bot.Test\PlanB.Butler.Bot.Test.csproj", "{C2C38FE1-E107-4694-91AE-69E951979E96}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Bot", "PlanB.Butler.Bot\PlanB.Butler.Bot\PlanB.Butler.Bot.csproj", "{35F5CE51-75E7-4122-99F2-38B70785FFEA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlanB.Butler.Bot.Test", "PlanB.Butler.Bot\PlanB.Butler.Bot.Test\PlanB.Butler.Bot.Test.csproj", "{BF6B6DD7-4357-40ED-A224-8A78E0639467}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{40B90D6D-C3CD-4035-BAD6-2A39D1D4C541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40B90D6D-C3CD-4035-BAD6-2A39D1D4C541}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40B90D6D-C3CD-4035-BAD6-2A39D1D4C541}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40B90D6D-C3CD-4035-BAD6-2A39D1D4C541}.Release|Any CPU.Build.0 = Release|Any CPU
{6D32C6F7-F75C-4918-BD92-B86985D88466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6D32C6F7-F75C-4918-BD92-B86985D88466}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6D32C6F7-F75C-4918-BD92-B86985D88466}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -41,10 +37,14 @@ Global
{5DC67115-3051-44E2-A69F-C9694D2BDD0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DC67115-3051-44E2-A69F-C9694D2BDD0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5DC67115-3051-44E2-A69F-C9694D2BDD0D}.Release|Any CPU.Build.0 = Release|Any CPU
{C2C38FE1-E107-4694-91AE-69E951979E96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C2C38FE1-E107-4694-91AE-69E951979E96}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2C38FE1-E107-4694-91AE-69E951979E96}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2C38FE1-E107-4694-91AE-69E951979E96}.Release|Any CPU.Build.0 = Release|Any CPU
{35F5CE51-75E7-4122-99F2-38B70785FFEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{35F5CE51-75E7-4122-99F2-38B70785FFEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{35F5CE51-75E7-4122-99F2-38B70785FFEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{35F5CE51-75E7-4122-99F2-38B70785FFEA}.Release|Any CPU.Build.0 = Release|Any CPU
{BF6B6DD7-4357-40ED-A224-8A78E0639467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF6B6DD7-4357-40ED-A224-8A78E0639467}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF6B6DD7-4357-40ED-A224-8A78E0639467}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF6B6DD7-4357-40ED-A224-8A78E0639467}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit 1657424

Please sign in to comment.