Merge pull request #200 from FizzCodeSoftware/dev

net9 dep bump, cleanup
FizzCodeSoftware · Nov 15, 2024 · 3a62607 · 3a62607
2 parents 5b2c5d3 + 4b5a64b
commit 3a62607
Show file tree

Hide file tree

Showing 35 changed files with 69 additions and 68 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -181,6 +181,9 @@ dotnet_diagnostic.SYSLIB1045.severity = silent
 dotnet_diagnostic.SYSLIB1054.severity = silent
 csharp_style_prefer_utf8_string_literals = false:suggestion
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_prefer_system_threading_lock = true:suggestion
+csharp_style_prefer_primary_constructors = false:suggestion
+
 ###############################
 # VB Coding Conventions       #
 ###############################
@@ -196,7 +199,6 @@ dotnet_diagnostic.RCS1097.severity = silent
 
 # RCS1239: Use 'for' statement instead of 'while' statement.
 dotnet_diagnostic.RCS1239.severity = silent
-csharp_style_prefer_primary_constructors = true:silent
 
 # RCS1158: Static member in generic type should use a type parameter
 dotnet_diagnostic.RCS1158.severity = silent

diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml
@@ -22,13 +22,13 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 9
-        dotnet-quality: 'preview'
+        #dotnet-quality: 'preview'
 
     - name: Restore
-      run: dotnet restore /p:Configuration=${{ env.Configuration }} --verbosity normal
+      run: dotnet restore FizzCode.EtLast.sln /p:Configuration=${{ env.Configuration }} --verbosity normal
 
     - name: Build
-      run: dotnet build --configuration ${{ env.Configuration }} --no-restore /p:Version=${{ env.Version }} --verbosity normal
+      run: dotnet build FizzCode.EtLast.sln --configuration ${{ env.Configuration }} --no-restore /p:Version=${{ env.Version }} --verbosity normal
 
     - name: Test
-      run: dotnet test --configuration ${{ env.Configuration }} --no-build --verbosity normal
+      run: dotnet test FizzCode.EtLast.sln --configuration ${{ env.Configuration }} --no-build --verbosity normal
diff --git a/.github/workflows/main-release.yml b/.github/workflows/main-release.yml
@@ -20,22 +20,22 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 9
-        dotnet-quality: 'preview'
+        #dotnet-quality: 'preview'
         source-url: https://pkgs.dev.azure.com/fizzcode/ArtifactFeed/_packaging/FizzSuiteFeed/nuget/v3/index.json
       env:
         NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_APIKEY }}
 
     - name: Restore
-      run: dotnet restore /p:Configuration=${{ env.Configuration }} --verbosity normal
+      run: dotnet restore FizzCode.EtLast.sln /p:Configuration=${{ env.Configuration }} --verbosity normal
 
     - name: Build
-      run: dotnet build --configuration ${{ env.Configuration }} --no-restore /p:Version=${{ env.Version }} --verbosity normal
+      run: dotnet build FizzCode.EtLast.sln --configuration ${{ env.Configuration }} --no-restore /p:Version=${{ env.Version }} --verbosity normal
 
     - name: Test
-      run: dotnet test --configuration ${{ env.Configuration }} --no-build  /p:Version=${{ env.Version }} --verbosity normal
+      run: dotnet test FizzCode.EtLast.sln --configuration ${{ env.Configuration }} --no-build  /p:Version=${{ env.Version }} --verbosity normal
 
     - name: Pack
-      run: dotnet pack --configuration ${{ env.Configuration }} --no-build /p:Version=${{ env.Version }} --verbosity normal --output .packages
+      run: dotnet pack FizzCode.EtLast.sln --configuration ${{ env.Configuration }} --no-build /p:Version=${{ env.Version }} --verbosity normal --output .packages
 
     - name: Push to GitHub Packages
       run: dotnet nuget push .packages\*.nupkg --source https://nuget.pkg.github.com/FizzcodeSoftware/index.json --api-key ${{ secrets.GITHUB_TOKEN }}

diff --git a/EtLast.AdoNet.MsSql/EtLast.AdoNet.MsSql.csproj b/EtLast.AdoNet.MsSql/EtLast.AdoNet.MsSql.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FizzCode.LightWeight.AdoNet.DbConnection" Version="8.0.36" />
+    <PackageReference Include="FizzCode.LightWeight.AdoNet.DbConnection" Version="8.0.40" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>

diff --git a/EtLast.AdoNet/EtLast.AdoNet.csproj b/EtLast.AdoNet/EtLast.AdoNet.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FizzCode.LightWeight.AdoNet.DbConnection" Version="8.0.36" />
+    <PackageReference Include="FizzCode.LightWeight.AdoNet.DbConnection" Version="8.0.40" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/EtLast.CommandService.Windows/EtLast.CommandService.Windows.csproj b/EtLast.CommandService.Windows/EtLast.CommandService.Windows.csproj
@@ -24,8 +24,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Threading.AccessControl" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
+    <PackageReference Include="System.Threading.AccessControl" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/EtLast.CommandService/CommandImplementations/ModuleLoader.cs b/EtLast.CommandService/CommandImplementations/ModuleLoader.cs
@@ -85,8 +85,7 @@ public static ExecutionStatusCode LoadModule(CommandService host, string moduleN
 
         var parseOptions = CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.Preview);
         var syntaxTrees = csFileNames
-            .Select(fn => SyntaxFactory.ParseSyntaxTree(SourceText.From(File.ReadAllText(fn)), parseOptions, fn))
-            .ToList();
+            .ConvertAll(fn => SyntaxFactory.ParseSyntaxTree(SourceText.From(File.ReadAllText(fn)), parseOptions, fn));
 
         var globalUsing = new StringBuilder()
             .AppendLine("global using global::System;")

diff --git a/EtLast.CommandService/EtLast.CommandService.csproj b/EtLast.CommandService/EtLast.CommandService.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FizzCode.LightWeight.Configuration" Version="8.0.36" />
+    <PackageReference Include="FizzCode.LightWeight.Configuration" Version="8.0.43" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -28,7 +28,7 @@
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />    
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />    
   </ItemGroup>
 
   <ItemGroup>

diff --git a/EtLast.Diagnostics.HttpSender/DiagnosticsHttpSender.cs b/EtLast.Diagnostics.HttpSender/DiagnosticsHttpSender.cs
@@ -21,12 +21,12 @@ public class DiagnosticsHttpSender : IDisposable, IEtlContextListener, IEtlConte
     private readonly IEtlContext _context;
     private ExtendedBinaryWriter _currentWriter;
     private readonly ExtendedBinaryWriter _eventWriter = new(new MemoryStream(), Encoding.UTF8);
-    private readonly object _currentWriterLock = new();
+    private readonly Lock _currentWriterLock = new();
     private bool _finished;
     private int _communicationErrorCount;
 
     private readonly Dictionary<string, MessageTemplate> _messageTemplateCache = [];
-    private readonly object _messageTemplateCacheLock = new();
+    private readonly Lock _messageTemplateCacheLock = new();
     private readonly MessageTemplateParser _messageTemplateParser = new();
 
     public DiagnosticsHttpSender(IEtlContext context)

diff --git a/EtLast.Diagnostics.Interface/ContextIndex/ContextIndex.cs b/EtLast.Diagnostics.Interface/ContextIndex/ContextIndex.cs
@@ -7,15 +7,15 @@ public class ContextIndex(string dataDirectory)
     private long _lastStreamSize;
 
     private readonly Dictionary<long, FileStream> _openSinkWriterStreams = [];
-    private readonly object _openSinkWriterStreamsLock = new();
+    private readonly Lock _openSinkWriterStreamsLock = new();
 
     private FileStream _rowEventStream;
     private int _lastRowEventFileIndex;
     private int _lastRowEventFileSize;
-    private readonly object _rowEventStreamLock = new();
+    private readonly Lock _rowEventStreamLock = new();
 
     private readonly Dictionary<long, ExtendedBinaryWriter> _processRowMapWriters = [];
-    private readonly object _processRowMapWritersLock = new();
+    private readonly Lock _processRowMapWritersLock = new();
 
     private readonly EventParser _eventParser = new();
 

diff --git a/EtLast.Diagnostics.Interface/Global.cs b/EtLast.Diagnostics.Interface/Global.cs
@@ -5,3 +5,4 @@
 global using System.IO;
 global using System.Linq;
 global using System.Text;
+global using System.Threading;
diff --git a/EtLast.Diagnostics.Interface/Session/DiagContext.cs b/EtLast.Diagnostics.Interface/Session/DiagContext.cs
@@ -38,7 +38,7 @@ public void FlushToPlaybook()
         List<AbstractEvent> newEvents;
         lock (_stagedEvents)
         {
-            newEvents = new List<AbstractEvent>(_stagedEvents);
+            newEvents = _stagedEvents.ToList();
             _stagedEvents.Clear();
         }
 

diff --git a/EtLast.Diagnostics.Windows/DiagnosticsStateManager/DiagnosticsStateManager.cs b/EtLast.Diagnostics.Windows/DiagnosticsStateManager/DiagnosticsStateManager.cs
@@ -112,7 +112,7 @@ public void ProcessEvents()
         List<DiagContext> newContexts;
         lock (_contextList)
         {
-            newContexts = new List<DiagContext>(_newContextList);
+            newContexts = _newContextList.ToList();
             _newContextList.Clear();
 
             foreach (var ctx in _newContextList)

diff --git a/EtLast.EPPlus/EtLast.EPPlus.csproj b/EtLast.EPPlus/EtLast.EPPlus.csproj
@@ -21,7 +21,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
+    <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/EtLast.Hosting/EtLast.Hosting.csproj b/EtLast.Hosting/EtLast.Hosting.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/EtLast.Hosting/Logging/ConsoleSink/ConsoleSink.cs b/EtLast.Hosting/Logging/ConsoleSink/ConsoleSink.cs
@@ -4,7 +4,7 @@
 public class ConsoleSink : ILogEventSink
 {
     private readonly List<Action<LogEvent, TextWriter>> _writers;
-    private readonly object _lock = new();
+    private readonly Lock _lock = new();
 
     public ConsoleSink(string outputTemplate)
     {
@@ -96,7 +96,7 @@ private static void WriteException(LogEvent logEvent, TextWriter builder)
         if (logEvent.Exception == null)
             return;
 
-        var lines = logEvent.Exception.ToString().Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+        var lines = logEvent.Exception.ToString().Split([Environment.NewLine], StringSplitOptions.RemoveEmptyEntries);
         foreach (var line in lines)
         {
             ColorCodeContext.Write(builder, ColorCode.Exception, line + Environment.NewLine);

diff --git a/EtLast.ServiceModel/EtLast.ServiceModel.csproj b/EtLast.ServiceModel/EtLast.ServiceModel.csproj
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.2" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="9.0.0" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="8.1.0" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/EtLast/EtLast.csproj b/EtLast/EtLast.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FizzCode.LightWeight" Version="8.0.36" />
+    <PackageReference Include="FizzCode.LightWeight" Version="8.0.40" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/EtLast/Mutators/UnpivotMutator.cs b/EtLast/Mutators/UnpivotMutator.cs
@@ -28,11 +28,11 @@ public sealed class UnpivotMutator : AbstractMutator
     protected override void StartMutator()
     {
         _fixColumnNames = FixColumns != null
-            ? new HashSet<string>(FixColumns.Select(x => x.Value ?? x.Key))
+            ? FixColumns.Select(x => x.Value ?? x.Key).ToHashSet()
             : [];
 
         _valueColumnNames = ValueColumns != null
-            ? new HashSet<string>(ValueColumns)
+            ? ValueColumns.ToHashSet()
             : [];
     }
 

diff --git a/EtLast/Processes/Delimited/WriteToDelimitedMutator.cs b/EtLast/Processes/Delimited/WriteToDelimitedMutator.cs
@@ -63,7 +63,7 @@ protected override void StartMutator()
     {
         _delimiterBytes = Encoding.GetBytes(Delimiter.ToString());
         _lineEndingBytes = Encoding.GetBytes(LineEnding);
-        _escapedQuote = new string(new[] { Escape, Quote });
+        _escapedQuote = new string([Escape, Quote]);
         _quoteRequiredChars = [Delimiter, Quote, Escape, '\r', '\n'];
         _quoteAsString = Quote.ToString();
         _quoteBytes = Encoding.GetBytes(Quote.ToString());

diff --git a/EtLast/Processes/Delimited/WriteToDynamicDelimitedMutator.cs b/EtLast/Processes/Delimited/WriteToDynamicDelimitedMutator.cs
@@ -59,7 +59,7 @@ protected override void StartMutator()
     {
         _delimiterBytes = Encoding.GetBytes(Delimiter.ToString());
         _lineEndingBytes = Encoding.GetBytes(LineEnding);
-        _escapedQuote = new string(new[] { Escape, Quote });
+        _escapedQuote = new string([Escape, Quote]);
         _quoteRequiredChars = [Delimiter, Quote, Escape, '\r', '\n'];
         _quoteAsString = Quote.ToString();
         _quoteBytes = Encoding.GetBytes(Quote.ToString());

diff --git a/EtLast/Processes/Delimited/WriteToPartitionedDelimitedFileMutator.cs b/EtLast/Processes/Delimited/WriteToPartitionedDelimitedFileMutator.cs
@@ -67,7 +67,7 @@ protected override void StartMutator()
     {
         _delimiterBytes = Encoding.GetBytes(Delimiter.ToString());
         _lineEndingBytes = Encoding.GetBytes(LineEnding);
-        _escapedQuote = new string(new[] { Escape, Quote });
+        _escapedQuote = new string([Escape, Quote]);
         _quoteRequiredChars = [Delimiter, Quote, Escape, '\r', '\n'];
         _quoteAsString = Quote.ToString();
         _quoteBytes = Encoding.GetBytes(Quote.ToString());

diff --git a/EtLast/Processes/Delimited/WriteToPartitionedDynamicDelimitedFileMutator.cs b/EtLast/Processes/Delimited/WriteToPartitionedDynamicDelimitedFileMutator.cs
@@ -63,7 +63,7 @@ protected override void StartMutator()
     {
         _delimiterBytes = Encoding.GetBytes(Delimiter.ToString());
         _lineEndingBytes = Encoding.GetBytes(LineEnding);
-        _escapedQuote = new string(new[] { Escape, Quote });
+        _escapedQuote = new string([Escape, Quote]);
         _quoteRequiredChars = [Delimiter, Quote, Escape, '\r', '\n'];
         _quoteAsString = Quote.ToString();
         _quoteBytes = Encoding.GetBytes(Quote.ToString());

diff --git a/EtLast/Processes/Splitter/Splitter.cs b/EtLast/Processes/Splitter/Splitter.cs
@@ -7,7 +7,7 @@ public sealed class Splitter<TRowQueue> : AbstractSequence
 
     private TRowQueue _queue;
     private Thread _feederThread;
-    private readonly object _lock = new();
+    private readonly Lock _lock = new();
     private bool _finished;
 
     protected override void ValidateImpl()

diff --git a/Samples/Sample.Etl.Host/Sample.Etl.Host.csproj b/Samples/Sample.Etl.Host/Sample.Etl.Host.csproj
@@ -10,16 +10,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FizzCode.EtLast.CommandService" Version="9.0.195" />
-    <PackageReference Include="FizzCode.EtLast.Diagnostics.HttpSender" Version="9.0.195" />
-    <PackageReference Include="FizzCode.EtLast.EPPlus" Version="9.0.195" />
-    <PackageReference Include="FizzCode.EtLast.LocalFiles" Version="9.0.195" />
+    <PackageReference Include="FizzCode.EtLast.CommandService" Version="9.0.205" />
+    <PackageReference Include="FizzCode.EtLast.Diagnostics.HttpSender" Version="9.0.205" />
+    <PackageReference Include="FizzCode.EtLast.EPPlus" Version="9.0.205" />
+    <PackageReference Include="FizzCode.EtLast.LocalFiles" Version="9.0.205" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/Sample.Etl.Modules/Modules/SampleModule/Startup.cs b/Samples/Sample.Etl.Modules/Modules/SampleModule/Startup.cs
@@ -8,7 +8,6 @@ public void BuildSession(ISessionBuilder session, IArgumentCollection arguments)
             .EnableMicrosoftSqlClient()
             .LogToConsole(LogSeverity.Debug)
             .LogDevToFile()
-            .LogOpsToFile()
-            .LogIoToFile();
+            .LogOpsToFile();
     }
 }
diff --git a/Samples/Sample.Etl.Modules/Sample.Etl.Modules.csproj b/Samples/Sample.Etl.Modules/Sample.Etl.Modules.csproj
@@ -12,12 +12,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FizzCode.EtLast" Version="9.0.195" />
-    <PackageReference Include="FizzCode.EtLast.AdoNet" Version="9.0.195" />
-    <PackageReference Include="FizzCode.EtLast.AdoNet.MsSql" Version="9.0.195" />
-    <PackageReference Include="FizzCode.EtLast.EPPlus" Version="9.0.195" />
-    <PackageReference Include="FizzCode.EtLast.Hosting" Version="9.0.195" />
-    <PackageReference Include="FizzCode.EtLast.LocalFiles" Version="9.0.195" />
+    <PackageReference Include="FizzCode.EtLast" Version="9.0.205" />
+    <PackageReference Include="FizzCode.EtLast.AdoNet" Version="9.0.205" />
+    <PackageReference Include="FizzCode.EtLast.AdoNet.MsSql" Version="9.0.205" />
+    <PackageReference Include="FizzCode.EtLast.EPPlus" Version="9.0.205" />
+    <PackageReference Include="FizzCode.EtLast.Hosting" Version="9.0.205" />
+    <PackageReference Include="FizzCode.EtLast.LocalFiles" Version="9.0.205" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Tests/EtLast.Tests.Base/Assert.ThrowsInvalidProcessParameterException.cs b/Tests/EtLast.Tests.Base/Assert.ThrowsInvalidProcessParameterException.cs
@@ -9,8 +9,8 @@ public static void ThrowsInvalidProcessParameterException<T>(this Assert assert)
 
         var context = TestExecuter.GetContext();
         var builder = SequenceBuilder.Fluent
-        .ReadFrom(TestData.Person())
-        .AddMutator((T)Activator.CreateInstance(typeof(T)));
+            .ReadFrom(TestData.Person())
+            .AddMutator(Activator.CreateInstance<T>());
 
         var result = TestExecuter.Execute(context, builder);
         Assert.AreEqual(0, result.MutatedRows.Count);

diff --git a/Tests/EtLast.Tests.Base/EtLast.Tests.Base.csproj b/Tests/EtLast.Tests.Base/EtLast.Tests.Base.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Tests/EtLast.Tests.EPPlus/EtLast.Tests.EPPlus.csproj b/Tests/EtLast.Tests.EPPlus/EtLast.Tests.EPPlus.csproj
@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Tests/EtLast.Tests.Integration.AdoNetTests/EtLast.Tests.Integration.AdoNetTests.csproj b/Tests/EtLast.Tests.Integration.AdoNetTests/EtLast.Tests.Integration.AdoNetTests.csproj
@@ -18,8 +18,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Tests/EtLast.Tests.Integration.FlowTests/EtLast.Tests.Integration.FlowTests.csproj b/Tests/EtLast.Tests.Integration.FlowTests/EtLast.Tests.Integration.FlowTests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>