From dcdf4cdff6fb1dd6bc83943a7b8582775e9a7721 Mon Sep 17 00:00:00 2001 From: Matt Edmondson Date: Tue, 11 Aug 2026 18:32:30 +1000 Subject: [PATCH] chore: update ktsu.Sdk to 2.21.1 [patch] Bumps ktsu.Sdk and its variants to 2.21.1 in global.json. File headers are migrated to the single line from COPYRIGHT.md, which is what the SDK writes into .editorconfig as file_header_template and IDE0073 enforces. Removes the PackageVersion entries for Microsoft.Testing.Extensions.CodeCoverage and TrxReport, which MSTest.Sdk 4.3.3 now supplies itself (NU1506). --- .editorconfig | 13 ++++++++--- .gitattributes | 23 +++++++++++-------- .runsettings | 21 +---------------- Directory.Packages.props | 2 -- Navigation.Test/NavigationStackTests.cs | 4 +--- Navigation/Contracts/INavigationItem.cs | 4 +--- Navigation/Contracts/INavigationStack.cs | 4 +--- Navigation/Contracts/IPersistenceProvider.cs | 4 +--- Navigation/Contracts/IUndoRedoProvider.cs | 4 +--- Navigation/Contracts/NavigationEventArgs.cs | 4 +--- Navigation/Models/NavigationItem.cs | 4 +--- Navigation/Models/NavigationState.cs | 4 +--- .../Services/InMemoryPersistenceProvider.cs | 4 +--- .../Services/JsonFilePersistenceProvider.cs | 4 +--- Navigation/Services/NavigateToAction.cs | 4 +--- Navigation/Services/NavigationStack.cs | 4 +--- Navigation/Services/NavigationStackFactory.cs | 4 +--- Navigation/Services/SimpleUndoRedoProvider.cs | 4 +--- global.json | 18 +++++++-------- 19 files changed, 48 insertions(+), 85 deletions(-) diff --git a/.editorconfig b/.editorconfig index c04a279..2cd5f5b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,7 +9,9 @@ charset = utf-8 indent_style = space indent_size = 4 tab_width = 4 -end_of_line = crlf +# LF on every platform, matching the `* text=auto eol=lf` default in .gitattributes. +# Overrides below must stay in step with the eol pins in that file. +end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true @@ -17,7 +19,7 @@ trim_trailing_whitespace = true [*.{cs,csx,cake,fs,fsx,vb,vbx}] indent_style = tab -file_header_template = Copyright (c) ktsu.dev\nAll rights reserved.\nLicensed under the MIT license. +file_header_template = Copyright (c) 2023-2026 ktsu-dev contributors # Default severity for all .NET Code Style rules dotnet_analyzer_diagnostic.severity = error @@ -503,4 +505,9 @@ indent_style = tab # Shell scripts [*.sh] end_of_line = lf -indent_size = 2 \ No newline at end of file +indent_size = 2 + +# Windows batch scripts and Visual Studio solution files keep CRLF on every platform. +# These match the eol=crlf pins in .gitattributes. +[*.{cmd,bat,sln}] +end_of_line = crlf \ No newline at end of file diff --git a/.gitattributes b/.gitattributes index d67e40c..a0bea35 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,20 +4,25 @@ # Git Line Endings # ############################### -# Set default behaviour to automatically normalize line endings. -* text=auto +# Normalize all text files to LF in the repository, and check them out as LF on every +# platform. The explicit eol overrides each machine's core.autocrlf, so the working tree +# is byte-identical on Windows, Linux and macOS. This must stay in step with the +# end_of_line settings in .editorconfig. +* text=auto eol=lf -# csharp files to match .editorconfig -*.cs text eol=crlf +# Force bash scripts to always use LF line endings so that if a repo is accessed +# in Unix via a file share from Windows, the scripts will work. Redundant with the +# default above, kept explicit because these files break outright with CRLF. +*.sh text eol=lf # Force batch scripts to always use CRLF line endings so that if a repo is accessed # in Windows via a file share from Linux, the scripts will work. -*.{cmd,[cC][mM][dD]} text eol=crlf -*.{bat,[bB][aA][tT]} text eol=crlf +*.cmd text eol=crlf +*.bat text eol=crlf -# Force bash scripts to always use LF line endings so that if a repo is accessed -# in Unix via a file share from Windows, the scripts will work. -*.sh text eol=lf +# Visual Studio rewrites solution files with CRLF regardless of the checkout, so pin +# them to avoid a spurious whole-file diff every time the solution is opened. +*.sln text eol=crlf ############################### # Git Large File System (LFS) # diff --git a/.runsettings b/.runsettings index 3c3169d..9bd9f05 100644 --- a/.runsettings +++ b/.runsettings @@ -1,25 +1,6 @@ - - .\coverage + TestResults - - - .\coverage - - - - - - - - opencover - coverage.opencover.xml - [*Test*]*,[*Tests*]* - **/obj/**/* - - - - diff --git a/Directory.Packages.props b/Directory.Packages.props index c279b0d..604a5a5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,13 +3,11 @@ true - - diff --git a/Navigation.Test/NavigationStackTests.cs b/Navigation.Test/NavigationStackTests.cs index 8abf910..a876b15 100644 --- a/Navigation.Test/NavigationStackTests.cs +++ b/Navigation.Test/NavigationStackTests.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors [assembly: Microsoft.VisualStudio.TestTools.UnitTesting.Parallelize(Scope = Microsoft.VisualStudio.TestTools.UnitTesting.ExecutionScope.MethodLevel)] diff --git a/Navigation/Contracts/INavigationItem.cs b/Navigation/Contracts/INavigationItem.cs index 9a0661e..1fe0ac8 100644 --- a/Navigation/Contracts/INavigationItem.cs +++ b/Navigation/Contracts/INavigationItem.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Contracts; diff --git a/Navigation/Contracts/INavigationStack.cs b/Navigation/Contracts/INavigationStack.cs index 9f44390..9c5fe3d 100644 --- a/Navigation/Contracts/INavigationStack.cs +++ b/Navigation/Contracts/INavigationStack.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Contracts; diff --git a/Navigation/Contracts/IPersistenceProvider.cs b/Navigation/Contracts/IPersistenceProvider.cs index 6997965..4356b82 100644 --- a/Navigation/Contracts/IPersistenceProvider.cs +++ b/Navigation/Contracts/IPersistenceProvider.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Contracts; diff --git a/Navigation/Contracts/IUndoRedoProvider.cs b/Navigation/Contracts/IUndoRedoProvider.cs index 97e01c1..8fff550 100644 --- a/Navigation/Contracts/IUndoRedoProvider.cs +++ b/Navigation/Contracts/IUndoRedoProvider.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Contracts; diff --git a/Navigation/Contracts/NavigationEventArgs.cs b/Navigation/Contracts/NavigationEventArgs.cs index 9bea406..5ae4f96 100644 --- a/Navigation/Contracts/NavigationEventArgs.cs +++ b/Navigation/Contracts/NavigationEventArgs.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Contracts; diff --git a/Navigation/Models/NavigationItem.cs b/Navigation/Models/NavigationItem.cs index 4a36735..25d83d9 100644 --- a/Navigation/Models/NavigationItem.cs +++ b/Navigation/Models/NavigationItem.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Models; diff --git a/Navigation/Models/NavigationState.cs b/Navigation/Models/NavigationState.cs index a28753d..083f8c1 100644 --- a/Navigation/Models/NavigationState.cs +++ b/Navigation/Models/NavigationState.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Models; diff --git a/Navigation/Services/InMemoryPersistenceProvider.cs b/Navigation/Services/InMemoryPersistenceProvider.cs index db84ea4..6a1be0b 100644 --- a/Navigation/Services/InMemoryPersistenceProvider.cs +++ b/Navigation/Services/InMemoryPersistenceProvider.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Services; diff --git a/Navigation/Services/JsonFilePersistenceProvider.cs b/Navigation/Services/JsonFilePersistenceProvider.cs index c899021..ae470c6 100644 --- a/Navigation/Services/JsonFilePersistenceProvider.cs +++ b/Navigation/Services/JsonFilePersistenceProvider.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Services; diff --git a/Navigation/Services/NavigateToAction.cs b/Navigation/Services/NavigateToAction.cs index 472fbfa..2074b27 100644 --- a/Navigation/Services/NavigateToAction.cs +++ b/Navigation/Services/NavigateToAction.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Services; diff --git a/Navigation/Services/NavigationStack.cs b/Navigation/Services/NavigationStack.cs index 4ca3460..92c1354 100644 --- a/Navigation/Services/NavigationStack.cs +++ b/Navigation/Services/NavigationStack.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Services; diff --git a/Navigation/Services/NavigationStackFactory.cs b/Navigation/Services/NavigationStackFactory.cs index 63951bc..16e17cd 100644 --- a/Navigation/Services/NavigationStackFactory.cs +++ b/Navigation/Services/NavigationStackFactory.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Services; diff --git a/Navigation/Services/SimpleUndoRedoProvider.cs b/Navigation/Services/SimpleUndoRedoProvider.cs index c210784..aa863e8 100644 --- a/Navigation/Services/SimpleUndoRedoProvider.cs +++ b/Navigation/Services/SimpleUndoRedoProvider.cs @@ -1,6 +1,4 @@ -// Copyright (c) ktsu.dev -// All rights reserved. -// Licensed under the MIT license. +// Copyright (c) 2023-2026 ktsu-dev contributors namespace ktsu.Navigation.Services; diff --git a/global.json b/global.json index 15c86b6..39f7683 100644 --- a/global.json +++ b/global.json @@ -5,15 +5,15 @@ }, "msbuild-sdks": { "MSTest.Sdk": "4.3.3", - "ktsu.Sdk": "2.18.0", - "ktsu.Sdk.ConsoleApp": "2.18.0", - "ktsu.Sdk.Tool": "2.18.0", - "ktsu.Sdk.App": "2.18.0", - "ktsu.Sdk.Windows": "2.18.0", - "ktsu.Sdk.Linux": "2.18.0", - "ktsu.Sdk.macOS": "2.18.0", - "ktsu.Sdk.iOS": "2.18.0", - "ktsu.Sdk.Android": "2.18.0" + "ktsu.Sdk": "2.21.1", + "ktsu.Sdk.ConsoleApp": "2.21.1", + "ktsu.Sdk.Tool": "2.21.1", + "ktsu.Sdk.App": "2.21.1", + "ktsu.Sdk.Windows": "2.21.1", + "ktsu.Sdk.Linux": "2.21.1", + "ktsu.Sdk.macOS": "2.21.1", + "ktsu.Sdk.iOS": "2.21.1", + "ktsu.Sdk.Android": "2.21.1" }, "test": { "runner": "Microsoft.Testing.Platform"