diff --git a/IRCSharp.Tests/IRCSharp.Tests.csproj b/IRCSharp.Tests/IRCSharp.Tests.csproj
new file mode 100644
index 0000000..e068b60
--- /dev/null
+++ b/IRCSharp.Tests/IRCSharp.Tests.csproj
@@ -0,0 +1,31 @@
+
+
+
+ net5.0
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
+
diff --git a/IRCStates/Tests/Cap.cs b/IRCSharp.Tests/State/Cap.cs
similarity index 100%
rename from IRCStates/Tests/Cap.cs
rename to IRCSharp.Tests/State/Cap.cs
diff --git a/IRCStates/Tests/Casemap.cs b/IRCSharp.Tests/State/Casemap.cs
similarity index 100%
rename from IRCStates/Tests/Casemap.cs
rename to IRCSharp.Tests/State/Casemap.cs
diff --git a/IRCStates/Tests/Channel.cs b/IRCSharp.Tests/State/Channel.cs
similarity index 100%
rename from IRCStates/Tests/Channel.cs
rename to IRCSharp.Tests/State/Channel.cs
diff --git a/IRCStates/Tests/Emit.cs b/IRCSharp.Tests/State/Emit.cs
similarity index 100%
rename from IRCStates/Tests/Emit.cs
rename to IRCSharp.Tests/State/Emit.cs
diff --git a/IRCStates/Tests/ISupport.cs b/IRCSharp.Tests/State/ISupport.cs
similarity index 100%
rename from IRCStates/Tests/ISupport.cs
rename to IRCSharp.Tests/State/ISupport.cs
diff --git a/IRCStates/Tests/Mode.cs b/IRCSharp.Tests/State/Mode.cs
similarity index 100%
rename from IRCStates/Tests/Mode.cs
rename to IRCSharp.Tests/State/Mode.cs
diff --git a/IRCStates/Tests/Motd.cs b/IRCSharp.Tests/State/Motd.cs
similarity index 100%
rename from IRCStates/Tests/Motd.cs
rename to IRCSharp.Tests/State/Motd.cs
diff --git a/IRCStates/Tests/Sasl.cs b/IRCSharp.Tests/State/Sasl.cs
similarity index 100%
rename from IRCStates/Tests/Sasl.cs
rename to IRCSharp.Tests/State/Sasl.cs
diff --git a/IRCStates/Tests/User.cs b/IRCSharp.Tests/State/User.cs
similarity index 100%
rename from IRCStates/Tests/User.cs
rename to IRCSharp.Tests/State/User.cs
diff --git a/IRCStates/Tests/Who.cs b/IRCSharp.Tests/State/Who.cs
similarity index 100%
rename from IRCStates/Tests/Who.cs
rename to IRCSharp.Tests/State/Who.cs
diff --git a/IRCTokens/Tests/Data/JoinModel.cs b/IRCSharp.Tests/Tokenization/Data/JoinModel.cs
similarity index 100%
rename from IRCTokens/Tests/Data/JoinModel.cs
rename to IRCSharp.Tests/Tokenization/Data/JoinModel.cs
diff --git a/IRCTokens/Tests/Data/SplitModel.cs b/IRCSharp.Tests/Tokenization/Data/SplitModel.cs
similarity index 100%
rename from IRCTokens/Tests/Data/SplitModel.cs
rename to IRCSharp.Tests/Tokenization/Data/SplitModel.cs
diff --git a/IRCTokens/Tests/Data/msg-join.yaml b/IRCSharp.Tests/Tokenization/Data/msg-join.yaml
similarity index 100%
rename from IRCTokens/Tests/Data/msg-join.yaml
rename to IRCSharp.Tests/Tokenization/Data/msg-join.yaml
diff --git a/IRCTokens/Tests/Data/msg-split.yaml b/IRCSharp.Tests/Tokenization/Data/msg-split.yaml
similarity index 100%
rename from IRCTokens/Tests/Data/msg-split.yaml
rename to IRCSharp.Tests/Tokenization/Data/msg-split.yaml
diff --git a/IRCTokens/Tests/Format.cs b/IRCSharp.Tests/Tokenization/Format.cs
similarity index 100%
rename from IRCTokens/Tests/Format.cs
rename to IRCSharp.Tests/Tokenization/Format.cs
diff --git a/IRCTokens/Tests/Hostmask.cs b/IRCSharp.Tests/Tokenization/Hostmask.cs
similarity index 100%
rename from IRCTokens/Tests/Hostmask.cs
rename to IRCSharp.Tests/Tokenization/Hostmask.cs
diff --git a/IRCTokens/Tests/Parser.cs b/IRCSharp.Tests/Tokenization/Parser.cs
similarity index 90%
rename from IRCTokens/Tests/Parser.cs
rename to IRCSharp.Tests/Tokenization/Parser.cs
index a560793..40ff803 100644
--- a/IRCTokens/Tests/Parser.cs
+++ b/IRCSharp.Tests/Tokenization/Parser.cs
@@ -23,7 +23,7 @@ namespace IRCTokens.Tests
[TestMethod]
public void Split()
{
- foreach (var test in LoadYaml("Tests/Data/msg-split.yaml").Tests)
+ foreach (var test in LoadYaml("Tokenization/Data/msg-split.yaml").Tests)
{
var tokens = new Line(test.Input);
var atoms = test.Atoms;
@@ -40,7 +40,7 @@ namespace IRCTokens.Tests
[TestMethod]
public void Join()
{
- foreach (var test in LoadYaml("Tests/Data/msg-join.yaml").Tests)
+ foreach (var test in LoadYaml("Tokenization/Data/msg-join.yaml").Tests)
{
var atoms = test.Atoms;
var line = new Line
diff --git a/IRCTokens/Tests/StatefulDecoder.cs b/IRCSharp.Tests/Tokenization/StatefulDecoder.cs
similarity index 100%
rename from IRCTokens/Tests/StatefulDecoder.cs
rename to IRCSharp.Tests/Tokenization/StatefulDecoder.cs
diff --git a/IRCTokens/Tests/StatefulEncoder.cs b/IRCSharp.Tests/Tokenization/StatefulEncoder.cs
similarity index 100%
rename from IRCTokens/Tests/StatefulEncoder.cs
rename to IRCSharp.Tests/Tokenization/StatefulEncoder.cs
diff --git a/IRCTokens/Tests/Tokenization.cs b/IRCSharp.Tests/Tokenization/Tokenization.cs
similarity index 100%
rename from IRCTokens/Tests/Tokenization.cs
rename to IRCSharp.Tests/Tokenization/Tokenization.cs
diff --git a/IRCSharp.sln b/IRCSharp.sln
index ff19f5e..1a79759 100644
--- a/IRCSharp.sln
+++ b/IRCSharp.sln
@@ -9,13 +9,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TokensSample", "Examples\To
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRCStates", "IRCStates\IRCStates.csproj", "{233E3CB4-61F1-4368-9139-7E9F4A58ED2D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatesSample", "Examples\States\StatesSample.csproj", "{BC9F6696-9D83-4F7A-9E15-CE4D3626C1AF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatesSample", "Examples\States\StatesSample.csproj", "{BC9F6696-9D83-4F7A-9E15-CE4D3626C1AF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1A85EB22-D7B4-417F-AC3B-DAFD97DDEA08}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRCSharp.Tests", "IRCSharp.Tests\IRCSharp.Tests.csproj", "{B420F0F3-1ED0-4FD3-9E91-2E7F96F9FF7F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{4260E03C-6E28-4519-8943-5B477841A75A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -38,10 +42,18 @@ Global
{BC9F6696-9D83-4F7A-9E15-CE4D3626C1AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC9F6696-9D83-4F7A-9E15-CE4D3626C1AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC9F6696-9D83-4F7A-9E15-CE4D3626C1AF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B420F0F3-1ED0-4FD3-9E91-2E7F96F9FF7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B420F0F3-1ED0-4FD3-9E91-2E7F96F9FF7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B420F0F3-1ED0-4FD3-9E91-2E7F96F9FF7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B420F0F3-1ED0-4FD3-9E91-2E7F96F9FF7F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {A45DA39B-6B47-4713-8049-3B36E0235B67} = {4260E03C-6E28-4519-8943-5B477841A75A}
+ {BC9F6696-9D83-4F7A-9E15-CE4D3626C1AF} = {4260E03C-6E28-4519-8943-5B477841A75A}
+ EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B91F0EA-8564-4318-8EEC-ED0640475141}
EndGlobalSection
diff --git a/IRCStates/IRCStates.csproj b/IRCStates/IRCStates.csproj
index dee711e..891167c 100644
--- a/IRCStates/IRCStates.csproj
+++ b/IRCStates/IRCStates.csproj
@@ -3,7 +3,7 @@
net5.0
IRCStates
- 1.0.2
+ 1.1.0
Ben Harris
tildeverse.org
true
@@ -13,7 +13,7 @@
https://tildegit.org/irctokens/ircsharp/src/branch/main/IRCStates
git
irc
- 1.0.2
+ 1.1.0
@@ -21,9 +21,6 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
diff --git a/IRCTokens/IRCTokens.csproj b/IRCTokens/IRCTokens.csproj
index 7c927f2..f926041 100644
--- a/IRCTokens/IRCTokens.csproj
+++ b/IRCTokens/IRCTokens.csproj
@@ -3,7 +3,7 @@
net5.0
IRCTokens
- 1.0.2
+ 1.1.0
Ben Harris
tildeverse.org
true
@@ -13,7 +13,7 @@
https://tildegit.org/irctokens/ircsharp/src/branch/main/IRCTokens
git
irc
- 1.0.2
+ 1.1.0
@@ -21,21 +21,8 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
- PreserveNewest
-