merge origin/main

meziantou · Dec 22, 2024 · 394798a · 394798a
2 parents ec2588d + 66a5ec9
commit 394798a
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -123,7 +123,9 @@ jobs:
           name: ${{ steps.compute-artifact-name.outputs.artifact-name }}
           if-no-files-found: error
           retention-days: 3
-          path: ${{ env.TestResultsDirectory }}/**/*
+          path: |
+            **/*.binlog
+            ${{ env.TestResultsDirectory }}/**/*
 
   build_and_test_windows_x86:
     runs-on: ${{ matrix.runs-on }}
@@ -184,7 +186,9 @@ jobs:
           name: ${{ steps.compute-artifact-name.outputs.artifact-name }}
           if-no-files-found: error
           retention-days: 3
-          path: ${{ env.TestResultsDirectory }}/**/*
+          path: |
+            **/*.binlog
+            ${{ env.TestResultsDirectory }}/**/*
 
   test_trimming:
     runs-on: ubuntu-24.04

diff --git a/eng/validate-testprojects-configuration.ps1 b/eng/validate-testprojects-configuration.ps1
@@ -42,6 +42,10 @@ $Errors = $Projs | Foreach-Object -ThrottleLimit 5 -Parallel {
             if ($RefTfm -eq "netstandard2.1") {
                 continue;
             }
+
+            if ($RefTfm -eq "net462" -and $TestProjectTfms.Contains("net472")) {
+                continue;
+            }
 
             if ($RefTfm -eq "net462" -and $TestProjectTfms.Contains("net472")) {
                 continue;

diff --git a/tests/ArgumentsPrinter/ArgumentsPrinter.csproj b/tests/ArgumentsPrinter/ArgumentsPrinter.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>$(LatestTargetFrameworks)</TargetFrameworks>

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -26,4 +26,4 @@
     </PackageReference>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/tests/Meziantou.Framework.ByteSize.Tests/Meziantou.Framework.ByteSize.Tests.csproj b/tests/Meziantou.Framework.ByteSize.Tests/Meziantou.Framework.ByteSize.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(LatestTargetFrameworks)</TargetFrameworks>

diff --git a/tests/Meziantou.Framework.CodeOwners.Tests/Meziantou.Framework.CodeOwners.Tests.csproj b/tests/Meziantou.Framework.CodeOwners.Tests/Meziantou.Framework.CodeOwners.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(LatestTargetFrameworks)</TargetFrameworks>

diff --git a/tests/Meziantou.Framework.InlineSnapshotTesting.TaskDialog.Tests/TaskDialogPromptTests.cs b/tests/Meziantou.Framework.InlineSnapshotTesting.TaskDialog.Tests/TaskDialogPromptTests.cs
@@ -1,11 +1,5 @@
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Windows.Automation;
-using FluentAssertions;
+using System.Windows.Automation;
 using Meziantou.Framework.InlineSnapshotTesting.SnapshotUpdateStrategies;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 using TestUtilities;
 using Xunit;
 
@@ -89,18 +83,18 @@ internal void Ask(int buttonIndex, bool applyToAllFiles, PromptConfigurationMode
     {
         var result = Invoke(new PromptContext("path.cs", "dummy test", ParentProcessInfo: null), buttonIndex, applyToAllFiles);
 
-        result.Mode.Should().Be(expectedMode);
-        result.Scope.Should().Be(expectedScope);
-        result.RememberPeriod.Should().Be(TimeSpan.FromHours(1));
+        Assert.Equal(expectedMode, result.Mode);
+        Assert.Equal(expectedScope, result.Scope);
+        Assert.Equal(TimeSpan.FromHours(1), result.RememberPeriod);
     }
 
     [Fact, RunIf(FactOperatingSystem.Windows)]
     internal void Ask_Cancel()
     {
         var result = Invoke(new PromptContext("path.cs", "dummy test", ParentProcessInfo: null), buttonIndex: 4, applyToAllFiles: false);
 
-        result.Mode.Should().Be(PromptConfigurationMode.Disallow);
-        result.Scope.Should().Be(PromptConfigurationScope.CurrentSnapshot);
-        result.RememberPeriod.Should().BeLessThanOrEqualTo(TimeSpan.Zero);
+        Assert.Equal(PromptConfigurationMode.Disallow, result.Mode);
+        Assert.Equal(PromptConfigurationScope.CurrentSnapshot, result.Scope);
+        Assert.True(result.RememberPeriod <= TimeSpan.Zero);
     }
 }
diff --git a/...Framework.Tests/DebouceExtensionsTests.cs → ...ramework.Tests/DebounceExtensionsTests.cs b/...Framework.Tests/DebouceExtensionsTests.cs → ...ramework.Tests/DebounceExtensionsTests.cs
@@ -3,20 +3,21 @@
 
 namespace Meziantou.Framework.Tests;
 
-public class DebouceExtensionsTests
+public sealed class DebounceExtensionsTests
 {
     [Fact]
     public void Debounce_CallActionsWithArgumentsOfTheLastCall()
     {
         using var resetEvent = new ManualResetEventSlim(initialState: false);
-        int lastArg = default;
+        var lastArg = 0;
         var count = 0;
         var debounced = DebounceExtensions.Debounce<int>(i =>
         {
             lastArg = i;
-            count++;
+            Interlocked.CompareExchange(ref lastArg, i, 0);
+            Interlocked.Increment(ref count);
             resetEvent.Set();
-        }, TimeSpan.FromMilliseconds(10));
+        }, TimeSpan.FromMilliseconds(200));
 
         debounced(1);
         debounced(2);

diff --git a/.../Meziantou.Framework.ValueStopwatch.Tests/Meziantou.Framework.ValueStopwatch.Tests.csproj b/.../Meziantou.Framework.ValueStopwatch.Tests/Meziantou.Framework.ValueStopwatch.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(LatestTargetFrameworks)</TargetFrameworks>

diff --git a/tests/Meziantou.Framework.WPF.Tests/Meziantou.Framework.WPF.Tests.csproj b/tests/Meziantou.Framework.WPF.Tests/Meziantou.Framework.WPF.Tests.csproj
@@ -7,7 +7,7 @@
     <CompatibilityRecord>true</CompatibilityRecord>
   </PropertyGroup>
 
-  <ItemGroup Condition=" $(TargetFramework) == 'net472' ">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472' ">
     <Reference Include="System.Windows" />
     <PackageReference Include="System.Text.Json" Version="9.0.0" />
   </ItemGroup>

diff --git a/tests/TestUtilities/TestUtilities.csproj b/tests/TestUtilities/TestUtilities.csproj
@@ -17,4 +17,9 @@
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+  </ItemGroup>
+
 </Project>