From 6729e0eac347e0f50fbbd33ae3b5ebc6675b0cdb Mon Sep 17 00:00:00 2001
From: Michiel Oda <michiel.oda@skyline.be>
Date: Tue, 10 Dec 2024 15:16:07 +0100
Subject: [PATCH] Change to MSTest NuGet + update FluentAssertions (#49, #50,
 #51)

---
 .github/dependabot.yml                        |  5 +-
 Parsers.Automation/Parsers.Automation.csproj  | 25 ++----
 .../Parsers.AutomationTests.csproj            | 10 +--
 Parsers.Common/Parsers.Common.csproj          | 89 +++++++++----------
 .../Parsers.CommonTests.csproj                | 10 +--
 Parsers.Protocol/Parsers.Protocol.csproj      | 71 +++++++--------
 .../Parsers.ProtocolTests.csproj              |  8 +-
 7 files changed, 90 insertions(+), 128 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3c62187..a19c68a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,11 +8,8 @@ updates:
   - package-ecosystem: "nuget" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "daily"
     groups:
-      mstest:
-        patterns:
-          - "MSTest.*"
       skyline-cicd:
         patterns:
           - "Skyline.DataMiner.CICD.*"
diff --git a/Parsers.Automation/Parsers.Automation.csproj b/Parsers.Automation/Parsers.Automation.csproj
index 886500f..f2c7e0f 100644
--- a/Parsers.Automation/Parsers.Automation.csproj
+++ b/Parsers.Automation/Parsers.Automation.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-<PropertyGroup>
+  <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Skyline.DataMiner.CICD.Parsers.Automation</AssemblyName>
     <RootNamespace>Skyline.DataMiner.CICD.Parsers.Automation</RootNamespace>
@@ -14,28 +13,18 @@
     <PackageProjectUrl>https://skyline.be/</PackageProjectUrl>
     <PackageTags>Skyline;DataMiner;CICD</PackageTags>
     <Description>Library providing methods to parse DataMiner AutomationScript XML files.</Description>
-	<PackageReadmeFile>README.md</PackageReadmeFile>
-	<RepositoryUrl>https://github.com/SkylineCommunications/Skyline.DataMiner.CICD.Parsers</RepositoryUrl>
-	<RepositoryType>git</RepositoryType>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <RepositoryUrl>https://github.com/SkylineCommunications/Skyline.DataMiner.CICD.Parsers</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
   <ItemGroup>
-	  <None Include="..\README.md">
-		  <Pack>True</Pack>
-		  <PackagePath>\</PackagePath>
-	  </None>
-    <None Include="..\_NuGetItems\icon.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-	 <None Include="..\_NuGetItems\LICENSE.txt">
-      <Pack>True</Pack>
-     <PackagePath>\</PackagePath>
-    </None>
+    <None Include="..\README.md" Pack="true" PackagePath="" />
+    <None Include="..\_NuGetItems\icon.png" Pack="true" PackagePath="" />
+    <None Include="..\_NuGetItems\LICENSE.txt" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Parsers.Common\Parsers.Common.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/Parsers.AutomationTests/Parsers.AutomationTests.csproj b/Parsers.AutomationTests/Parsers.AutomationTests.csproj
index 4073fd7..6c121ba 100644
--- a/Parsers.AutomationTests/Parsers.AutomationTests.csproj
+++ b/Parsers.AutomationTests/Parsers.AutomationTests.csproj
@@ -1,15 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
-      <IsPackable>false</IsPackable>
+    <TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
+    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="MSTest" Version="3.6.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Parsers.Common/Parsers.Common.csproj b/Parsers.Common/Parsers.Common.csproj
index dc9001a..d7e6230 100644
--- a/Parsers.Common/Parsers.Common.csproj
+++ b/Parsers.Common/Parsers.Common.csproj
@@ -1,57 +1,48 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <AssemblyName>Skyline.DataMiner.CICD.Parsers.Common</AssemblyName>
-        <RootNamespace>Skyline.DataMiner.CICD.Parsers.Common</RootNamespace>
-        <GenerateDocumentationFile>True</GenerateDocumentationFile>
-        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Authors>SkylineCommunications</Authors>
-        <Company>Skyline Communications</Company>
-        <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-        <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-        <PackageIcon>icon.png</PackageIcon>
-        <PackageProjectUrl>https://skyline.be/</PackageProjectUrl>
-        <PackageTags>Skyline;DataMiner;CICD</PackageTags>
-        <Description>Library providing Common methods to parse DataMiner XML files.</Description>
-	    <PackageReadmeFile>README.md</PackageReadmeFile>
-	    <RepositoryUrl>https://github.com/SkylineCommunications/Skyline.DataMiner.CICD.Parsers</RepositoryUrl>
-	    <RepositoryType>git</RepositoryType>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>Skyline.DataMiner.CICD.Parsers.Common</AssemblyName>
+    <RootNamespace>Skyline.DataMiner.CICD.Parsers.Common</RootNamespace>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <Authors>SkylineCommunications</Authors>
+    <Company>Skyline Communications</Company>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageProjectUrl>https://skyline.be/</PackageProjectUrl>
+    <PackageTags>Skyline;DataMiner;CICD</PackageTags>
+    <Description>Library providing Common methods to parse DataMiner XML files.</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <RepositoryUrl>https://github.com/SkylineCommunications/Skyline.DataMiner.CICD.Parsers</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
 
-    <ItemGroup>
-	    <None Include="..\README.md">
-		    <Pack>True</Pack>
-		    <PackagePath>\</PackagePath>
-	    </None>
-        <None Include="..\_NuGetItems\icon.png">
-            <Pack>True</Pack>
-            <PackagePath>\</PackagePath>
-        </None>
-        <None Include="..\_NuGetItems\LICENSE.txt">
-            <Pack>True</Pack>
-            <PackagePath>\</PackagePath>
-        </None>
-    </ItemGroup>
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="" />
+    <None Include="..\_NuGetItems\icon.png" Pack="true" PackagePath="" />
+    <None Include="..\_NuGetItems\LICENSE.txt" Pack="true" PackagePath="" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="NuGet.Frameworks" Version="6.6.1" />
-        <PackageReference Include="Skyline.DataMiner.CICD.FileSystem" Version="1.0.6" />
-        <PackageReference Include="Skyline.DataMiner.CICD.Loggers" Version="1.0.3" />
-        <PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NuGet.Frameworks" Version="6.6.1" />
+    <PackageReference Include="Skyline.DataMiner.CICD.FileSystem" Version="1.0.6" />
+    <PackageReference Include="Skyline.DataMiner.CICD.Loggers" Version="1.0.3" />
+    <PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <SonarQubeSetting Include="sonar.exclusions">
-            <Value>Xml/**, XmlEdit/**</Value>
-        </SonarQubeSetting>
-    </ItemGroup>
+  <ItemGroup>
+    <SonarQubeSetting Include="sonar.exclusions">
+      <Value>Xml/**, XmlEdit/**</Value>
+    </SonarQubeSetting>
+  </ItemGroup>
 
-    <ItemGroup>
-        <InternalsVisibleTo Include="Skyline.DataMiner.CICD.Parsers.Protocol" />
-        <InternalsVisibleTo Include="Assemblers.AutomationTests" />
-      <InternalsVisibleTo Include="Assemblers.ProtocolTests" />
-      <InternalsVisibleTo Include="Parsers.CommonTests" />
-    </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Skyline.DataMiner.CICD.Parsers.Protocol" />
+    <InternalsVisibleTo Include="Assemblers.AutomationTests" />
+    <InternalsVisibleTo Include="Assemblers.ProtocolTests" />
+    <InternalsVisibleTo Include="Parsers.CommonTests" />
+  </ItemGroup>
 
 </Project>
diff --git a/Parsers.CommonTests/Parsers.CommonTests.csproj b/Parsers.CommonTests/Parsers.CommonTests.csproj
index d1c07b9..215d37a 100644
--- a/Parsers.CommonTests/Parsers.CommonTests.csproj
+++ b/Parsers.CommonTests/Parsers.CommonTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -16,11 +16,9 @@
     </Content>
   </ItemGroup>
 
-	<ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="MSTest" Version="3.6.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Parsers.Protocol/Parsers.Protocol.csproj b/Parsers.Protocol/Parsers.Protocol.csproj
index 8edd2ca..603839a 100644
--- a/Parsers.Protocol/Parsers.Protocol.csproj
+++ b/Parsers.Protocol/Parsers.Protocol.csproj
@@ -1,47 +1,38 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <AssemblyName>Skyline.DataMiner.CICD.Parsers.Protocol</AssemblyName>
-        <RootNamespace>Skyline.DataMiner.CICD.Parsers.Protocol</RootNamespace>
-        <GenerateDocumentationFile>True</GenerateDocumentationFile>
-        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Authors>SkylineCommunications</Authors>
-        <Company>Skyline Communications</Company>
-        <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-        <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-        <PackageIcon>icon.png</PackageIcon>
-        <PackageProjectUrl>https://skyline.be/</PackageProjectUrl>
-        <PackageTags>Skyline;DataMiner;CICD</PackageTags>
-        <Description>Library providing methods to parse DataMiner Protocol XML files.</Description>
-	    <PackageReadmeFile>README.md</PackageReadmeFile>
-	    <RepositoryUrl>https://github.com/SkylineCommunications/Skyline.DataMiner.CICD.Parsers</RepositoryUrl>
-	    <RepositoryType>git</RepositoryType>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>Skyline.DataMiner.CICD.Parsers.Protocol</AssemblyName>
+    <RootNamespace>Skyline.DataMiner.CICD.Parsers.Protocol</RootNamespace>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <Authors>SkylineCommunications</Authors>
+    <Company>Skyline Communications</Company>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageProjectUrl>https://skyline.be/</PackageProjectUrl>
+    <PackageTags>Skyline;DataMiner;CICD</PackageTags>
+    <Description>Library providing methods to parse DataMiner Protocol XML files.</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <RepositoryUrl>https://github.com/SkylineCommunications/Skyline.DataMiner.CICD.Parsers</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
 
-    <ItemGroup>
-	    <None Include="..\README.md">
-		    <Pack>True</Pack>
-		    <PackagePath>\</PackagePath>
-	    </None>
-        <None Include="..\_NuGetItems\icon.png">
-            <Pack>True</Pack>
-            <PackagePath>\</PackagePath>
-        </None>
-        <None Include="..\_NuGetItems\LICENSE.txt">
-            <Pack>True</Pack>
-            <PackagePath>\</PackagePath>
-        </None>
-    </ItemGroup>
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="" />
+    <None Include="..\_NuGetItems\icon.png" Pack="true" PackagePath="" />
+    <None Include="..\_NuGetItems\LICENSE.txt" Pack="true" PackagePath="" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Parsers.Common\Parsers.Common.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Parsers.Common\Parsers.Common.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <SonarQubeSetting Include="sonar.exclusions">
-            <Value>Xml/**</Value>
-        </SonarQubeSetting>
-    </ItemGroup>
+  <ItemGroup>
+    <SonarQubeSetting Include="sonar.exclusions">
+      <Value>Xml/**</Value>
+    </SonarQubeSetting>
+  </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Parsers.ProtocolTests/Parsers.ProtocolTests.csproj b/Parsers.ProtocolTests/Parsers.ProtocolTests.csproj
index 3e48733..2068f1f 100644
--- a/Parsers.ProtocolTests/Parsers.ProtocolTests.csproj
+++ b/Parsers.ProtocolTests/Parsers.ProtocolTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>disable</Nullable>
 
@@ -9,9 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
+    <PackageReference Include="MSTest" Version="3.6.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -29,5 +27,5 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-    
+
 </Project>