From 1019eb3195da3b9c65a950f4f8d1f4b01dee5cab Mon Sep 17 00:00:00 2001 From: Stuart Turner Date: Fri, 2 Feb 2024 12:47:18 -0600 Subject: [PATCH] General Infrastructure Improvements (#613) * Migrate to Directory.Packages.props * Update dependencies * Update .gitignore with more accurate settings --- .gitignore | 27 +++++---------- Directory.Build.props | 4 +-- Directory.Packages.props | 34 +++++++++++++++++++ Docs/SuperLinq.Docs/SuperLinq.Docs.csproj | 2 +- .../SuperLinq.Async.Generator.csproj | 8 ++--- .../SuperLinq.Generator.csproj | 8 ++--- Source/SuperLinq.Async/SuperLinq.Async.csproj | 8 ++--- Source/SuperLinq/SuperLinq.csproj | 6 ++-- SuperLinq.sln | 1 + .../SuperLinq.Async.Test.csproj | 21 ++++-------- Tests/SuperLinq.Test/SuperLinq.Test.csproj | 21 ++++-------- 11 files changed, 76 insertions(+), 64 deletions(-) create mode 100644 Directory.Packages.props diff --git a/.gitignore b/.gitignore index f09e7b938..783b72efb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,21 @@ -*.opencover.xml - ### VisualStudio ### ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - # Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -[Bb]in/ -[Oo]bj/ +bin/ +obj/ -# Visual Studio 2015 cache/options directory +# Visual Studio cache/options directory .vs/ +*.user + +# VS Code cache/options directory .vscode/ +# Rider cache/options directory +.idea/ + # TestResults [Tt]est[Rr]esults/ diff --git a/Directory.Build.props b/Directory.Build.props index 96155806c..cd5e481d6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -19,8 +19,8 @@ - - + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..6ba62a983 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,34 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj b/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj index dda9d73db..cc00ae1b8 100644 --- a/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj +++ b/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj @@ -8,7 +8,7 @@ - + diff --git a/Generators/SuperLinq.Async.Generator/SuperLinq.Async.Generator.csproj b/Generators/SuperLinq.Async.Generator/SuperLinq.Async.Generator.csproj index f5e55ce4e..5da3b8bbd 100644 --- a/Generators/SuperLinq.Async.Generator/SuperLinq.Async.Generator.csproj +++ b/Generators/SuperLinq.Async.Generator/SuperLinq.Async.Generator.csproj @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/Generators/SuperLinq.Generator/SuperLinq.Generator.csproj b/Generators/SuperLinq.Generator/SuperLinq.Generator.csproj index 1f479d471..472c9226c 100644 --- a/Generators/SuperLinq.Generator/SuperLinq.Generator.csproj +++ b/Generators/SuperLinq.Generator/SuperLinq.Generator.csproj @@ -20,10 +20,10 @@ - - - - + + + + diff --git a/Source/SuperLinq.Async/SuperLinq.Async.csproj b/Source/SuperLinq.Async/SuperLinq.Async.csproj index ea3b81b51..66e6526ff 100644 --- a/Source/SuperLinq.Async/SuperLinq.Async.csproj +++ b/Source/SuperLinq.Async/SuperLinq.Async.csproj @@ -115,10 +115,10 @@ - - - - + + + + diff --git a/Source/SuperLinq/SuperLinq.csproj b/Source/SuperLinq/SuperLinq.csproj index aaf9b51fd..3150cdfd4 100644 --- a/Source/SuperLinq/SuperLinq.csproj +++ b/Source/SuperLinq/SuperLinq.csproj @@ -155,9 +155,9 @@ - - - + + + diff --git a/SuperLinq.sln b/SuperLinq.sln index 337b7338a..a02f6b0ec 100644 --- a/SuperLinq.sln +++ b/SuperLinq.sln @@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{835F8FFA .gitignore = .gitignore .github\dependabot.yml = .github\dependabot.yml Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props license.txt = license.txt README.md = README.md TargetFrameworks.props = TargetFrameworks.props diff --git a/Tests/SuperLinq.Async.Test/SuperLinq.Async.Test.csproj b/Tests/SuperLinq.Async.Test/SuperLinq.Async.Test.csproj index dbbb3c95f..5f478be24 100644 --- a/Tests/SuperLinq.Async.Test/SuperLinq.Async.Test.csproj +++ b/Tests/SuperLinq.Async.Test/SuperLinq.Async.Test.csproj @@ -34,20 +34,13 @@ - - - - - - - - - - - - - - + + + + + + + diff --git a/Tests/SuperLinq.Test/SuperLinq.Test.csproj b/Tests/SuperLinq.Test/SuperLinq.Test.csproj index 44a550085..8424db6f6 100644 --- a/Tests/SuperLinq.Test/SuperLinq.Test.csproj +++ b/Tests/SuperLinq.Test/SuperLinq.Test.csproj @@ -24,20 +24,13 @@ - - - - - - - - - - - - - - + + + + + + +