General Infrastructure Improvements (#613)

* Migrate to Directory.Packages.props * Update dependencies * Update .gitignore with more accurate settings
viceroypenguin · Feb 2, 2024 · 1019eb3 · 1019eb3
1 parent bcecba2
commit 1019eb3
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 64 deletions.
diff --git 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
@@ -19,8 +19,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" Version="3.3.1" PrivateAssets="All" />
-		<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" PrivateAssets="All" />
+		<PackageReference Include="PolySharp" PrivateAssets="All" />
 	</ItemGroup>
 
 	<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,34 @@
+<Project>
+	<PropertyGroup>
+		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
+		<PackageVersion Include="coverlet.collector" Version="6.0.0" />
+		<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
+		<PackageVersion Include="DocFx.App" Version="2.75.2" />
+		<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" Version="3.3.1" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
+		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+		<PackageVersion Include="MinVer" Version="4.3.0" />
+		<PackageVersion Include="PolySharp" Version="1.14.1" />
+		<PackageVersion Include="Scriban" Version="5.9.1" />
+		<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
+		<PackageVersion Include="ThisAssembly.Resources" Version="1.4.3" />
+		<PackageVersion Include="xunit" Version="2.6.6" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
+		<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="All" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+		<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
+	</ItemGroup>
+
+</Project>
diff --git a/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj b/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj
@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="DocFx.App" Version="2.75.1" />
+		<PackageReference Include="DocFx.App" />
 	</ItemGroup>
 
 </Project>
diff --git a/Generators/SuperLinq.Async.Generator/SuperLinq.Async.Generator.csproj b/Generators/SuperLinq.Async.Generator/SuperLinq.Async.Generator.csproj
@@ -20,10 +20,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
-		<PackageReference Include="Scriban" Version="5.9.0" IncludeAssets="build" />
-		<PackageReference Include="ThisAssembly.Resources" Version="1.4.1" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+		<PackageReference Include="Scriban" IncludeAssets="build" />
+		<PackageReference Include="ThisAssembly.Resources" PrivateAssets="all" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Generators/SuperLinq.Generator/SuperLinq.Generator.csproj b/Generators/SuperLinq.Generator/SuperLinq.Generator.csproj
@@ -20,10 +20,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
-		<PackageReference Include="Scriban" Version="5.9.0" IncludeAssets="build" />
-		<PackageReference Include="ThisAssembly.Resources" Version="1.4.1" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+		<PackageReference Include="Scriban" IncludeAssets="build" />
+		<PackageReference Include="ThisAssembly.Resources" PrivateAssets="all" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Source/SuperLinq.Async/SuperLinq.Async.csproj b/Source/SuperLinq.Async/SuperLinq.Async.csproj
@@ -115,10 +115,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-		<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
-		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
+		<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+		<PackageReference Include="MinVer" PrivateAssets="All" />
+		<PackageReference Include="System.Linq.Async" />
 		<ProjectReference Include="..\SuperLinq\SuperLinq.csproj" />
 	</ItemGroup>
 

diff --git a/Source/SuperLinq/SuperLinq.csproj b/Source/SuperLinq/SuperLinq.csproj
@@ -155,9 +155,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-		<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+		<PackageReference Include="MinVer" PrivateAssets="All" />
 	</ItemGroup>
 
 	<PropertyGroup Label="SourceGenerator">

diff --git 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
@@ -34,20 +34,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
-		<PackageReference Include="xunit" Version="2.6.1" />
-		<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="All" />
-		<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="All" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="All" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
+		<PackageReference Include="CommunityToolkit.Diagnostics" />
+		<PackageReference Include="coverlet.collector" PrivateAssets="All" />
+		<PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
+		<PackageReference Include="GitHubActionsTestLogger" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" />
+		<PackageReference Include="xunit" />
+		<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
 	</ItemGroup>
 
 </Project>
diff --git a/Tests/SuperLinq.Test/SuperLinq.Test.csproj b/Tests/SuperLinq.Test/SuperLinq.Test.csproj
@@ -24,20 +24,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
-		<PackageReference Include="xunit" Version="2.6.1" />
-		<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="All" />
-		<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="All" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="All" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
+		<PackageReference Include="CommunityToolkit.Diagnostics" />
+		<PackageReference Include="coverlet.collector" PrivateAssets="All" />
+		<PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
+		<PackageReference Include="GitHubActionsTestLogger" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" />
+		<PackageReference Include="xunit" />
+		<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
 	</ItemGroup>
 
 </Project>