Skip to content

Commit

Permalink
Minor config changes, updated package refs, added pe-verify fix
Browse files Browse the repository at this point in the history
  • Loading branch information
rivantsov committed Mar 10, 2024
1 parent d9ba17f commit f9ce356
Show file tree
Hide file tree
Showing 22 changed files with 110 additions and 28 deletions.
8 changes: 4 additions & 4 deletions Irony.Tests/040.Irony.Tests.VsTest.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Irony</RootNamespace>
<AssemblyName>Irony.Tests.VsTest</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand All @@ -25,9 +25,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
</ItemGroup>

</Project>
8 changes: 6 additions & 2 deletions Irony.Tests/050.Irony.Tests.NUnit.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<RootNamespace>Irony.Tests</RootNamespace>
<AssemblyName>Irony.Tests.NUnit</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand All @@ -11,6 +11,10 @@

</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
<DefineConstants>$(DefineConstants);USE_NUNIT</DefineConstants>
</PropertyGroup>

<ItemGroup>
<Compile Remove="HeredocTerminalTests.cs" />
</ItemGroup>
Expand All @@ -20,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NUnit" Version="4.0.1" />
<PackageReference Include="NUnit" Version="4.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion Irony.Tests/CommentTerminalTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand All @@ -21,7 +22,7 @@ public void TestCommentTerminal() {
Parser parser; Token token;

parser = TestHelper.CreateParser(new CommentTerminal("Comment", "/*", "*/"));
token = parser.ParseInput("/* abc */");
token = parser.ParseInput("/* abc */");
Assert.IsTrue(token.Category == TokenCategory.Comment, "Failed to read comment");

parser = TestHelper.CreateParser(new CommentTerminal("Comment", "//", "\n"));
Expand Down
1 change: 1 addition & 0 deletions Irony.Tests/DataLiteralsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
1 change: 1 addition & 0 deletions Irony.Tests/ErrorRecoveryTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
1 change: 1 addition & 0 deletions Irony.Tests/EvaluatorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
3 changes: 2 additions & 1 deletion Irony.Tests/FreeTextLiteralTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif

[TestClass]
public class FreeTextLiteralTests {
//A special grammar that does not skip whitespace
Expand Down
3 changes: 2 additions & 1 deletion Irony.Tests/HeredocTerminalTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif

//Currently not used, HereDocTerminal needs to be finished
Expand Down
1 change: 1 addition & 0 deletions Irony.Tests/IdentifierTerminalTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
1 change: 1 addition & 0 deletions Irony.Tests/IntegrationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
1 change: 1 addition & 0 deletions Irony.Tests/LineContinuationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
3 changes: 2 additions & 1 deletion Irony.Tests/NewLineTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ namespace Irony.Tests {
using NUnit.Framework;
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
1 change: 1 addition & 0 deletions Irony.Tests/NumberLiteralTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
3 changes: 2 additions & 1 deletion Irony.Tests/OperatorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

namespace Irony.Tests {
#if USE_NUNIT
using NUnit.Framework;
using NUnit.Framework;
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
3 changes: 2 additions & 1 deletion Irony.Tests/ParseTreeSimplicityTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ namespace Irony.Tests {
using NUnit.Framework;
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
3 changes: 2 additions & 1 deletion Irony.Tests/RegExLiteralTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif

[TestClass]
public class RegexLiteralTests {

Expand Down
1 change: 1 addition & 0 deletions Irony.Tests/StringLiteralTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
3 changes: 2 additions & 1 deletion Irony.Tests/TestHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ namespace Irony.Tests {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif

public static class TestHelper {
//A skeleton for a grammar with a single terminal, followed by optional terminator
class TerminalTestGrammar : Grammar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace Irony.Tests.TokenPreviewResolution {
using TestClass = NUnit.Framework.TestFixtureAttribute;
using TestMethod = NUnit.Framework.TestAttribute;
using TestInitialize = NUnit.Framework.SetUpAttribute;
using Assert = NUnit.Framework.Legacy.ClassicAssert;
#else
using Microsoft.VisualStudio.TestTools.UnitTesting;
#endif
Expand Down
14 changes: 1 addition & 13 deletions Irony.sln
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "030.Irony.GrammarExplorer",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "040.Irony.Tests.VsTest", "Irony.Tests\040.Irony.Tests.VsTest.csproj", "{0CFA8CEE-0110-49C1-93E5-CB7BE3A5716B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "050.Irony.Tests.NUnit", "Irony.Tests\050.Irony.Tests.NUnit.csproj", "{1A98BEDA-DF53-49B7-A366-2ED7606036BD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Languages", "Languages", "{0850FA53-413E-4AF9-B918-8FF524FFA5D7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Refal", "Refal", "{FEE137AB-6C8B-4576-81BE-119DA16DCF78}"
Expand Down Expand Up @@ -55,7 +53,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{44A7
Languages\Refal\UnitTests\Sources\xtras-factorial.ref = Languages\Refal\UnitTests\Sources\xtras-factorial.ref
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refal.UnitTests.VsTest", "Languages\Refal.UnitTests\Refal.UnitTests.VsTest.csproj", "{94409071-FF65-4C3C-97EB-BD4FDEF90B4E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Refal.UnitTests.VsTest", "Languages\Refal.UnitTests\Refal.UnitTests.VsTest.csproj", "{94409071-FF65-4C3C-97EB-BD4FDEF90B4E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -139,16 +137,6 @@ Global
{0CFA8CEE-0110-49C1-93E5-CB7BE3A5716B}.Silverlight Release|Any CPU.Build.0 = Release|Any CPU
{0CFA8CEE-0110-49C1-93E5-CB7BE3A5716B}.SpecSharp|Any CPU.ActiveCfg = Release|Any CPU
{0CFA8CEE-0110-49C1-93E5-CB7BE3A5716B}.SpecSharp|Any CPU.Build.0 = Release|Any CPU
{1A98BEDA-DF53-49B7-A366-2ED7606036BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A98BEDA-DF53-49B7-A366-2ED7606036BD}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
{1A98BEDA-DF53-49B7-A366-2ED7606036BD}.FxCop|Any CPU.Build.0 = Release|Any CPU
{1A98BEDA-DF53-49B7-A366-2ED7606036BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A98BEDA-DF53-49B7-A366-2ED7606036BD}.Silverlight Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A98BEDA-DF53-49B7-A366-2ED7606036BD}.Silverlight Debug|Any CPU.Build.0 = Debug|Any CPU
{1A98BEDA-DF53-49B7-A366-2ED7606036BD}.Silverlight Release|Any CPU.ActiveCfg = Release|Any CPU
{1A98BEDA-DF53-49B7-A366-2ED7606036BD}.Silverlight Release|Any CPU.Build.0 = Release|Any CPU
{1A98BEDA-DF53-49B7-A366-2ED7606036BD}.SpecSharp|Any CPU.ActiveCfg = Release|Any CPU
{1A98BEDA-DF53-49B7-A366-2ED7606036BD}.SpecSharp|Any CPU.Build.0 = Release|Any CPU
{19A86418-BA99-41F4-80A5-A7F3A6383123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19A86418-BA99-41F4-80A5-A7F3A6383123}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19A86418-BA99-41F4-80A5-A7F3A6383123}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
1 change: 1 addition & 0 deletions Irony/010.Irony.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Irony</AssemblyName>
<RootNamespace>Irony</RootNamespace>
<Features>peverify-compat</Features>

<Title>Irony Parsing Framework</Title>
</PropertyGroup>
Expand Down
74 changes: 73 additions & 1 deletion Languages/Refal.UnitTests/Refal.UnitTests.VsTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>net8</TargetFrameworks>
<RootNamespace>Refal.UnitTests.VsTest</RootNamespace>
<RootNamespace>Refal.UnitTests</RootNamespace>
<AssemblyName>Refal.UnitTests.VsTest</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>false</SignAssembly>
Expand All @@ -11,6 +11,78 @@

</PropertyGroup>

<ItemGroup>
<None Remove="Sources\99-bottles-v1.ref" />
<None Remove="Sources\99-bottles-v1.txt" />
<None Remove="Sources\99-bottles-v2.ref" />
<None Remove="Sources\99-bottles-v2.txt" />
<None Remove="Sources\arith.ref" />
<None Remove="Sources\arith.txt" />
<None Remove="Sources\binary.ref" />
<None Remove="Sources\binary.txt" />
<None Remove="Sources\brainfuck.ref" />
<None Remove="Sources\brainfuck.txt" />
<None Remove="Sources\change-v1.ref" />
<None Remove="Sources\change-v2.ref" />
<None Remove="Sources\change.txt" />
<None Remove="Sources\factorial.ref" />
<None Remove="Sources\factorial.txt" />
<None Remove="Sources\hello.ref" />
<None Remove="Sources\hello.txt" />
<None Remove="Sources\italian.ref" />
<None Remove="Sources\italian.txt" />
<None Remove="Sources\order-v1.ref" />
<None Remove="Sources\order-v2.ref" />
<None Remove="Sources\order.txt" />
<None Remove="Sources\palyndrome.ref" />
<None Remove="Sources\palyndrome.txt" />
<None Remove="Sources\pretty.ref" />
<None Remove="Sources\pretty.txt" />
<None Remove="Sources\quine-plain.ref" />
<None Remove="Sources\quine-simple.ref" />
<None Remove="Sources\quine-xplained.ref" />
<None Remove="Sources\xtras-bigint.ref" />
<None Remove="Sources\xtras-bigint.txt" />
<None Remove="Sources\xtras-factorial.ref" />
<None Remove="Sources\xtras-factorial.txt" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Sources\99-bottles-v1.ref" />
<EmbeddedResource Include="Sources\99-bottles-v1.txt" />
<EmbeddedResource Include="Sources\99-bottles-v2.ref" />
<EmbeddedResource Include="Sources\99-bottles-v2.txt" />
<EmbeddedResource Include="Sources\arith.ref" />
<EmbeddedResource Include="Sources\arith.txt" />
<EmbeddedResource Include="Sources\binary.ref" />
<EmbeddedResource Include="Sources\binary.txt" />
<EmbeddedResource Include="Sources\brainfuck.ref" />
<EmbeddedResource Include="Sources\brainfuck.txt" />
<EmbeddedResource Include="Sources\change-v1.ref" />
<EmbeddedResource Include="Sources\change-v2.ref" />
<EmbeddedResource Include="Sources\change.txt" />
<EmbeddedResource Include="Sources\factorial.ref" />
<EmbeddedResource Include="Sources\factorial.txt" />
<EmbeddedResource Include="Sources\hello.ref" />
<EmbeddedResource Include="Sources\hello.txt" />
<EmbeddedResource Include="Sources\italian.ref" />
<EmbeddedResource Include="Sources\italian.txt" />
<EmbeddedResource Include="Sources\order-v1.ref" />
<EmbeddedResource Include="Sources\order-v2.ref" />
<EmbeddedResource Include="Sources\order.txt" />
<EmbeddedResource Include="Sources\palyndrome.ref" />
<EmbeddedResource Include="Sources\palyndrome.txt" />
<EmbeddedResource Include="Sources\pretty.ref" />
<EmbeddedResource Include="Sources\pretty.txt" />
<EmbeddedResource Include="Sources\quine-plain.ref" />
<EmbeddedResource Include="Sources\quine-simple.ref" />
<EmbeddedResource Include="Sources\quine-xplained.ref" />
<EmbeddedResource Include="Sources\xtras-bigint.ref" />
<EmbeddedResource Include="Sources\xtras-bigint.txt" />
<EmbeddedResource Include="Sources\xtras-factorial.ref" />
<EmbeddedResource Include="Sources\xtras-factorial.txt" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Irony.Interpreter\015.Irony.Interpreter.csproj" />
<ProjectReference Include="..\..\Irony\010.Irony.csproj" />
Expand Down

0 comments on commit f9ce356

Please sign in to comment.