diff options
-rw-r--r-- | IRCSharp.Tests/IRCSharp.Tests.csproj | 31 | ||||
-rw-r--r-- | IRCSharp.Tests/State/Cap.cs (renamed from IRCStates/Tests/Cap.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/State/Casemap.cs (renamed from IRCStates/Tests/Casemap.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/State/Channel.cs (renamed from IRCStates/Tests/Channel.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/State/Emit.cs (renamed from IRCStates/Tests/Emit.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/State/ISupport.cs (renamed from IRCStates/Tests/ISupport.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/State/Mode.cs (renamed from IRCStates/Tests/Mode.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/State/Motd.cs (renamed from IRCStates/Tests/Motd.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/State/Sasl.cs (renamed from IRCStates/Tests/Sasl.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/State/User.cs (renamed from IRCStates/Tests/User.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/State/Who.cs (renamed from IRCStates/Tests/Who.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/Tokenization/Data/JoinModel.cs (renamed from IRCTokens/Tests/Data/JoinModel.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/Tokenization/Data/SplitModel.cs (renamed from IRCTokens/Tests/Data/SplitModel.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/Tokenization/Data/msg-join.yaml (renamed from IRCTokens/Tests/Data/msg-join.yaml) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/Tokenization/Data/msg-split.yaml (renamed from IRCTokens/Tests/Data/msg-split.yaml) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/Tokenization/Format.cs (renamed from IRCTokens/Tests/Format.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/Tokenization/Hostmask.cs (renamed from IRCTokens/Tests/Hostmask.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/Tokenization/Parser.cs (renamed from IRCTokens/Tests/Parser.cs) | 4 | ||||
-rw-r--r-- | IRCSharp.Tests/Tokenization/StatefulDecoder.cs (renamed from IRCTokens/Tests/StatefulDecoder.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/Tokenization/StatefulEncoder.cs (renamed from IRCTokens/Tests/StatefulEncoder.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.Tests/Tokenization/Tokenization.cs (renamed from IRCTokens/Tests/Tokenization.cs) | 0 | ||||
-rw-r--r-- | IRCSharp.sln | 14 | ||||
-rw-r--r-- | IRCStates/IRCStates.csproj | 7 | ||||
-rw-r--r-- | IRCTokens/IRCTokens.csproj | 17 |
24 files changed, 50 insertions, 23 deletions
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 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>net5.0</TargetFramework> + + <IsPackable>false</IsPackable> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> + <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" /> + <PackageReference Include="MSTest.TestFramework" Version="2.1.1" /> + <PackageReference Include="coverlet.collector" Version="1.3.0" /> + <PackageReference Include="YamlDotNet" Version="8.1.2" /> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="..\IRCStates\IRCStates.csproj" /> + <ProjectReference Include="..\IRCTokens\IRCTokens.csproj" /> + </ItemGroup> + + <ItemGroup> + <None Update="Tokenization\Data\msg-join.yaml"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Update="Tokenization\Data\msg-split.yaml"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + </ItemGroup> + +</Project> diff --git a/IRCStates/Tests/Cap.cs b/IRCSharp.Tests/State/Cap.cs index 3c0faba..3c0faba 100644 --- a/IRCStates/Tests/Cap.cs +++ b/IRCSharp.Tests/State/Cap.cs diff --git a/IRCStates/Tests/Casemap.cs b/IRCSharp.Tests/State/Casemap.cs index 4a02444..4a02444 100644 --- a/IRCStates/Tests/Casemap.cs +++ b/IRCSharp.Tests/State/Casemap.cs diff --git a/IRCStates/Tests/Channel.cs b/IRCSharp.Tests/State/Channel.cs index 6868e0f..6868e0f 100644 --- a/IRCStates/Tests/Channel.cs +++ b/IRCSharp.Tests/State/Channel.cs diff --git a/IRCStates/Tests/Emit.cs b/IRCSharp.Tests/State/Emit.cs index 07fea8c..07fea8c 100644 --- a/IRCStates/Tests/Emit.cs +++ b/IRCSharp.Tests/State/Emit.cs diff --git a/IRCStates/Tests/ISupport.cs b/IRCSharp.Tests/State/ISupport.cs index 5cdcc61..5cdcc61 100644 --- a/IRCStates/Tests/ISupport.cs +++ b/IRCSharp.Tests/State/ISupport.cs diff --git a/IRCStates/Tests/Mode.cs b/IRCSharp.Tests/State/Mode.cs index 90763fa..90763fa 100644 --- a/IRCStates/Tests/Mode.cs +++ b/IRCSharp.Tests/State/Mode.cs diff --git a/IRCStates/Tests/Motd.cs b/IRCSharp.Tests/State/Motd.cs index 2d75982..2d75982 100644 --- a/IRCStates/Tests/Motd.cs +++ b/IRCSharp.Tests/State/Motd.cs diff --git a/IRCStates/Tests/Sasl.cs b/IRCSharp.Tests/State/Sasl.cs index 151ccdf..151ccdf 100644 --- a/IRCStates/Tests/Sasl.cs +++ b/IRCSharp.Tests/State/Sasl.cs diff --git a/IRCStates/Tests/User.cs b/IRCSharp.Tests/State/User.cs index 61d7157..61d7157 100644 --- a/IRCStates/Tests/User.cs +++ b/IRCSharp.Tests/State/User.cs diff --git a/IRCStates/Tests/Who.cs b/IRCSharp.Tests/State/Who.cs index d091785..d091785 100644 --- a/IRCStates/Tests/Who.cs +++ b/IRCSharp.Tests/State/Who.cs diff --git a/IRCTokens/Tests/Data/JoinModel.cs b/IRCSharp.Tests/Tokenization/Data/JoinModel.cs index e54f4cf..e54f4cf 100644 --- a/IRCTokens/Tests/Data/JoinModel.cs +++ b/IRCSharp.Tests/Tokenization/Data/JoinModel.cs diff --git a/IRCTokens/Tests/Data/SplitModel.cs b/IRCSharp.Tests/Tokenization/Data/SplitModel.cs index 5386326..5386326 100644 --- a/IRCTokens/Tests/Data/SplitModel.cs +++ b/IRCSharp.Tests/Tokenization/Data/SplitModel.cs diff --git a/IRCTokens/Tests/Data/msg-join.yaml b/IRCSharp.Tests/Tokenization/Data/msg-join.yaml index d1d7429..d1d7429 100644 --- a/IRCTokens/Tests/Data/msg-join.yaml +++ b/IRCSharp.Tests/Tokenization/Data/msg-join.yaml diff --git a/IRCTokens/Tests/Data/msg-split.yaml b/IRCSharp.Tests/Tokenization/Data/msg-split.yaml index fa3f4aa..fa3f4aa 100644 --- a/IRCTokens/Tests/Data/msg-split.yaml +++ b/IRCSharp.Tests/Tokenization/Data/msg-split.yaml diff --git a/IRCTokens/Tests/Format.cs b/IRCSharp.Tests/Tokenization/Format.cs index 7224f97..7224f97 100644 --- a/IRCTokens/Tests/Format.cs +++ b/IRCSharp.Tests/Tokenization/Format.cs diff --git a/IRCTokens/Tests/Hostmask.cs b/IRCSharp.Tests/Tokenization/Hostmask.cs index 17c5ad7..17c5ad7 100644 --- a/IRCTokens/Tests/Hostmask.cs +++ b/IRCSharp.Tests/Tokenization/Hostmask.cs diff --git a/IRCTokens/Tests/Parser.cs b/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<SplitModel>("Tests/Data/msg-split.yaml").Tests) + foreach (var test in LoadYaml<SplitModel>("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<JoinModel>("Tests/Data/msg-join.yaml").Tests) + foreach (var test in LoadYaml<JoinModel>("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 index 4da7690..4da7690 100644 --- a/IRCTokens/Tests/StatefulDecoder.cs +++ b/IRCSharp.Tests/Tokenization/StatefulDecoder.cs diff --git a/IRCTokens/Tests/StatefulEncoder.cs b/IRCSharp.Tests/Tokenization/StatefulEncoder.cs index d1e1e3e..d1e1e3e 100644 --- a/IRCTokens/Tests/StatefulEncoder.cs +++ b/IRCSharp.Tests/Tokenization/StatefulEncoder.cs diff --git a/IRCTokens/Tests/Tokenization.cs b/IRCSharp.Tests/Tokenization/Tokenization.cs index c4c5c5a..c4c5c5a 100644 --- a/IRCTokens/Tests/Tokenization.cs +++ b/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 @@ <PropertyGroup> <TargetFramework>net5.0</TargetFramework> <PackageId>IRCStates</PackageId> - <Version>1.0.2</Version> + <Version>1.1.0</Version> <Authors>Ben Harris</Authors> <Company>tildeverse.org</Company> <IsPackable>true</IsPackable> @@ -13,7 +13,7 @@ <RepositoryUrl>https://tildegit.org/irctokens/ircsharp/src/branch/main/IRCStates</RepositoryUrl> <RepositoryType>git</RepositoryType> <PackageTags>irc</PackageTags> - <PackageVersion>1.0.2</PackageVersion> + <PackageVersion>1.1.0</PackageVersion> </PropertyGroup> <ItemGroup> @@ -21,9 +21,6 @@ <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" /> - <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" /> - <PackageReference Include="MSTest.TestFramework" Version="2.1.1" /> </ItemGroup> <ItemGroup> 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 @@ <PropertyGroup> <TargetFramework>net5.0</TargetFramework> <PackageId>IRCTokens</PackageId> - <Version>1.0.2</Version> + <Version>1.1.0</Version> <Authors>Ben Harris</Authors> <Company>tildeverse.org</Company> <IsPackable>true</IsPackable> @@ -13,7 +13,7 @@ <RepositoryUrl>https://tildegit.org/irctokens/ircsharp/src/branch/main/IRCTokens</RepositoryUrl> <RepositoryType>git</RepositoryType> <PackageTags>irc</PackageTags> - <PackageVersion>1.0.2</PackageVersion> + <PackageVersion>1.1.0</PackageVersion> </PropertyGroup> <ItemGroup> @@ -21,21 +21,8 @@ <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" /> - <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" /> - <PackageReference Include="MSTest.TestFramework" Version="2.1.1" /> <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" /> <PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" /> - <PackageReference Include="YamlDotNet" Version="8.1.0" /> - </ItemGroup> - - <ItemGroup> - <None Update="Tests\Data\msg-join.yaml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Update="Tests\Data\msg-split.yaml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> </ItemGroup> </Project> |