Update dependencies

WickedFlame · Oct 28, 2024 · 881d211 · 881d211
1 parent baf9ff6
commit 881d211
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 43 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 # http://www.appveyor.com/docs/appveyor-yml
 
 environment:
-  base_version: 2.2.2
+  base_version: 2.3.0
 
 # version format
 version: $(base_version).{build}
@@ -21,7 +21,7 @@ for:
     skip_tags: true
 
     install:
-      - dotnet tool install Nuke.GlobalTool --global --version 6.2.1 --no-cache
+      - dotnet tool install Nuke.GlobalTool --global --version 8.1.2 --no-cache
 
     before_build:
       - dotnet restore ./build/_build.csproj
@@ -42,7 +42,7 @@ for:
     skip_tags: true
 
     install:
-      - dotnet tool install Nuke.GlobalTool --global --version 6.2.1 --no-cache
+      - dotnet tool install Nuke.GlobalTool --global --version 8.1.2 --no-cache
 
     before_build:
       - dotnet restore ./build/_build.csproj

diff --git a/build/Build.cs b/build/Build.cs
@@ -38,7 +38,7 @@ class Build : NukeBuild
     [GitRepository] readonly GitRepository GitRepository;
 
     [Parameter("Version to be injected in the Build")]
-    public string Version { get; set; } = $"2.2.2";
+    public string Version { get; set; } = $"2.3.0";
 
     [Parameter("The Buildnumber provided by the CI")]
     public int BuildNo = 1;
@@ -61,9 +61,9 @@ class Build : NukeBuild
         .Before(Restore)
         .Executes(() =>
         {
-            SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
-            TestsDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
-            EnsureCleanDirectory(ArtifactsDirectory);
+            SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(d => d.DeleteDirectory());
+            TestsDirectory.GlobDirectories("**/bin", "**/obj").ForEach(d => d.DeleteDirectory());
+            ArtifactsDirectory.CreateOrCleanDirectory();
         });
 
     Target Restore => _ => _
@@ -105,20 +105,18 @@ class Build : NukeBuild
         });
 
     Target Release => _ => _
-        //.DependsOn(Clean)
-        //.DependsOn(Compile)
         .DependsOn(Test)
         .Executes(() =>
         {
             // copy to artifacts folder
             foreach (var file in Directory.GetFiles(RootDirectory, $"*.{PackageVersion}.nupkg", SearchOption.AllDirectories))
             {
-                CopyFile(file, ArtifactsDirectory / Path.GetFileName(file), FileExistsPolicy.Overwrite);
+                ((AbsolutePath) file).CopyToDirectory(ArtifactsDirectory, ExistsPolicy.FileOverwrite);
             }
 
             foreach (var file in Directory.GetFiles(RootDirectory, $"*.{PackageVersion}.snupkg", SearchOption.AllDirectories))
             {
-                CopyFile(file, ArtifactsDirectory / Path.GetFileName(file), FileExistsPolicy.Overwrite);
+                ((AbsolutePath) file).CopyToDirectory(ArtifactsDirectory, ExistsPolicy.FileOverwrite);
             }
         });
 
@@ -129,12 +127,12 @@ class Build : NukeBuild
             // copy to local store
             foreach (var file in Directory.GetFiles(ArtifactsDirectory, $"*.{PackageVersion}.nupkg", SearchOption.AllDirectories))
             {
-                CopyFile(file, DeployPath / Path.GetFileName(file), FileExistsPolicy.Overwrite);
+                ((AbsolutePath) file).CopyToDirectory(DeployPath, ExistsPolicy.FileOverwrite);
             }
 
             foreach (var file in Directory.GetFiles(ArtifactsDirectory, $"*.{PackageVersion}.snupkg", SearchOption.AllDirectories))
             {
-                CopyFile(file, DeployPath / Path.GetFileName(file), FileExistsPolicy.Overwrite);
+                ((AbsolutePath) file).CopyToDirectory(DeployPath, ExistsPolicy.FileOverwrite);
             }
         });
 

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="6.2.1" />
+    <PackageReference Include="Nuke.Common" Version="8.1.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Tests/MeasureMap.Benchmark/MeasureMap.Benchmark.csproj b/src/Tests/MeasureMap.Benchmark/MeasureMap.Benchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Tests/MeasureMap.UnitTest/MeasureMap.UnitTest.csproj b/src/Tests/MeasureMap.UnitTest/MeasureMap.UnitTest.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net48</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0</TargetFrameworks>
         <ImplicitUsings>disable</ImplicitUsings>
 
@@ -10,18 +10,24 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+        <PackageReference Include="coverlet.msbuild" Version="6.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
-        <PackageReference Include="NUnit" Version="3.13.3" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-        <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
-        <PackageReference Include="coverlet.collector" Version="3.1.2" />
-        <PackageReference Include="FluentAssertions" Version="6.7.0" />
-        <PackageReference Include="Moq" Version="4.18.2" />
-        <PackageReference Include="Polaroider" Version="2.0.6" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="NUnit" Version="4.2.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+        <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="FluentAssertions" Version="6.12.1" />
+        <PackageReference Include="Moq" Version="4.20.72" />
+        <PackageReference Include="Polaroider" Version="2.3.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Tests/MeasureMap.UnitTest/MemoryProfileSessionTests.cs b/src/Tests/MeasureMap.UnitTest/MemoryProfileSessionTests.cs
@@ -17,7 +17,7 @@ public void MemoryProfileSession_StartSessionTest()
         {
             var session = ProfilerSession.StartSession();
 
-            Assert.IsNotNull(session);
+            session.Should().NotBeNull();
         }
 
         [Test]
@@ -32,7 +32,7 @@ public void MemoryProfileSession_AddTask()
             // TODO: is it neccesary to run the session just to check if a task is set???
             session.RunSession();
 
-            Assert.IsNotNull(session);
+            session.Should().NotBeNull();
         }
 
         [Test]
@@ -76,7 +76,7 @@ public void MemoryProfileSession_AllocateMemory()
                 .SetIterations(100)
                 .RunSession();
 
-            Assert.IsTrue(result.Increase > 0, result.Increase.ToString());
+            result.Increase.Should().BeGreaterThan(0);
         }
     }
 }
diff --git a/src/Tests/MeasureMap.UnitTest/ProfileSessionTests.cs b/src/Tests/MeasureMap.UnitTest/ProfileSessionTests.cs
@@ -27,7 +27,7 @@ public void ProfileSession_StartSessionTest()
         {
             var session = ProfilerSession.StartSession();
 
-            Assert.IsNotNull(session);
+            session.Should().NotBeNull();
         }
 
         [Test]
@@ -486,7 +486,7 @@ public void ProfileSession_Executino_Default()
             var session = ProfilerSession.StartSession()
                 .Task(c => { });
 
-            Assert.IsInstanceOf<SimpleTaskExecution>(session.Settings.Execution);
+            session.Settings.Execution.Should().BeOfType<SimpleTaskExecution>();
         }
 
         [Test]
@@ -496,7 +496,7 @@ public void ProfileSession_Interval()
                 .Task(c => { })
                 .SetInterval(TimeSpan.FromSeconds(.5));
 
-            Assert.IsInstanceOf<TimedTaskExecution>(session.Settings.Execution);
+            session.Settings.Execution.Should().BeOfType<TimedTaskExecution>();
         }
 
         [Test]
@@ -595,7 +595,6 @@ public void ProfileSession_Iteration_Delayed_NoDuplicateIterartion()
                 .Task(c =>
                 {
                     var i = c.Get<int>(ContextKeys.Iteration);
-                    Trace.WriteLine(DateTime.Now);
                     return i;
                 })
                 .SetIterations(10)

diff --git a/src/Tests/MeasureMap.UnitTest/ThreadedProfilerTests.cs b/src/Tests/MeasureMap.UnitTest/ThreadedProfilerTests.cs
@@ -23,7 +23,7 @@ public void ThreadedProfiler_NoThread(ThreadBehaviour behaviour)
                 .SetThreadBehaviour(behaviour)
                 .RunSession();
 
-            Assert.IsInstanceOf<ProfilerResult>(result);
+            result.Should().BeOfType<ProfilerResult>();
 
             Assert.That(((ProfilerResult)result).Count() == 1);
             Assert.That(result.Iterations.Count() == 10);

diff --git a/src/Tests/Measuremap.IntegrationTest/Measuremap.IntegrationTest.csproj b/src/Tests/Measuremap.IntegrationTest/Measuremap.IntegrationTest.csproj
@@ -1,24 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BDTest" Version="2.3.3" />
-    <PackageReference Include="FluentAssertions" Version="6.10.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+    <Using Include="NUnit.Framework" />
+    <Using Include="FluentAssertions" />
+    <Using Remove="System.IO" />
+    <Using Remove="System.Threading" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BDTest" Version="2.3.58" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>