Merge pull request #10 from canro91/upgrade-to-net8.0

Update Sample and Test projects to .NET8.0
canro91 · Jul 26, 2024 · b6d2198 · b6d2198
2 parents c9a794a + b9f3aa7
commit b6d2198
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 42 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+	<ItemGroup Condition="'$(MSBuildProjectFile)'!='Parsinator.csproj'">
+	  <Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
+	  <Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
+	  <Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
+	  <Using Include="NUnit.Framework.Legacy.DirectoryAssert" Alias="DirectoryAssert" />
+	  <Using Include="NUnit.Framework.Legacy.FileAssert" Alias="FileAssert" />
+	</ItemGroup>
+</Project>
diff --git a/Parsinator.Sample/Parsinator.Sample.csproj b/Parsinator.Sample/Parsinator.Sample.csproj
@@ -1,20 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Parsinator\Parsinator.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Parsinator.Tests/Parsinator.Tests.csproj b/Parsinator.Tests/Parsinator.Tests.csproj
@@ -1,21 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="XMLUnit.Core" Version="2.7.2" />
+    <PackageReference Include="XMLUnit.Core" Version="2.9.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Parsinator\Parsinator.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Parsinator.sln b/Parsinator.sln
@@ -1,14 +1,18 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2015
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35013.160
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parsinator.Tests", "Parsinator.Tests\Parsinator.Tests.csproj", "{7170007D-5B14-4788-B4DB-38157897AD7D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Parsinator.Tests", "Parsinator.Tests\Parsinator.Tests.csproj", "{7170007D-5B14-4788-B4DB-38157897AD7D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parsinator", "Parsinator\Parsinator.csproj", "{D6A3A129-56E4-43F9-9115-B5302F519C25}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Parsinator", "Parsinator\Parsinator.csproj", "{D6A3A129-56E4-43F9-9115-B5302F519C25}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Parsinator.Sample", "Parsinator.Sample\Parsinator.Sample.csproj", "{58437AB6-E1A0-41D3-8F93-15403620937D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F6ADB03D-BD41-44B4-A46D-D5692A10FC08}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Parsinator.Sample", "Parsinator.Sample\Parsinator.Sample.csproj", "{58437AB6-E1A0-41D3-8F93-15403620937D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,18 +43,18 @@ Global
 		{D6A3A129-56E4-43F9-9115-B5302F519C25}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D6A3A129-56E4-43F9-9115-B5302F519C25}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D6A3A129-56E4-43F9-9115-B5302F519C25}.Release|x86.ActiveCfg = Release|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|x86.Build.0 = Debug|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|x86.ActiveCfg = Release|Any CPU
-		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|x86.Build.0 = Release|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Debug|x86.Build.0 = Debug|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|x86.ActiveCfg = Release|Any CPU
+		{58437AB6-E1A0-41D3-8F93-15403620937D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Parsinator/Parsinator.csproj b/Parsinator/Parsinator.csproj
@@ -8,7 +8,7 @@
         <PackageTags>unstructured-text structured-text parsing csharp</PackageTags>
     </PropertyGroup>
     <ItemGroup>
-      <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.0">
+      <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.3">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>