Skip to content

Commit d8ea17b

Browse files
Copilotericstj
Copilot
and
ericstj
authored
Convert repository to NuGet Central Package Management (#7482)
* Initial plan for issue * Convert to Central Package Management - implementation complete Co-authored-by: ericstj <[email protected]> * Central Package Management conversion completed successfully Co-authored-by: ericstj <[email protected]> * Convert helix.proj and codecoverage.proj to Central Package Management Co-authored-by: ericstj <[email protected]> * Remove redundant JsonSchema.Net.Generation reference from Microsoft.ML.GenAI.Core Co-authored-by: ericstj <[email protected]> * Remove all redundant transitive dependencies identified in comprehensive analysis Co-authored-by: ericstj <[email protected]> * Apply suggestions from code review * Address code review feedback: remove empty ItemGroup and restore TargetPathWithTargetPlatformMoniker items Co-authored-by: ericstj <[email protected]> * Fix FSharp.Core reference See dotnet/fsharp#18690 When enabling CPM FSProj no longer gets FSharp.Core reference automatically. It needs to be added and represented in CPM. * Fix whitespace --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: ericstj <[email protected]> Co-authored-by: Eric StJohn <[email protected]>
1 parent f861125 commit d8ea17b

File tree

68 files changed

+331
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+331
-236
lines changed

‎Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Import Condition="'$(IsPackable)' == 'true'" Project="$(RepositoryEngineeringDir)Packaging.targets" />
66

77
<ItemGroup Condition="'$(IsUnitTestProject)' == 'true'">
8-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMsbuildVersion)" PrivateAssets="all" />
8+
<PackageReference Include="coverlet.msbuild" PrivateAssets="all" />
99
</ItemGroup>
1010

1111
<Target Name="SetCopyProperties">

‎Directory.Packages.props

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<!-- Enable central package management -->
4+
<PropertyGroup>
5+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
6+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
7+
</PropertyGroup>
8+
9+
<!-- Package versions -->
10+
<ItemGroup>
11+
<!-- Product dependencies -->
12+
<PackageVersion Include="Apache.Arrow" Version="$(ApacheArrowVersion)" />
13+
<PackageVersion Include="Google.Protobuf" Version="$(GoogleProtobufVersion)" />
14+
<PackageVersion Include="JsonSchema.Net" Version="$(JsonSchemaNetVersion)" />
15+
<PackageVersion Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
16+
<PackageVersion Include="LightGBM" Version="$(LightGBMVersion)" />
17+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
18+
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
19+
<PackageVersion Include="Microsoft.Bcl.Memory" Version="$(MicrosoftBclMemoryVersion)" />
20+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
21+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
22+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
23+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
24+
<PackageVersion Include="Microsoft.CSharp" Version="$(MicrosoftCSharpVersion)" />
25+
<PackageVersion Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
26+
<PackageVersion Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
27+
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIVersion)" />
28+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
29+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsVersion)" />
30+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
31+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingVersion)" />
32+
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolVersion)" />
33+
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsVersion)" />
34+
<PackageVersion Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
35+
<PackageVersion Include="Microsoft.ML.OnnxRuntime.Managed" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
36+
<PackageVersion Include="Microsoft.SemanticKernel" Version="$(SemanticKernelVersion)" />
37+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="$(SemanticKernelVersion)" />
38+
<PackageVersion Include="MlNetMklDeps" Version="$(MlNetMklDepsVersion)" />
39+
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
40+
<PackageVersion Include="NuGet.Packaging.Core" Version="$(NuGetVersion)" />
41+
<PackageVersion Include="NuGet.Resolver" Version="$(NuGetVersion)" />
42+
<PackageVersion Include="Parquet.Net" Version="$(ParquetDotNetVersion)" />
43+
<PackageVersion Include="Plotly.NET.CSharp" Version="$(PlotlyNETCSharpVersion)" />
44+
<PackageVersion Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
45+
<PackageVersion Include="SciSharp.TensorFlow.Redist-Linux-GPU" Version="$(TensorFlowVersion)" />
46+
<PackageVersion Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="$(TensorFlowVersion)" />
47+
<PackageVersion Include="SharpZipLib" Version="$(SharpZipLibVersion)" />
48+
<PackageVersion Include="SkiaSharp" Version="$(SkiaSharpVersion)" />
49+
<PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="$(SkiaSharpVersion)" />
50+
<PackageVersion Include="System.Buffers" Version="$(SystemBuffersVersion)" />
51+
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomVersion)" />
52+
<PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
53+
<PackageVersion Include="System.Composition" Version="$(SystemCompositionVersion)" />
54+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
55+
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
56+
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControl)" />
57+
<PackageVersion Include="System.IO.Pipelines" Version="$(SystemIOPipelinesVersion)" />
58+
<PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
59+
<PackageVersion Include="System.Numerics.Tensors" Version="$(SystemNumericsTensorsVersion)" />
60+
<PackageVersion Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />
61+
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightVersion)" />
62+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
63+
<PackageVersion Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindows)" />
64+
<PackageVersion Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
65+
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
66+
<PackageVersion Include="System.Threading.Channels" Version="$(SystemThreadingChannelsVersion)" />
67+
<PackageVersion Include="TensorFlow.NET" Version="$(TensorflowDotNETVersion)" />
68+
<PackageVersion Include="TorchSharp" Version="$(TorchSharpVersion)" />
69+
<PackageVersion Include="TorchSharp.PyBridge" Version="$(TorchSharpPyBridgeVersion)" />
70+
<PackageVersion Include="libtorch-cpu-linux-x64" Version="$(LibTorchVersion)" />
71+
<PackageVersion Include="libtorch-cpu-osx-x64" Version="$(LibTorchVersion)" />
72+
<PackageVersion Include="libtorch-cpu-win-x64" Version="$(LibTorchVersion)" />
73+
74+
<!-- Use the version specified by the SDK when building F# projects -->
75+
<PackageVersion Include="FSharp.Core" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" Version="$(FSCorePackageVersion)" />
76+
77+
<!-- Test-only dependencies -->
78+
<PackageVersion Include="ApprovalTests" Version="$(ApprovalTestsVersion)" />
79+
<PackageVersion Include="AutoGen.Core" Version="$(AutoGenVersion)" />
80+
<PackageVersion Include="AutoGen.SourceGenerator" Version="$(AutoGenVersion)" />
81+
<PackageVersion Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
82+
<PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
83+
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetVersion)" />
84+
<PackageVersion Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
85+
<PackageVersion Include="coverlet.msbuild" Version="$(CoverletMsbuildVersion)" />
86+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
87+
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsVersion)" />
88+
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
89+
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
90+
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
91+
<PackageVersion Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
92+
<PackageVersion Include="Microsoft.ML.TensorFlow.TestModels" Version="$(MicrosoftMLTensorFlowTestModelsVersion)" />
93+
<PackageVersion Include="Microsoft.ML.TestDatabases" Version="$(MicrosoftMLTestDatabasesVersion)" />
94+
<PackageVersion Include="Microsoft.ML.TestModels" Version="$(MicrosoftMLTestModelsVersion)" />
95+
<PackageVersion Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
96+
<PackageVersion Include="Moq" Version="$(MoqVersion)" />
97+
<PackageVersion Include="MSTest.TestAdapter" Version="$(MSTestTestAdapterVersion)" />
98+
<PackageVersion Include="MSTest.TestFramework" Version="$(MSTestTestFrameworkVersion)" />
99+
<PackageVersion Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
100+
<PackageVersion Include="System.Data.SQLite.Core" Version="$(SystemDataSQLiteCoreVersion)" />
101+
<PackageVersion Include="System.Data.SQLite" Version="$(SystemDataSQLiteCoreVersion)" />
102+
<PackageVersion Include="runtime.native.System.Data.SqlClient.sni" Version="$(RuntimeNativeSystemDataSqlClientSniVersion)" />
103+
<PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
104+
105+
<!-- Build/infrastructure dependencies -->
106+
<PackageVersion Include="Codecov" Version="$(CodecovVersion)" />
107+
<PackageVersion Include="Drop.App" Version="$(DropAppVersion)" />
108+
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />
109+
<PackageVersion Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" />
110+
<PackageVersion Include="Microsoft.ManifestTool.CrossPlatform" Version="$(MicrosoftManifestToolCrossPlatformVersion)" />
111+
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(MicrosoftVisualStudioEngMicroBuildCoreVersion)" />
112+
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" Version="$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)" />
113+
<PackageVersion Include="ReportGenerator" Version="$(ReportGeneratorVersion)" />
114+
115+
<!-- Special cases - packages with specific versions not using properties -->
116+
<PackageVersion Include="MathNet.Numerics.Signed" Version="5.0.0" />
117+
<PackageVersion Include="TorchSharp-cuda-windows" Version="0.102.5" />
118+
</ItemGroup>
119+
</Project>

‎build/Codecoverage.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Codecov" Version="$(CodecovVersion)" GeneratePathProperty="true" />
10-
<PackageReference Include="ReportGenerator" Version="$(ReportGeneratorVersion)" GeneratePathProperty="true" />
9+
<PackageReference Include="Codecov" GeneratePathProperty="true" />
10+
<PackageReference Include="ReportGenerator" GeneratePathProperty="true" />
1111
</ItemGroup>
1212

1313
<Target Name="Codecov">

‎docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<NativeAssemblyReference Include="FastTreeNative" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
24+
<PackageReference Include="SciSharp.TensorFlow.Redist" />
2525
</ItemGroup>
2626

2727
</Project>

‎docs/samples/Microsoft.ML.GenAI.Samples/Microsoft.ML.GenAI.Samples.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="TorchSharp-cuda-windows" Version="0.102.5" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
20-
<PackageReference Include="Microsoft.SemanticKernel" Version="$(SemanticKernelVersion)" />
21-
<PackageReference Include="AutoGen.SourceGenerator" Version="$(AutoGenVersion)" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingVersion)" />
23-
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
19+
<PackageReference Include="TorchSharp-cuda-windows" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
20+
<PackageReference Include="Microsoft.SemanticKernel" />
21+
<PackageReference Include="AutoGen.SourceGenerator" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
23+
<PackageReference Include="JsonSchema.Net.Generation" />
2424
</ItemGroup>
2525

2626
</Project>

‎docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
</ItemGroup>
4545

4646
<ItemGroup>
47-
<PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
47+
<PackageReference Include="Microsoft.ML.Onnx.TestModels" />
4848
</ItemGroup>
4949
<ItemGroup Condition=" '$(OS)' == 'Windows_NT'">
50-
<PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="$(TensorFlowVersion)" />
50+
<PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" />
5151
</ItemGroup>
5252
<ItemGroup Condition=" '$(OS)' == 'Unix'">
53-
<PackageReference Include="SciSharp.TensorFlow.Redist-Linux-GPU" Version="$(TensorFlowVersion)" />
53+
<PackageReference Include="SciSharp.TensorFlow.Redist-Linux-GPU" />
5454
</ItemGroup>
5555

5656
<ItemGroup>

‎docs/samples/Microsoft.ML.Samples.OneDal/Microsoft.ML.Samples.OneDal.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<Reference Include="Microsoft.ML.OneDal">
3737
<HintPath>../machinelearning/artifacts/bin/Microsoft.ML.OneDal/Debug/netstandard2.0/Microsoft.ML.OneDal.dll</HintPath>
3838
</Reference>
39-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
39+
<PackageReference Include="Newtonsoft.Json"/>
4040
</ItemGroup>
4141
-->
4242

@@ -48,7 +48,7 @@
4848
<ProjectReference Include="..\..\..\src\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" />
4949
<ProjectReference Include="..\..\..\src\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
5050
<ProjectReference Include="..\..\..\src\Microsoft.ML.OneDal\Microsoft.ML.OneDal.csproj" />
51-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
51+
<PackageReference Include="Newtonsoft.Json" />
5252
</ItemGroup>
5353

5454
</Project>

‎docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -974,10 +974,10 @@
974974
</ItemGroup>
975975

976976
<ItemGroup>
977-
<PackageReference Include="JsonSchema.Net" Version="$(JsonSchemaNetVersion)" />
978-
<PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
979-
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
980-
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
977+
<PackageReference Include="JsonSchema.Net" />
978+
<PackageReference Include="Microsoft.ML.Onnx.TestModels" />
979+
<PackageReference Include="SciSharp.TensorFlow.Redist" />
980+
<PackageReference Include="Microsoft.ML.OnnxRuntime" />
981981
</ItemGroup>
982982

983983
<ItemGroup>

‎eng/common/internal/Tools.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<ItemGroup>
1010
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
1111
<PackageReference Remove="@(PackageReference)"/>
12-
<PackageReference Include="Microsoft.ManifestTool.CrossPlatform" Version="$(MicrosoftManifestToolCrossPlatformVersion)" />
13-
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(MicrosoftVisualStudioEngMicroBuildCoreVersion)" />
14-
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" Version="$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)" />
15-
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
16-
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
12+
<PackageReference Include="Microsoft.ManifestTool.CrossPlatform" />
13+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" />
14+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" />
15+
<PackageReference Include="Microsoft.DotNet.IBCMerge" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
16+
<PackageReference Include="Drop.App" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
1717
</ItemGroup>
1818

1919
<!-- Repository extensibility point -->

‎eng/helix.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
</ItemGroup>
9292

9393
<ItemGroup>
94-
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" PrivateAssets="All" />
94+
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" PrivateAssets="All" />
9595
</ItemGroup>
9696

9797
<Target Name="CreateHelixWorkItems" BeforeTargets="BeforeTest">

0 commit comments

Comments
 (0)