From 881d211c3b6ed2c8002eb39fca8d075fa01f9c89 Mon Sep 17 00:00:00 2001 From: Christian Walpen Date: Mon, 28 Oct 2024 14:53:01 +0100 Subject: [PATCH] Update dependencies --- appveyor.yml | 6 ++-- build/Build.cs | 18 ++++++------ build/_build.csproj | 2 +- .../MeasureMap.Benchmark.csproj | 2 +- .../MeasureMap.UnitTest.csproj | 28 +++++++++++-------- .../MemoryProfileSessionTests.cs | 6 ++-- .../ProfileSessionTests.cs | 7 ++--- .../ThreadedProfilerTests.cs | 2 +- .../Measuremap.IntegrationTest.csproj | 25 +++++++++++------ 9 files changed, 53 insertions(+), 43 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a90aabf..0ef35e4 100644 --- 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 index c013bf6..c6a805b 100644 --- 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 index 9e5a2e8..60e85ce 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Tests/MeasureMap.Benchmark/MeasureMap.Benchmark.csproj b/src/Tests/MeasureMap.Benchmark/MeasureMap.Benchmark.csproj index 37d4d40..d076b7a 100644 --- a/src/Tests/MeasureMap.Benchmark/MeasureMap.Benchmark.csproj +++ b/src/Tests/MeasureMap.Benchmark/MeasureMap.Benchmark.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/src/Tests/MeasureMap.UnitTest/MeasureMap.UnitTest.csproj b/src/Tests/MeasureMap.UnitTest/MeasureMap.UnitTest.csproj index 2d0527e..8ed510b 100644 --- a/src/Tests/MeasureMap.UnitTest/MeasureMap.UnitTest.csproj +++ b/src/Tests/MeasureMap.UnitTest/MeasureMap.UnitTest.csproj @@ -1,7 +1,7 @@ - + - net6.0;net48 + net8.0 net6.0 disable @@ -10,18 +10,24 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/src/Tests/MeasureMap.UnitTest/MemoryProfileSessionTests.cs b/src/Tests/MeasureMap.UnitTest/MemoryProfileSessionTests.cs index 2c22408..a114d09 100644 --- 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 index 501ab28..f571678 100644 --- 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(session.Settings.Execution); + session.Settings.Execution.Should().BeOfType(); } [Test] @@ -496,7 +496,7 @@ public void ProfileSession_Interval() .Task(c => { }) .SetInterval(TimeSpan.FromSeconds(.5)); - Assert.IsInstanceOf(session.Settings.Execution); + session.Settings.Execution.Should().BeOfType(); } [Test] @@ -595,7 +595,6 @@ public void ProfileSession_Iteration_Delayed_NoDuplicateIterartion() .Task(c => { var i = c.Get(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 index 6681d6b..ac247f9 100644 --- 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(result); + result.Should().BeOfType(); 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 index 0401bd0..8c555ca 100644 --- a/src/Tests/Measuremap.IntegrationTest/Measuremap.IntegrationTest.csproj +++ b/src/Tests/Measuremap.IntegrationTest/Measuremap.IntegrationTest.csproj @@ -1,7 +1,7 @@ - + - net6.0 + net8.0 enable enable @@ -9,16 +9,23 @@ - - - - - - + + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive