Skip to content

Commit 1019eb3

Browse files
viceroypenguinviceroypenguin
authored
General Infrastructure Improvements (#613)
* Migrate to Directory.Packages.props * Update dependencies * Update .gitignore with more accurate settings
1 parent bcecba2 commit 1019eb3

File tree

11 files changed

+76
-64
lines changed

11 files changed

+76
-64
lines changed

‎.gitignore

+9-18
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,21 @@
1-
*.opencover.xml
2-
31
### VisualStudio ###
42
## Ignore Visual Studio temporary files, build results, and
53
## files generated by popular Visual Studio add-ons.
64

7-
# User-specific files
8-
*.suo
9-
*.user
10-
*.userosscache
11-
*.sln.docstates
12-
135
# Build results
14-
[Dd]ebug/
15-
[Dd]ebugPublic/
16-
[Rr]elease/
17-
[Rr]eleases/
18-
x64/
19-
x86/
20-
build/
21-
[Bb]in/
22-
[Oo]bj/
6+
bin/
7+
obj/
238

24-
# Visual Studio 2015 cache/options directory
9+
# Visual Studio cache/options directory
2510
.vs/
11+
*.user
12+
13+
# VS Code cache/options directory
2614
.vscode/
2715

16+
# Rider cache/options directory
17+
.idea/
18+
2819
# TestResults
2920
[Tt]est[Rr]esults/
3021

‎Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" Version="3.3.1" PrivateAssets="All" />
23-
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" PrivateAssets="All" />
23+
<PackageReference Include="PolySharp" PrivateAssets="All" />
2424
</ItemGroup>
2525

2626
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

‎Directory.Packages.props

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
6+
<ItemGroup>
7+
<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
8+
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
9+
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
10+
<PackageVersion Include="DocFx.App" Version="2.75.2" />
11+
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
12+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" Version="3.3.1" />
15+
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
17+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
18+
<PackageVersion Include="MinVer" Version="4.3.0" />
19+
<PackageVersion Include="PolySharp" Version="1.14.1" />
20+
<PackageVersion Include="Scriban" Version="5.9.1" />
21+
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
22+
<PackageVersion Include="ThisAssembly.Resources" Version="1.4.3" />
23+
<PackageVersion Include="xunit" Version="2.6.6" />
24+
</ItemGroup>
25+
26+
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
27+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="All" />
28+
</ItemGroup>
29+
30+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
31+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
32+
</ItemGroup>
33+
34+
</Project>

‎Docs/SuperLinq.Docs/SuperLinq.Docs.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="DocFx.App" Version="2.75.1" />
11+
<PackageReference Include="DocFx.App" />
1212
</ItemGroup>
1313

1414
</Project>

‎Generators/SuperLinq.Async.Generator/SuperLinq.Async.Generator.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
24-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
25-
<PackageReference Include="Scriban" Version="5.9.0" IncludeAssets="build" />
26-
<PackageReference Include="ThisAssembly.Resources" Version="1.4.1" PrivateAssets="all" />
23+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
24+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
25+
<PackageReference Include="Scriban" IncludeAssets="build" />
26+
<PackageReference Include="ThisAssembly.Resources" PrivateAssets="all" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎Generators/SuperLinq.Generator/SuperLinq.Generator.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
24-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
25-
<PackageReference Include="Scriban" Version="5.9.0" IncludeAssets="build" />
26-
<PackageReference Include="ThisAssembly.Resources" Version="1.4.1" PrivateAssets="all" />
23+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
24+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
25+
<PackageReference Include="Scriban" IncludeAssets="build" />
26+
<PackageReference Include="ThisAssembly.Resources" PrivateAssets="all" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎Source/SuperLinq.Async/SuperLinq.Async.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@
115115
</ItemGroup>
116116

117117
<ItemGroup>
118-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="All" />
119-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
120-
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
121-
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
118+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
119+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
120+
<PackageReference Include="MinVer" PrivateAssets="All" />
121+
<PackageReference Include="System.Linq.Async" />
122122
<ProjectReference Include="..\SuperLinq\SuperLinq.csproj" />
123123
</ItemGroup>
124124

‎Source/SuperLinq/SuperLinq.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@
155155
</ItemGroup>
156156

157157
<ItemGroup>
158-
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="All" />
159-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
160-
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
158+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
159+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
160+
<PackageReference Include="MinVer" PrivateAssets="All" />
161161
</ItemGroup>
162162

163163
<PropertyGroup Label="SourceGenerator">

‎SuperLinq.sln

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{835F8FFA
88
.gitignore = .gitignore
99
.github\dependabot.yml = .github\dependabot.yml
1010
Directory.Build.props = Directory.Build.props
11+
Directory.Packages.props = Directory.Packages.props
1112
license.txt = license.txt
1213
README.md = README.md
1314
TargetFrameworks.props = TargetFrameworks.props

‎Tests/SuperLinq.Async.Test/SuperLinq.Async.Test.csproj

+7-14
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,13 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
38-
<PackageReference Include="xunit" Version="2.6.1" />
39-
<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="All" />
40-
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="All" />
41-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
42-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="All" />
43-
</ItemGroup>
44-
45-
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
46-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="All" />
47-
</ItemGroup>
48-
49-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
50-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
37+
<PackageReference Include="CommunityToolkit.Diagnostics" />
38+
<PackageReference Include="coverlet.collector" PrivateAssets="All" />
39+
<PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
40+
<PackageReference Include="GitHubActionsTestLogger" PrivateAssets="All" />
41+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
42+
<PackageReference Include="xunit" />
43+
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
5144
</ItemGroup>
5245

5346
</Project>

‎Tests/SuperLinq.Test/SuperLinq.Test.csproj

+7-14
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,13 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
28-
<PackageReference Include="xunit" Version="2.6.1" />
29-
<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="All" />
30-
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="All" />
31-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
32-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="All" />
33-
</ItemGroup>
34-
35-
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
36-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="All" />
37-
</ItemGroup>
38-
39-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
40-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
27+
<PackageReference Include="CommunityToolkit.Diagnostics" />
28+
<PackageReference Include="coverlet.collector" PrivateAssets="All" />
29+
<PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
30+
<PackageReference Include="GitHubActionsTestLogger" PrivateAssets="All" />
31+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
32+
<PackageReference Include="xunit" />
33+
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
4134
</ItemGroup>
4235

4336
</Project>

0 commit comments

Comments
 (0)