Skip to content

Commit f2c5a83

Browse files
arturcicarturcic
committed
introduce common Directory.Packages.props
1 parent 06478cd commit f2c5a83

13 files changed

+72
-26
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
*.dotCover
3636
*.orig
3737
*~
38+
msbuild.binlog
3839

3940
## If you have NuGet Package Restore enabled, uncomment this
4041
packages/

‎Directory.Packages.props

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="LibGit2Sharp" Version="0.29.0" />
7+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
8+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
9+
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
10+
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
11+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
12+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
13+
<PackageVersion Include="Polly" Version="8.3.0" />
14+
<PackageVersion Include="Roslynator.Analyzers" Version="4.11.0" />
15+
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.11.0" />
16+
</ItemGroup>
17+
</Project>

‎new-cli/Directory.Packages.props

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('$(MSBuildThisFile)', '$(MSBuildThisFileDirectory)..\'))" />
23
<PropertyGroup>
34
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
45
</PropertyGroup>
56
<ItemGroup>
6-
<PackageVersion Include="LibGit2Sharp" Version="0.29.0" />
7-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
8-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
9-
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
10-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
11-
<PackageVersion Include="Polly" Version="8.3.0" />
7+
128
<PackageVersion Include="Scriban" Version="5.9.1" />
139
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
1410
<PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
1511
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
1612
<PackageVersion Include="Serilog.Sinks.Map" Version="1.0.2" />
1713
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24126.1" />
18-
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
1914
</ItemGroup>
2015
</Project>

‎new-cli/GitVersion.Core/GitVersion.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ProjectReference Include="..\GitVersion.Common\GitVersion.Common.csproj" />
44
</ItemGroup>
55
<ItemGroup>
6-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
6+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
77
<PackageReference Include="Serilog.Extensions.Logging" />
88
<PackageReference Include="Serilog.Sinks.Console" />
99
<PackageReference Include="Serilog.Sinks.File" />

‎new-cli/GitVersion.sln

+6
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersion.Core.Libgit2Shar
4747
EndProject
4848
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersion.Cli.Generator", "GitVersion.Cli.Generator\GitVersion.Cli.Generator.csproj", "{AF22F642-625A-4A33-92A5-161EE4E2B0CE}"
4949
EndProject
50+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{D27CECCB-F012-433C-B026-84979C8C731E}"
51+
ProjectSection(SolutionItems) = preProject
52+
..\global.json = ..\global.json
53+
..\Directory.Packages.props = ..\Directory.Packages.props
54+
EndProjectSection
55+
EndProject
5056
Global
5157
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5258
Debug|Any CPU = Debug|Any CPU

‎src/.run/cli.run.xml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="cli" type="DotNetProject" factoryName=".NET Project">
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net8.0/gitversion.exe" />
4+
<option name="PROGRAM_PARAMETERS" value="" />
5+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net8.0" />
6+
<option name="PASS_PARENT_ENVS" value="1" />
7+
<option name="USE_EXTERNAL_CONSOLE" value="0" />
8+
<option name="USE_MONO" value="0" />
9+
<option name="RUNTIME_ARGUMENTS" value="" />
10+
<option name="PROJECT_PATH" value="$PROJECT_DIR$/GitVersion.App/GitVersion.App.csproj" />
11+
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
12+
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
13+
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
14+
<option name="PROJECT_KIND" value="DotNetCore" />
15+
<option name="PROJECT_TFM" value="net8.0" />
16+
<method v="2">
17+
<option name="Build" />
18+
</method>
19+
</configuration>
20+
</component>

‎src/.run/GitVersion.Schema.run.xml renamed to ‎src/.run/schema.run.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="GitVersion.Schema" type="DotNetProject" factoryName=".NET Project">
2+
<configuration default="false" name="schema" type="DotNetProject" factoryName=".NET Project">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.Schema/bin/Debug/net8.0/schema.exe" />
44
<option name="PROGRAM_PARAMETERS" value="--OutputDirectory schemas --Version 6.0" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />

‎src/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
</PackageReference>
5959
</ItemGroup>
6060
<ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' ">
61-
<PackageReference Include="Microsoft.Extensions.DependencyInjection"/>
6261
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
6362

6463
<PackageReference Include="NSubstitute"/>

‎src/Directory.Packages.props

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('$(MSBuildThisFile)', '$(MSBuildThisFileDirectory)..\'))" />
23
<PropertyGroup>
34
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
45
</PropertyGroup>
56
<ItemGroup>
67
<PackageVersion Include="Buildalyzer" Version="6.0.4" />
78
<PackageVersion Include="JsonSchema.Net.Generation" Version="4.1.1" />
89
<PackageVersion Include="JunitXml.TestLogger" Version="3.1.12" />
9-
<PackageVersion Include="LibGit2Sharp" Version="0.29.0" />
1010
<PackageVersion Include="MSBuild.ProjectCreation" Version="11.0.1" />
1111
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
1212
<PackageVersion Include="Microsoft.Build" Version="17.9.5" />
1313
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.9.5" />
14-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
15-
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
1614
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
17-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
18-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
1915
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
2016
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
2117
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
@@ -25,9 +21,6 @@
2521
<PackageVersion Include="NUnit" Version="4.1.0" />
2622
<PackageVersion Include="NUnit.Analyzers" Version="4.0.1" />
2723
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
28-
<PackageVersion Include="Polly" Version="8.3.0" />
29-
<PackageVersion Include="Roslynator.Analyzers" Version="4.11.0" />
30-
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.11.0" />
3124
<PackageVersion Include="Shouldly" Version="4.2.1" />
3225
<PackageVersion Include="System.Text.Json" Version="8.0.2" />
3326
<PackageVersion Include="YamlDotNet" Version="15.1.2" />

‎src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<ProjectReference Include="..\GitVersion.Core\GitVersion.Core.csproj" />
1414
<ProjectReference Include="..\GitVersion.Output\GitVersion.Output.csproj" />
1515
</ItemGroup>
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
18+
</ItemGroup>
1619
<ItemGroup>
1720
<Content Include="VersionCalculation\Approved\**\*.approved.txt" />
1821
<Content Include="VersionConverters\Approved\**\*.approved.txt" />

‎src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
88
<PackageReference Include="Microsoft.Build" />
99
<PackageReference Include="Microsoft.Build.Utilities.Core" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
1011
</ItemGroup>
1112

1213
<ItemGroup>

‎src/GitVersion.sln

+13-8
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{542E443E-14C
3636
ProjectSection(SolutionItems) = preProject
3737
Directory.Build.props = Directory.Build.props
3838
Directory.Packages.props = Directory.Packages.props
39-
..\.editorconfig = ..\.editorconfig
40-
..\.gitattributes = ..\.gitattributes
41-
..\.gitignore = ..\.gitignore
42-
..\GitVersion.yml = ..\GitVersion.yml
43-
..\schemas\6.0\GitVersion.configuration.json = ..\schemas\6.0\GitVersion.configuration.json
44-
..\schemas\6.0\GitVersion.json = ..\schemas\6.0\GitVersion.json
45-
..\global.json = ..\global.json
4639
EndProjectSection
4740
EndProject
4841
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "readme", "readme", "{1F4BE015-699F-464A-8FF0-D8762102421A}"
@@ -56,6 +49,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "readme", "readme", "{1F4BE0
5649
EndProject
5750
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersion.Configuration.Tests", "GitVersion.Configuration.Tests\GitVersion.Configuration.Tests.csproj", "{E3722E82-D283-4BA7-B44F-C43072B829FA}"
5851
EndProject
52+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{7D3A83B4-95D9-42AF-AB11-6292209CF00B}"
53+
ProjectSection(SolutionItems) = preProject
54+
..\.editorconfig = ..\.editorconfig
55+
..\.gitattributes = ..\.gitattributes
56+
..\.gitignore = ..\.gitignore
57+
..\GitVersion.yml = ..\GitVersion.yml
58+
..\global.json = ..\global.json
59+
..\schemas\6.0\GitVersion.json = ..\schemas\6.0\GitVersion.json
60+
..\schemas\6.0\GitVersion.configuration.json = ..\schemas\6.0\GitVersion.configuration.json
61+
..\Directory.Packages.props = ..\Directory.Packages.props
62+
EndProjectSection
63+
EndProject
5964
Global
6065
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6166
Debug|Any CPU = Debug|Any CPU
@@ -132,9 +137,9 @@ Global
132137
{85060C01-6DAF-48E9-9D7E-AEDA8FFEB0DD} = {69C36B9D-E496-42A2-B091-C055E999686C}
133138
{843450BC-3A6D-4DA6-8520-2D9A9C8218AC} = {69C36B9D-E496-42A2-B091-C055E999686C}
134139
{13C60949-7225-4B08-BE63-CAAC5E25FD16} = {69C36B9D-E496-42A2-B091-C055E999686C}
135-
{1F4BE015-699F-464A-8FF0-D8762102421A} = {542E443E-14C3-45A7-A2E9-ACF27286A3B2}
136140
{B93C3F0C-6CBF-49E6-A476-A0103319640B} = {69C36B9D-E496-42A2-B091-C055E999686C}
137141
{E3722E82-D283-4BA7-B44F-C43072B829FA} = {69C36B9D-E496-42A2-B091-C055E999686C}
142+
{1F4BE015-699F-464A-8FF0-D8762102421A} = {7D3A83B4-95D9-42AF-AB11-6292209CF00B}
138143
EndGlobalSection
139144
GlobalSection(ExtensibilityGlobals) = postSolution
140145
SolutionGuid = {0C1C310E-7A4D-4032-878B-6DC375894C49}

‎tests/integration/Directory.Packages.props

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
</Project>

0 commit comments

Comments
 (0)