Merge pull request #68 from IronyProject/roman_dev

Minor config changes, updated package refs, added pe-verify fix
IronyProject · Mar 10, 2024 · 6cb7138 · 6cb7138
2 parents d9ba17f + f9ce356
commit 6cb7138
Show file tree

Hide file tree

Showing 22 changed files with 110 additions and 28 deletions.
diff --git a/Irony.Tests/040.Irony.Tests.VsTest.csproj b/Irony.Tests/040.Irony.Tests.VsTest.csproj
@@ -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>
@@ -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>
diff --git a/Irony.Tests/050.Irony.Tests.NUnit.csproj b/Irony.Tests/050.Irony.Tests.NUnit.csproj
@@ -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>
@@ -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>
@@ -20,7 +24,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="NUnit" Version="4.0.1" />
+	  <PackageReference Include="NUnit" Version="4.1.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Irony.Tests/CommentTerminalTests.cs b/Irony.Tests/CommentTerminalTests.cs
@@ -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
@@ -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"));

diff --git a/Irony.Tests/DataLiteralsTests.cs b/Irony.Tests/DataLiteralsTests.cs
@@ -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

diff --git a/Irony.Tests/ErrorRecoveryTests.cs b/Irony.Tests/ErrorRecoveryTests.cs
@@ -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

diff --git a/Irony.Tests/EvaluatorTests.cs b/Irony.Tests/EvaluatorTests.cs
@@ -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

diff --git a/Irony.Tests/FreeTextLiteralTests.cs b/Irony.Tests/FreeTextLiteralTests.cs
@@ -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

diff --git a/Irony.Tests/HeredocTerminalTests.cs b/Irony.Tests/HeredocTerminalTests.cs
@@ -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

diff --git a/Irony.Tests/IdentifierTerminalTests.cs b/Irony.Tests/IdentifierTerminalTests.cs
@@ -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

diff --git a/Irony.Tests/IntegrationTests.cs b/Irony.Tests/IntegrationTests.cs
@@ -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

diff --git a/Irony.Tests/LineContinuationTests.cs b/Irony.Tests/LineContinuationTests.cs
@@ -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

diff --git a/Irony.Tests/NewLineTests.cs b/Irony.Tests/NewLineTests.cs
@@ -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

diff --git a/Irony.Tests/NumberLiteralTests.cs b/Irony.Tests/NumberLiteralTests.cs
@@ -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

diff --git a/Irony.Tests/OperatorTests.cs b/Irony.Tests/OperatorTests.cs
@@ -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

diff --git a/Irony.Tests/ParseTreeSimplicityTests.cs b/Irony.Tests/ParseTreeSimplicityTests.cs
@@ -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

diff --git a/Irony.Tests/RegExLiteralTests.cs b/Irony.Tests/RegExLiteralTests.cs
@@ -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  {
 

diff --git a/Irony.Tests/StringLiteralTests.cs b/Irony.Tests/StringLiteralTests.cs
@@ -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

diff --git a/Irony.Tests/TestHelper.cs b/Irony.Tests/TestHelper.cs
@@ -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 {

diff --git a/Irony.Tests/TokenPreviewResolution/ConflictResolutionTests.cs b/Irony.Tests/TokenPreviewResolution/ConflictResolutionTests.cs
@@ -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

diff --git a/Irony.sln b/Irony.sln
@@ -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}"
@@ -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
@@ -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

diff --git a/Irony/010.Irony.csproj b/Irony/010.Irony.csproj
@@ -6,6 +6,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
 		<AssemblyName>Irony</AssemblyName>
 		<RootNamespace>Irony</RootNamespace>
+		<Features>peverify-compat</Features>
 
 		<Title>Irony Parsing Framework</Title>
     </PropertyGroup>

diff --git a/Languages/Refal.UnitTests/Refal.UnitTests.VsTest.csproj b/Languages/Refal.UnitTests/Refal.UnitTests.VsTest.csproj
@@ -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>
@@ -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" />