Skip to content

Commit 15d83f8

Browse files
thebenternthebentern
authored
Merge pull request #102 from parkerreno/dev/centralPackageManagement
Move to Central Package Management
2 parents b230c66 + dade088 commit 15d83f8

File tree

5 files changed

+95
-74
lines changed

5 files changed

+95
-74
lines changed

‎Directory.Packages.props

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
6+
<ItemGroup>
7+
<PackageVersion Include="coverlet.collector" Version="6.0.1" />
8+
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
9+
<PackageVersion Include="ILogger.Moq" Version="1.1.10" />
10+
<PackageVersion Include="Google.Protobuf" Version="3.25.3" />
11+
<PackageVersion Include="Google.Protobuf.Tools" Version="3.25.3" />
12+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
13+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
14+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
15+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageVersion Include="Moq" Version="4.18.4" />
18+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
19+
<PackageVersion Include="NUnit" Version="4.1.0" />
20+
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
21+
<PackageVersion Include="NUnit.Analyzers" Version="4.0.1" />
22+
<PackageVersion Include="MQTTnet" Version="4.3.3.952" />
23+
<PackageVersion Include="QRCoder" Version="1.4.3" />
24+
<PackageVersion Include="SimpleExec" Version="12.0.0" />
25+
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
26+
<PackageVersion Include="Spectre.Console.Json" Version="0.49.1" />
27+
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
28+
<PackageVersion Include="System.IO.Ports" Version="8.0.0" />
29+
<PackageVersion Include="YamlDotNet" Version="15.1.2" />
30+
</ItemGroup>
31+
</Project>

‎Meshtastic.Cli/Meshtastic.Cli.csproj

+15-20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
54
<TargetFramework>net8.0</TargetFramework>
@@ -32,34 +31,30 @@
3231
</None>
3332
</ItemGroup>
3433

35-
3634
<ItemGroup>
37-
<PackageReference Include="Google.Protobuf" Version="3.25.3" />
38-
<PackageReference Include="Google.Protobuf.Tools" Version="3.25.3" />
39-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
40-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
41-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
42-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
43-
<PackageReference Include="MQTTnet" Version="4.3.3.952" />
44-
<PackageReference Include="QRCoder" Version="1.4.3" />
45-
<PackageReference Include="SimpleExec" Version="12.0.0" />
46-
<PackageReference Include="Spectre.Console" Version="0.49.1" />
47-
<PackageReference Include="Spectre.Console.Json" Version="0.49.1" />
48-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
49-
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
50-
<PackageReference Include="System.IO.Ports" Version="8.0.0" />
51-
<PackageReference Include="YamlDotNet" Version="15.1.2" />
35+
<PackageReference Include="Google.Protobuf" />
36+
<PackageReference Include="Google.Protobuf.Tools" />
37+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
38+
<PackageReference Include="Microsoft.Extensions.Logging" />
39+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
40+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
41+
<PackageReference Include="MQTTnet" />
42+
<PackageReference Include="QRCoder" />
43+
<PackageReference Include="SimpleExec" />
44+
<PackageReference Include="Spectre.Console" />
45+
<PackageReference Include="Spectre.Console.Json" />
46+
<PackageReference Include="Newtonsoft.Json" />
47+
<PackageReference Include="System.CommandLine" />
48+
<PackageReference Include="System.IO.Ports" />
49+
<PackageReference Include="YamlDotNet" />
5250
</ItemGroup>
5351

54-
5552
<ItemGroup>
5653
<ProjectReference Include="..\Meshtastic\Meshtastic.csproj" />
5754
</ItemGroup>
5855

59-
6056
<ItemGroup>
6157
<Using Include="Spectre.Console" />
6258
<Using Include="System.CommandLine" />
6359
</ItemGroup>
64-
6560
</Project>

‎Meshtastic.Test/Meshtastic.Test.csproj

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net8.0</TargetFramework>
54
<ImplicitUsings>enable</ImplicitUsings>
@@ -15,17 +14,17 @@
1514
</ItemGroup>
1615

1716
<ItemGroup>
18-
<PackageReference Include="FluentAssertions" Version="6.12.0" />
19-
<PackageReference Include="ILogger.Moq" Version="1.1.10" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
21-
<PackageReference Include="Moq" Version="4.18.4" />
22-
<PackageReference Include="NUnit" Version="4.1.0" />
23-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
24-
<PackageReference Include="NUnit.Analyzers" Version="4.0.1">
17+
<PackageReference Include="FluentAssertions" />
18+
<PackageReference Include="ILogger.Moq" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
20+
<PackageReference Include="Moq" />
21+
<PackageReference Include="NUnit" />
22+
<PackageReference Include="NUnit3TestAdapter" />
23+
<PackageReference Include="NUnit.Analyzers">
2524
<PrivateAssets>all</PrivateAssets>
2625
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2726
</PackageReference>
28-
<PackageReference Include="coverlet.collector" Version="6.0.1">
27+
<PackageReference Include="coverlet.collector">
2928
<PrivateAssets>all</PrivateAssets>
3029
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3130
</PackageReference>
@@ -35,5 +34,4 @@
3534
<ProjectReference Include="..\Meshtastic.Cli\Meshtastic.Cli.csproj" />
3635
<ProjectReference Include="..\Meshtastic\Meshtastic.csproj" />
3736
</ItemGroup>
38-
3937
</Project>

‎Meshtastic.sln

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{020BC5F0-48A6-4870-8220-5A4B7A016094}"
1313
ProjectSection(SolutionItems) = preProject
1414
.editorconfig = .editorconfig
15+
Directory.Packages.props = Directory.Packages.props
1516
EndProjectSection
1617
EndProject
1718
Global

‎Meshtastic/Meshtastic.csproj

+40-44
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,44 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<ImplicitUsings>enable</ImplicitUsings>
5+
<Nullable>enable</Nullable>
6+
<RootNamespace>Meshtastic</RootNamespace>
7+
<PackageIcon>logo.png</PackageIcon>
8+
<RepositoryUrl>http://github.com/meshtastic/c-sharp</RepositoryUrl>
9+
<Company>Meshtastic LLC</Company>
10+
<Title>Meshtastic C#</Title>
11+
<IncludeSymbols>True</IncludeSymbols>
12+
<DebugType>embedded</DebugType>
13+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
14+
</PropertyGroup>
215

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<RootNamespace>Meshtastic</RootNamespace>
8-
<PackageIcon>logo.png</PackageIcon>
9-
<RepositoryUrl>http://github.com/meshtastic/c-sharp</RepositoryUrl>
10-
<Company>Meshtastic LLC</Company>
11-
<Title>Meshtastic C#</Title>
12-
<IncludeSymbols>True</IncludeSymbols>
13-
<DebugType>embedded</DebugType>
14-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
15-
</PropertyGroup>
16+
<ItemGroup>
17+
<None Include="..\LICENSE">
18+
<Pack>True</Pack>
19+
<PackagePath>\</PackagePath>
20+
</None>
21+
<None Include="..\logo.png">
22+
<Pack>True</Pack>
23+
<PackagePath>\</PackagePath>
24+
</None>
25+
<None Include="..\README.md">
26+
<Pack>True</Pack>
27+
<PackagePath>\</PackagePath>
28+
</None>
29+
</ItemGroup>
1630

17-
<ItemGroup>
18-
<None Include="..\LICENSE">
19-
<Pack>True</Pack>
20-
<PackagePath>\</PackagePath>
21-
</None>
22-
<None Include="..\logo.png">
23-
<Pack>True</Pack>
24-
<PackagePath>\</PackagePath>
25-
</None>
26-
<None Include="..\README.md">
27-
<Pack>True</Pack>
28-
<PackagePath>\</PackagePath>
29-
</None>
30-
</ItemGroup>
31-
32-
33-
<ItemGroup>
34-
<PackageReference Include="Google.Protobuf" Version="3.25.3" />
35-
<PackageReference Include="Google.Protobuf.Tools" Version="3.25.3" />
36-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
37-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
38-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
39-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
40-
<PackageReference Include="System.IO.Ports" Version="8.0.0" />
41-
</ItemGroup>
42-
43-
44-
<ItemGroup>
45-
<Folder Include="Generated\" />
46-
</ItemGroup>
31+
<ItemGroup>
32+
<PackageReference Include="Google.Protobuf" />
33+
<PackageReference Include="Google.Protobuf.Tools" />
34+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
35+
<PackageReference Include="Microsoft.Extensions.Logging" />
36+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
37+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
38+
<PackageReference Include="System.IO.Ports" />
39+
</ItemGroup>
4740

41+
<ItemGroup>
42+
<Folder Include="Generated\" />
43+
</ItemGroup>
4844
</Project>

0 commit comments

Comments
 (0)