Skip to content

Commit 8c9eece

Browse files
jpobstjpobst
authored
[build] Enable NuGet's Central Package Management (#1114)
Context: c936d09 Enable NuGet's [Central Package Management][0]. Although this is similar to the "homegrown" centralized package version management we currently have (c936d09), using the "official" version means that there is additional tooling support available, such as being supported by `dotnet add package`, Visual Studio, and dependabot. Central Package Management also requires [Package Source Mapping][1], so we also add that information to our `NuGet.config`. [0]: https://learn.microsoft.com/nuget/consume-packages/central-package-management [1]: https://learn.microsoft.com/nuget/consume-packages/package-source-mapping
1 parent 93c50fe commit 8c9eece

File tree

6 files changed

+47
-27
lines changed

6 files changed

+47
-27
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<ProduceReferenceAssemblyInOutDir>true</ProduceReferenceAssemblyInOutDir>
1010
<DotNetTargetFrameworkVersion>7.0</DotNetTargetFrameworkVersion>
1111
<DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
12+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1213
</PropertyGroup>
1314

1415
<Import

‎Directory.Build.targets‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,18 @@
33

44
<!-- Add Roslyn analyzers NuGet to all projects -->
55
<ItemGroup Condition=" '$(DisableRoslynAnalyzers)' != 'True' ">
6-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
6+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
77
<PrivateAssets>all</PrivateAssets>
88
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
99
</PackageReference>
1010
</ItemGroup>
1111

12-
<!-- NuGet Dependencies -->
12+
<!-- Set Assets for NUnit3TestAdapter -->
1313
<ItemGroup>
14-
<PackageReference Update="GitInfo" Version="2.1.2" />
15-
<PackageReference Update="HtmlAgilityPack" Version="1.11.30" />
16-
<PackageReference Update="Irony" Version="1.1.0" />
17-
<PackageReference Update="Microsoft.Build.Framework" Version="17.3.2" />
18-
<PackageReference Update="Microsoft.Build.Utilities.Core" Version="17.3.2" />
19-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
20-
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
21-
<PackageReference Update="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22103.1" />
22-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221003-04" />
23-
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
24-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
25-
<PackageReference Update="Microsoft.Xml.SgmlReader" Version="1.8.16" />
26-
<PackageReference Update="Mono.CSharp" Version="4.0.0.143" />
27-
<PackageReference Update="Mono.Linq.Expressions" Version="2.0.0" />
28-
<PackageReference Update="Mono.Options" Version="6.12.0.148" />
29-
<PackageReference Update="Mono.Terminal" Version="5.4.2" />
30-
<PackageReference Update="nunit" Version="3.13.2" />
31-
<PackageReference Update="NUnit.ConsoleRunner" Version="3.12.0" />
32-
<PackageReference Update="NUnit3TestAdapter" Version="4.0.0">
14+
<PackageReference Update="NUnit3TestAdapter">
3315
<PrivateAssets>all</PrivateAssets>
3416
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3517
</PackageReference>
36-
<PackageReference Update="protobuf-net" Version="2.4.4" />
3718
</ItemGroup>
3819

3920
<Import Project="build-tools\scripts\VersionInfo.targets" />

‎Directory.Packages.props‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<_XamarinAndroidCecilVersion Condition=" '$(_XamarinAndroidCecilVersion)' == '' ">0.11.4</_XamarinAndroidCecilVersion>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageVersion Include="GitInfo" Version="2.1.2" />
9+
<PackageVersion Include="HtmlAgilityPack" Version="1.11.30" />
10+
<PackageVersion Include="Irony" Version="1.1.0" />
11+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.3.2" />
12+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.3.2" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" />
15+
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
16+
<PackageVersion Include="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22103.1" />
17+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221003-04" />
18+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
19+
<PackageVersion Include="Microsoft.Xml.SgmlReader" Version="1.8.16" />
20+
<PackageVersion Include="Mono.Cecil" Version="$(_XamarinAndroidCecilVersion)" />
21+
<PackageVersion Include="Mono.CSharp" Version="4.0.0.143" />
22+
<PackageVersion Include="Mono.Linq.Expressions" Version="2.0.0" />
23+
<PackageVersion Include="Mono.Options" Version="6.12.0.148" />
24+
<PackageVersion Include="Mono.Terminal" Version="5.4.2" />
25+
<PackageVersion Include="nunit" Version="3.13.2" />
26+
<PackageVersion Include="NUnit.ConsoleRunner" Version="3.12.0" />
27+
<PackageVersion Include="NUnit3TestAdapter" Version="4.0.0" />
28+
<PackageVersion Include="protobuf-net" Version="2.4.4" />
29+
</ItemGroup>
30+
31+
</Project>

‎NuGet.Config‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,14 @@
1111
<!-- For Microsoft.DotNet.GenAPI -->
1212
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
1313
</packageSources>
14+
15+
<packageSourceMapping>
16+
<!-- key value for <packageSource> should match key values from <packageSources> element -->
17+
<packageSource key="dotnet-public">
18+
<package pattern="*" />
19+
</packageSource>
20+
<packageSource key="dotnet-eng">
21+
<package pattern="Microsoft.DotNet.GenAPI" />
22+
</packageSource>
23+
</packageSourceMapping>
1424
</configuration>

‎build-tools/scripts/cecil.projitems‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<_XamarinAndroidCecilVersion Condition=" '$(_XamarinAndroidCecilVersion)' == '' ">0.11.4</_XamarinAndroidCecilVersion>
5-
</PropertyGroup>
63
<ItemGroup Condition=" '$(_XamarinAndroidCecilPath)' == '' ">
7-
<PackageReference Include="Mono.Cecil" Version="$(_XamarinAndroidCecilVersion)" />
4+
<PackageReference Include="Mono.Cecil" />
85
</ItemGroup>
96
<ItemGroup Condition=" '$(_XamarinAndroidCecilPath)' != '' ">
107
<Reference Include="$(_XamarinAndroidCecilPath)" />

‎tests/Java.Interop.Tools.Expressions-Tests/Java.Interop.Tools.Expressions-Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Import Project="..\..\build-tools\scripts\cecil.projitems" />
2525
-->
2626
<ItemGroup>
27-
<PackageReference Include="Mono.Cecil" Version="0.11.4" />
27+
<PackageReference Include="Mono.Cecil" />
2828
<PackageReference Include="Mono.Linq.Expressions" />
2929
</ItemGroup>
3030

0 commit comments

Comments
 (0)