Merge pull request #2 from canro91/update-to-.net8.0

Update Sample and Test projects to .NET8.0
canro91 · Jul 26, 2024 · bcc65dd · bcc65dd
2 parents f60b3b6 + a49adfc
commit bcc65dd
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 27 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/BaseXml.Sample/BaseXml.Sample.csproj b/BaseXml.Sample/BaseXml.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="..\BaseXml\BaseXml.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/BaseXml.Tests/BaseXml.Tests.csproj b/BaseXml.Tests/BaseXml.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="..\BaseXml\BaseXml.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/BaseXml.sln b/BaseXml.sln
@@ -1,13 +1,13 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2042
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseXml", "BaseXml\BaseXml.csproj", "{003977B7-6E1D-48AF-A998-A54EFEBA800C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseXml.Tests", "BaseXml.Tests\BaseXml.Tests.csproj", "{F7CFABEB-972D-431E-97DA-5F2482A2D147}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseXml.Tests", "BaseXml.Tests\BaseXml.Tests.csproj", "{F7CFABEB-972D-431E-97DA-5F2482A2D147}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseXml.Sample", "BaseXml.Sample\BaseXml.Sample.csproj", "{CB385706-0ACC-4110-99AF-2F9564031679}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseXml.Sample", "BaseXml.Sample\BaseXml.Sample.csproj", "{CB385706-0ACC-4110-99AF-2F9564031679}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/BaseXml/BaseXml.csproj b/BaseXml/BaseXml.csproj
@@ -9,8 +9,8 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="8.6.2" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.0">
+    <PackageReference Include="FluentValidation" Version="11.9.2" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+	<ItemGroup Condition="'$(MSBuildProjectFile)'!='BaseXml.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>