Skip to content

Commit 467f485

Browse files
MpdreamzMpdreamz
authored
Move to Central Nuget Packagement (#939)
* Move to Central Nuget Packagement * post merge build fixes
1 parent f9cc847 commit 467f485

File tree

13 files changed

+133
-96
lines changed

13 files changed

+133
-96
lines changed

‎Directory.Build.props

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
<RepositoryUrl>https://github.com/elastic/elastic-otel-dotnet</RepositoryUrl>
88
<PackageProjectUrl>https://github.com/elastic/elastic-otel-dotnet</PackageProjectUrl>
99
<PackageReleaseNotes>https://github.com/elastic/elastic-otel-dotnet/releases</PackageReleaseNotes>
10-
<IsPackable>False</IsPackable>
1110
</PropertyGroup>
1211

1312
<PropertyGroup>
13+
<IsPackable>False</IsPackable>
14+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1415
<MinVerDefaultPreReleaseIdentifiers>canary.0</MinVerDefaultPreReleaseIdentifiers>
1516
<MinVerMinimumMajorMinor>0.1</MinVerMinimumMajorMinor>
1617
<LangVersion>latest</LangVersion>
@@ -28,7 +29,4 @@
2829
<Using Include="System.Threading.CancellationToken" Alias="Cancel" />
2930
</ItemGroup>
3031

31-
<ItemGroup>
32-
<PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />
33-
</ItemGroup>
3432
</Project>

‎Directory.Packages.props

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!-- Enable central package management, https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<GlobalPackageVersion Include="MinVer" Version="6.0.0" PrivateAssets="All" />
8+
</ItemGroup>
9+
<!-- AWS -->
10+
<ItemGroup>
11+
<PackageVersion Include="Amazon.Lambda.RuntimeSupport" Version="1.12.3"/>
12+
<PackageVersion Include="Amazon.Lambda.Core" Version="2.5.0"/>
13+
<PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
14+
<PackageVersion Include="AWSSDK.S3" Version="3.7.414.5"/>
15+
</ItemGroup>
16+
17+
<!-- Build -->
18+
<ItemGroup>
19+
<PackageVersion Include="Argu" Version="6.2.5" />
20+
<PackageVersion Include="Bullseye" Version="5.0.0" />
21+
<PackageVersion Include="Proc.Fs" Version="0.9.1" />
22+
<PackageVersion Include="Fake.Tools.Git" Version="6.1.3" />
23+
<PackageVersion Include="Fake.IO.Zip" Version="6.1.3" />
24+
<PackageVersion Include="FSharp.Core" Version="9.0.201" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<PackageVersion Include="ConsoleAppFramework" Version="5.4.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
29+
<PackageVersion Include="ConsoleAppFramework.Abstractions" Version="5.4.1" />
30+
<PackageVersion Include="Crayon" Version="2.0.69"/>
31+
<PackageVersion Include="DotNet.Glob" Version="3.1.3" />
32+
<PackageVersion Include="Errata" Version="0.13.0" />
33+
<PackageVersion Include="Github.Actions.Core" Version="9.0.0"/>
34+
<PackageVersion Include="Markdig" Version="0.40.0" />
35+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.3"/>
36+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.3"/>
37+
<PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta12" PrivateAssets="all" ExcludeAssets="runtime" />
38+
<PackageVersion Include="Proc" Version="0.9.1" />
39+
<PackageVersion Include="RazorSlices" Version="0.8.1" />
40+
<PackageVersion Include="Samboy063.Tomlet" Version="6.0.0" />
41+
<PackageVersion Include="Slugify.Core" Version="4.0.1" />
42+
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
43+
<PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
44+
<PackageVersion Include="Utf8StreamReader" Version="1.3.2"/>
45+
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All"/>
46+
<PackageVersion Include="Westwind.AspNetCore.LiveReload" Version="0.5.2" />
47+
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
48+
</ItemGroup>
49+
50+
<!-- Test packages -->
51+
<ItemGroup>
52+
<PackageVersion Include="AngleSharp.Diffing" Version="1.0.0"/>
53+
<PackageVersion Include="DiffPlex" Version="1.7.2"/>
54+
<PackageVersion Include="FluentAssertions" Version="6.12.1"/>
55+
<PackageVersion Include="FsUnit.xUnit" Version="7.0.1"/>
56+
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
57+
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
58+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
59+
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29"/>
60+
<PackageVersion Include="Unquote" Version="7.0.1"/>
61+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2"/>
62+
<PackageVersion Include="xunit.v3" Version="2.0.0"/>
63+
</ItemGroup>
64+
</Project>

‎build/build.fsproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Argu" Version="6.2.5" />
10-
<PackageReference Include="Bullseye" Version="5.0.0" />
11-
<PackageReference Include="Octokit" Version="14.0.0" />
12-
<PackageReference Include="Proc.Fs" Version="0.9.1" />
13-
<PackageReference Include="Fake.Tools.Git" Version="6.1.3" />
14-
<PackageReference Include="Fake.IO.Zip" Version="6.1.3" />
9+
<PackageReference Include="Argu" />
10+
<PackageReference Include="Bullseye" />
11+
<PackageReference Include="Proc.Fs" />
12+
<PackageReference Include="Fake.Tools.Git" />
13+
<PackageReference Include="Fake.IO.Zip" />
14+
<PackageReference Include="FSharp.Core" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/Directory.Build.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,4 @@
1717
<Content Include="$(SolutionRoot)\NOTICE.txt" Pack="True" PackagePath="NOTICE.txt" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest"/>
1818
</ItemGroup>
1919

20-
<ItemGroup>
21-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
22-
</ItemGroup>
2320
</Project>

‎src/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ConsoleAppFramework.Abstractions" Version="5.4.1" />
11-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3"/>
12-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3"/>
13-
<PackageReference Include="Github.Actions.Core" Version="9.0.0"/>
14-
<PackageReference Include="Crayon" Version="2.0.69"/>
15-
<PackageReference Include="Errata" Version="0.13.0" />
10+
<PackageReference Include="ConsoleAppFramework.Abstractions" />
11+
<PackageReference Include="Microsoft.Extensions.Logging" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
13+
<PackageReference Include="Github.Actions.Core" />
14+
<PackageReference Include="Crayon" />
15+
<PackageReference Include="Errata" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Elastic.Markdown.Refactor/Elastic.Markdown.Refactor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0"/>
14+
<PackageReference Include="Microsoft.Extensions.Logging" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/Elastic.Markdown/Elastic.Markdown.csproj

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,18 @@
5151
</Target>
5252

5353
<ItemGroup>
54-
<PackageReference Include="DotNet.Glob" Version="3.1.3" />
55-
<PackageReference Include="Samboy063.Tomlet" Version="6.0.0" />
56-
<PackageReference Include="SoftCircuits.IniFileParser" Version="2.7.0" />
57-
<PackageReference Include="Markdig" Version="0.40.0" />
58-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
59-
<PackageReference Include="RazorSlices" Version="0.9.1" />
60-
<PackageReference Include="Slugify.Core" Version="4.0.1" />
61-
<PackageReference Include="Utf8StreamReader" Version="1.3.2"/>
62-
<PackageReference Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All"/>
63-
<PackageReference Include="YamlDotNet" Version="16.3.0" />
64-
<PackageReference Include="System.IO.Abstractions" Version="21.0.29" />
65-
<PackageReference Include="NetEscapades.EnumGenerators" Version="1.0.0-beta12"
66-
PrivateAssets="all" ExcludeAssets="runtime" />
54+
<PackageReference Include="DotNet.Glob" />
55+
<PackageReference Include="Samboy063.Tomlet" />
56+
<PackageReference Include="SoftCircuits.IniFileParser" />
57+
<PackageReference Include="Markdig" />
58+
<PackageReference Include="Microsoft.Extensions.Logging" />
59+
<PackageReference Include="RazorSlices" />
60+
<PackageReference Include="Slugify.Core" />
61+
<PackageReference Include="Utf8StreamReader" />
62+
<PackageReference Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" />
63+
<PackageReference Include="YamlDotNet" />
64+
<PackageReference Include="System.IO.Abstractions" />
65+
<PackageReference Include="NetEscapades.EnumGenerators" />
6766
</ItemGroup>
6867

6968
</Project>

‎src/docs-assembler/docs-assembler.csproj

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="AWSSDK.S3" Version="3.7.416.5" />
20-
<PackageReference Include="ConsoleAppFramework.Abstractions" Version="5.4.1" />
21-
<PackageReference Include="ConsoleAppFramework" Version="5.4.1" PrivateAssets="all">
22-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23-
</PackageReference>
24-
<PackageReference Include="Proc" Version="0.9.1" />
25-
<PackageReference Include="YamlDotNet" Version="16.3.0" />
26-
<PackageReference Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3"
27-
PrivateAssets="all" ExcludeAssets="runtime"/>
19+
<PackageReference Include="AWSSDK.S3"/>
20+
<PackageReference Include="ConsoleAppFramework.Abstractions"/>
21+
<PackageReference Include="ConsoleAppFramework" />
22+
<PackageReference Include="Proc" />
23+
<PackageReference Include="YamlDotNet" />
24+
<PackageReference Include="NetEscapades.EnumGenerators" />
25+
<PackageReference Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" />
2826
</ItemGroup>
2927

3028
<ItemGroup>

‎src/docs-builder/docs-builder.csproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="ConsoleAppFramework.Abstractions" Version="5.4.1" />
23-
<PackageReference Include="ConsoleAppFramework" Version="5.4.1" PrivateAssets="all">
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25-
</PackageReference>
26-
<PackageReference Include="Westwind.AspNetCore.LiveReload" Version="0.5.2" />
22+
<PackageReference Include="ConsoleAppFramework.Abstractions" />
23+
<PackageReference Include="ConsoleAppFramework" />
24+
<PackageReference Include="Westwind.AspNetCore.LiveReload" />
2725
</ItemGroup>
2826

2927
<ItemGroup>

‎src/infra/docs-lambda-index-publisher/docs-lambda-index-publisher.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<RootNamespace>Elastic.Documentation.Lambda.LinkIndexUploader</RootNamespace>
2020
</PropertyGroup>
2121
<ItemGroup>
22-
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.12.3"/>
23-
<PackageReference Include="Amazon.Lambda.Core" Version="2.5.0"/>
24-
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4"/>
25-
<PackageReference Include="AWSSDK.S3" Version="3.7.416.5"/>
22+
<PackageReference Include="Amazon.Lambda.RuntimeSupport" />
23+
<PackageReference Include="Amazon.Lambda.Core" />
24+
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" />
25+
<PackageReference Include="AWSSDK.S3" />
2626
</ItemGroup>
2727
<ItemGroup>
2828
<ProjectReference Include="..\..\Elastic.Markdown\Elastic.Markdown.csproj"/>

0 commit comments

Comments
 (0)