From 6bf011d53ff0428d42ab88c7c98527edb534aa98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <webmaster@am-wd.de>
Date: Mon, 9 Sep 2024 08:15:14 +0200
Subject: [PATCH] Updating dependencies and CI

---
 .gitlab-ci.yml                                | 22 +++++--------------
 .../AMWD.Protocols.Modbus.Tests.csproj        |  8 +++----
 Directory.Build.props                         |  3 +--
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47f8a3e..85c1f8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,15 +22,10 @@ build-debug:
   script:
     - dotnet restore --no-cache --force
     - dotnet build -c Debug --nologo --no-restore --no-incremental
+    - shopt -s globstar
     - mkdir ./artifacts
-    - mv ./AMWD.Protocols.Modbus.Common/bin/Debug/*.nupkg    ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Common/bin/Debug/*.snupkg   ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Proxy/bin/Debug/*.nupkg     ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Proxy/bin/Debug/*.snupkg    ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Serial/bin/Debug/*.nupkg    ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Serial/bin/Debug/*.snupkg   ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Tcp/bin/Debug/*.nupkg       ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Tcp/bin/Debug/*.snupkg      ./artifacts/
+    - mv ./**/*.nupkg    ./artifacts/
+    - mv ./**/*.snupkg   ./artifacts/
   artifacts:
     paths:
       - artifacts/*.nupkg
@@ -79,15 +74,10 @@ build-release:
   script:
     - dotnet restore --no-cache --force
     - dotnet build -c Release --nologo --no-restore --no-incremental
+    - shopt -s globstar
     - mkdir ./artifacts
-    - mv ./AMWD.Protocols.Modbus.Common/bin/Release/*.nupkg    ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Common/bin/Release/*.snupkg   ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Proxy/bin/Release/*.nupkg     ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Proxy/bin/Release/*.snupkg    ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Serial/bin/Release/*.nupkg    ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Serial/bin/Release/*.snupkg   ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Tcp/bin/Release/*.nupkg       ./artifacts/
-    - mv ./AMWD.Protocols.Modbus.Tcp/bin/Release/*.snupkg      ./artifacts/
+    - mv ./**/*.nupkg    ./artifacts/
+    - mv ./**/*.snupkg   ./artifacts/
   artifacts:
     paths:
       - artifacts/*.nupkg
diff --git a/AMWD.Protocols.Modbus.Tests/AMWD.Protocols.Modbus.Tests.csproj b/AMWD.Protocols.Modbus.Tests/AMWD.Protocols.Modbus.Tests.csproj
index 4bf6dac..a8d995e 100644
--- a/AMWD.Protocols.Modbus.Tests/AMWD.Protocols.Modbus.Tests.csproj
+++ b/AMWD.Protocols.Modbus.Tests/AMWD.Protocols.Modbus.Tests.csproj
@@ -21,10 +21,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
index 5edfba9..c140bfb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,7 +18,6 @@
 
     <PackageIcon>package-icon.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageProjectUrl>https://wiki.am-wd.de/libs/modbus</PackageProjectUrl>
 
     <Title>Modbus Protocol for .NET</Title>
     <Company>AM.WD</Company>
@@ -27,7 +26,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../AMWD.Protocols.Modbus.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>$(SolutionDir)/AMWD.Protocols.Modbus.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">