Skip to content

Commit 9f6d03a

Browse files
ericstjericstj
authored
Consolidate all dependencies in Versions.props (dotnet#6167)
1 parent c0e1645 commit 9f6d03a

File tree

38 files changed

+131
-201
lines changed

38 files changed

+131
-201
lines changed

‎Directory.Build.props

-19
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,4 @@
5858
<IncludeSymbols>true</IncludeSymbols>
5959
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
6060
</PropertyGroup>
61-
62-
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
63-
<!--
64-
When building using source-build the process is:
65-
- Newtonsoft.Json versions 9.0.1 and 12.0.2 are built by source-build
66-
- Version 12.0.2 is written to Version.props
67-
- Arcade needs to use 9.0.1 so we need to override Version.props value here
68-
-->
69-
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
70-
</PropertyGroup>
71-
72-
<PropertyGroup Condition="'$(DotNetBuildOffline)' == 'true'">
73-
<!--
74-
Arcade has a special version prop for CodeAnalysis.CSharp in GenFacades
75-
to try to match the version loaded by msbuild. In the offline build, this
76-
is simply the source-built version.
77-
-->
78-
<MsbuildTaskMicrosoftCodeAnalysisCSharpVersion>$(MicrosoftCodeAnalysisCSharpVersion)</MsbuildTaskMicrosoftCodeAnalysisCSharpVersion>
79-
</PropertyGroup>
8061
</Project>

‎Directory.Build.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44

55
<ItemGroup Condition="'$(IsUnitTestProject)' == 'true'">
6-
<PackageReference Include="coverlet.msbuild" Version="2.9.0" PrivateAssets="all" />
6+
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMsbuildVersion)" PrivateAssets="all" />
77
</ItemGroup>
88

99
<Target Name="SetCopyProperties">

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@
977977
<ItemGroup>
978978
<PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
979979
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
980-
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimePackageVersion)" />
980+
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
981981
</ItemGroup>
982982

983983
<ItemGroup>

‎eng/Versions.props

+57-107
Original file line numberDiff line numberDiff line change
@@ -12,127 +12,77 @@
1212
<VersionPrefix>2.0.0</VersionPrefix>
1313
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
1414
<AssemblyVersion>1.0.0.0</AssemblyVersion>
15-
<!--ML.NET Core dependencies-->
16-
<NewtonsoftJsonPackageVersion>10.0.3</NewtonsoftJsonPackageVersion>
17-
<SystemCodeDomPackageVersion>4.5.0</SystemCodeDomPackageVersion>
18-
<SystemReflectionEmitLightweightPackageVersion>4.3.0</SystemReflectionEmitLightweightPackageVersion>
19-
<SystemThreadingChannelsPackageVersion>4.7.1</SystemThreadingChannelsPackageVersion>
20-
<!-- Other/External dependencies -->
21-
<GoogleProtobufPackageVersion>3.19.4</GoogleProtobufPackageVersion>
22-
<LightGBMPackageVersion>2.3.1</LightGBMPackageVersion>
23-
<MicrosoftExtensionsPackageVersion>2.1.0</MicrosoftExtensionsPackageVersion>
24-
<MicrosoftMLOnnxRuntimePackageVersion>1.10.0</MicrosoftMLOnnxRuntimePackageVersion>
25-
<MlNetMklDepsPackageVersion>0.0.0.12</MlNetMklDepsPackageVersion>
26-
<ParquetDotNetPackageVersion>2.1.3</ParquetDotNetPackageVersion>
27-
<SystemDrawingCommonPackageVersion>4.5.0</SystemDrawingCommonPackageVersion>
15+
16+
<!-- .NET Runtime product dependencies -->
17+
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
18+
<MicrosoftExtensionsVersion>2.1.0</MicrosoftExtensionsVersion>
19+
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0</MicrosoftExtensionsDependencyInjectionVersion>
20+
<SystemBuffersVersion>4.5.0</SystemBuffersVersion>
21+
<SystemCodeDomVersion>4.5.0</SystemCodeDomVersion>
22+
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
23+
<SystemDrawingCommonVersion>4.5.0</SystemDrawingCommonVersion>
2824
<SystemIOFileSystemAccessControl>4.5.0</SystemIOFileSystemAccessControl>
25+
<SystemMemoryVersion>4.5.3</SystemMemoryVersion>
26+
<SystemReflectionEmitLightweightVersion>4.3.0</SystemReflectionEmitLightweightVersion>
27+
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>
28+
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
2929
<SystemSecurityPrincipalWindows>4.5.0</SystemSecurityPrincipalWindows>
30-
<TensorFlowVersion>2.3.1</TensorFlowVersion>
31-
<TensorFlowMajorVersion>2</TensorFlowMajorVersion>
32-
<TensorflowDotNETVersion>0.20.1</TensorflowDotNETVersion>
33-
<MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>3.3.1</MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>
34-
<MicrosoftDotNetInteractiveVersion>1.0.0-beta.22103.1</MicrosoftDotNetInteractiveVersion>
35-
<MicrosoftDotNetInteractiveFormattingVersion>1.0.0-beta.22103.1</MicrosoftDotNetInteractiveFormattingVersion>
30+
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
31+
<SystemTextJsonVersion>6.0.1</SystemTextJsonVersion>
32+
<SystemThreadingChannelsVersion>4.7.1</SystemThreadingChannelsVersion>
33+
34+
<!-- Other product dependencies -->
3635
<ApacheArrowVersion>2.0.0</ApacheArrowVersion>
37-
<SystemTextEncodingVersion>4.3.0</SystemTextEncodingVersion>
38-
<MicrosoftCSharpVersion>4.5.0</MicrosoftCSharpVersion>
39-
<SystemCompositionVersion>1.2.0</SystemCompositionVersion>
40-
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
41-
<ApprovalTestVersion>5.4.7</ApprovalTestVersion>
36+
<GoogleProtobufVersion>3.19.4</GoogleProtobufVersion>
37+
<LightGBMVersion>2.3.1</LightGBMVersion>
38+
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.0</MicrosoftCodeAnalysisAnalyzersVersion>
39+
<MicrosoftCodeAnalysisCSharpVersion>3.9.0</MicrosoftCodeAnalysisCSharpVersion>
40+
<MicrosoftDotNetInteractiveFormattingVersion>1.0.0-beta.22103.1</MicrosoftDotNetInteractiveFormattingVersion>
41+
<MicrosoftDotNetInteractiveVersion>1.0.0-beta.22103.1</MicrosoftDotNetInteractiveVersion>
42+
<MicrosoftMLFeaturizersVersion>0.4.1</MicrosoftMLFeaturizersVersion>
43+
<MicrosoftMLOnnxRuntimeVersion>1.10.0</MicrosoftMLOnnxRuntimeVersion>
44+
<MlNetMklDepsVersion>0.0.0.12</MlNetMklDepsVersion>
45+
<MSTestTestAdapterVersion>2.1.0</MSTestTestAdapterVersion>
46+
<MSTestTestFrameworkVersion>2.1.0</MSTestTestFrameworkVersion>
47+
<NewtonsoftJsonVersion>10.0.3</NewtonsoftJsonVersion>
48+
<ParquetDotNetVersion>2.1.3</ParquetDotNetVersion>
49+
<SharpZipLibVersion>1.3.3</SharpZipLibVersion>
50+
<TensorflowDotNETVersion>0.20.1</TensorflowDotNETVersion>
51+
<TensorFlowMajorVersion>2</TensorFlowMajorVersion>
52+
<TensorFlowVersion>2.3.1</TensorFlowVersion>
53+
4254
<!-- Build/infrastructure Dependencies -->
43-
<PublishSymbolsPackageVersion>1.0.0-beta-62824-02</PublishSymbolsPackageVersion>
4455
<CodecovVersion>1.12.4</CodecovVersion>
4556
<CoverletCollectorVersion>1.2.1</CoverletCollectorVersion>
46-
<ReportGeneratorVersion>4.3.6</ReportGeneratorVersion>
47-
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19225.5</MicrosoftDotNetApiCompatPackageVersion>
57+
<CoverletMsbuildVersion>2.9.0</CoverletMsbuildVersion>
58+
<MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>3.3.1</MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>
59+
<MicrosoftCSharpVersion>4.5.0</MicrosoftCSharpVersion>
60+
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19225.5</MicrosoftDotNetApiCompatVersion>
4861
<MicrosoftSourceLinkVersion>1.1.0-beta-20206-02</MicrosoftSourceLinkVersion>
49-
<BuildToolsPackageVersion>3.0.0-preview4-04926-01</BuildToolsPackageVersion>
62+
<MicrosoftSymbolUploaderBuildTaskVersion>1.1.225302</MicrosoftSymbolUploaderBuildTaskVersion>
63+
<ReportGeneratorVersion>4.3.6</ReportGeneratorVersion>
64+
<SystemCompositionVersion>1.2.0</SystemCompositionVersion>
65+
5066
<!-- Test-only Dependencies -->
67+
<ApprovalTestsVersion>5.4.7</ApprovalTestsVersion>
5168
<BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
69+
<DotNetRuntime21Version>2.1.0</DotNetRuntime21Version>
70+
<DotNetRuntime31Version>3.1.0</DotNetRuntime31Version>
71+
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
5272
<MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20374.2</MicrosoftCodeAnalysisTestingVersion>
53-
<MicrosoftExtensionsTestPackageVersion>3.0.1</MicrosoftExtensionsTestPackageVersion>
54-
<MicrosoftMLTestDatabasesPackageVersion>0.0.6-test</MicrosoftMLTestDatabasesPackageVersion>
55-
<MicrosoftMLTestModelsPackageVersion>0.0.7-test</MicrosoftMLTestModelsPackageVersion>
56-
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
73+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22215.2</MicrosoftDotNetXUnitExtensionsVersion>
74+
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
75+
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
5776
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
77+
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
78+
<MicrosoftMLTestDatabasesVersion>0.0.6-test</MicrosoftMLTestDatabasesVersion>
79+
<MicrosoftMLTestModelsVersion>0.0.7-test</MicrosoftMLTestModelsVersion>
5880
<SystemDataSqlClientVersion>4.6.1</SystemDataSqlClientVersion>
59-
<XunitCombinatorialVersion>1.2.7</XunitCombinatorialVersion>
6081
<SystemDataSQLiteCoreVersion>1.0.112.2</SystemDataSQLiteCoreVersion>
61-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22215.2</MicrosoftDotNetXUnitExtensionsVersion>
82+
<XunitCombinatorialVersion>1.2.7</XunitCombinatorialVersion>
83+
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
84+
6285
<!-- Opt-out repo features -->
6386
<UsingToolXliff>false</UsingToolXliff>
64-
<UsingToolNetFrameworkReferenceAssemblies Condition="'$(DotNetBuildFromSource)' != 'true'">true</UsingToolNetFrameworkReferenceAssemblies>
65-
<!-- Libs -->
66-
<CommandLineParserVersion>2.2.1</CommandLineParserVersion>
67-
<CredentialManagementVersion>1.0.2</CredentialManagementVersion>
68-
<MicrosoftCciVersion>4.0.0-rc3-24214-00</MicrosoftCciVersion>
69-
<HandlebarsNetVersion>1.10.1</HandlebarsNetVersion>
70-
<LibGit2SharpVersion>0.25.2</LibGit2SharpVersion>
71-
<log4netVersion>2.0.8</log4netVersion>
72-
<SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
73-
<AzureStorageBlobsVersion>12.3.0</AzureStorageBlobsVersion>
74-
<MicrosoftAzureKeyVaultVersion>3.0.0</MicrosoftAzureKeyVaultVersion>
75-
<MicrosoftAzureServicesAppAuthenticationVersion>1.3.1</MicrosoftAzureServicesAppAuthenticationVersion>
76-
<MicrosoftDataAnalysisVersion>0.1.0</MicrosoftDataAnalysisVersion>
77-
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
78-
<MicrosoftBuildFrameworkVersion>15.7.179</MicrosoftBuildFrameworkVersion>
79-
<MicrosoftBuildTasksCoreVersion>15.7.179</MicrosoftBuildTasksCoreVersion>
80-
<MicrosoftBuildUtilitiesCoreVersion>15.7.179</MicrosoftBuildUtilitiesCoreVersion>
81-
<MicrosoftCodeAnalysisAnalyzersVersion>2.6.3</MicrosoftCodeAnalysisAnalyzersVersion>
82-
<MicrosoftCodeAnalysisCSharpVersion>3.9.0</MicrosoftCodeAnalysisCSharpVersion>
83-
<MsbuildTaskMicrosoftCodeAnalysisCSharpVersion>3.4.0</MsbuildTaskMicrosoftCodeAnalysisCSharpVersion>
84-
<MicrosoftIdentityModelClientsActiveDirectoryVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>
85-
<MicrosoftRestClientRuntimeVersion>2.3.13</MicrosoftRestClientRuntimeVersion>
86-
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
87-
<MicrosoftExtensionsFileSystemGlobbingVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
88-
<MicrosoftNETCorePlatformsVersion>2.1.0</MicrosoftNETCorePlatformsVersion>
89-
<MicrosoftNETCore3PlatformsVersion>3.1.0</MicrosoftNETCore3PlatformsVersion>
90-
<MicrosoftNetCompilersToolsetVersion>3.8.0-3.20460.2</MicrosoftNetCompilersToolsetVersion>
91-
<MoqVersion>4.8.3</MoqVersion>
92-
<MonoOptionsVersion>5.3.0.1</MonoOptionsVersion>
93-
<McMasterExtensionsCommandLineUtils>2.3.0</McMasterExtensionsCommandLineUtils>
94-
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0</MicrosoftExtensionsDependencyInjectionVersion>
95-
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
96-
<SystemTextJsonVersion>6.0.1</SystemTextJsonVersion>
97-
<NuGetVersioningVersion>4.4.0</NuGetVersioningVersion>
98-
<NuGetVersion>5.6.0-preview.2.6489</NuGetVersion>
99-
<OctokitVersion>0.32.0</OctokitVersion>
100-
<DotNetSleetLibVersion>2.2.143</DotNetSleetLibVersion>
101-
<SwashbuckleAspNetCoreSwaggerVersion>3.0.0</SwashbuckleAspNetCoreSwaggerVersion>
102-
<SystemBuffersVersion>4.5.0</SystemBuffersVersion>
103-
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
104-
<SystemDiagnosticsTraceSourceVersion>4.0.0</SystemDiagnosticsTraceSourceVersion>
105-
<SystemIOCompressionVersion>4.3.0</SystemIOCompressionVersion>
106-
<SystemIOPackagingVersion>4.5.0</SystemIOPackagingVersion>
107-
<SystemIOFileSystemPrimitivesVersion>4.3.0</SystemIOFileSystemPrimitivesVersion>
108-
<SystemMemoryVersion>4.5.3</SystemMemoryVersion>
109-
<SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
110-
<SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
111-
<SystemRuntimeCompilerServicesUnsafeVersion>4.7.0</SystemRuntimeCompilerServicesUnsafeVersion>
112-
<SystemRuntimeInteropServicesRuntimeInformation>4.3.0</SystemRuntimeInteropServicesRuntimeInformation>
113-
<SystemTextEncodingsWebVersion>4.5.0</SystemTextEncodingsWebVersion>
114-
<SystemThreadingTasksExtensionVersion>4.5.2</SystemThreadingTasksExtensionVersion>
115-
<SystemValueTupleVersion>4.4.0</SystemValueTupleVersion>
116-
<WindowsAzureStorageVersion>8.5.0</WindowsAzureStorageVersion>
117-
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
118-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22215.2</MicrosoftDotNetBuildTasksFeedVersion>
119-
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22215.2</MicrosoftDotNetSignToolVersion>
120-
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
121-
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
122-
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
123-
<MicrosoftDotNetGitHubIssueLabelerAssetsVersion>1.6.0</MicrosoftDotNetGitHubIssueLabelerAssetsVersion>
124-
<MicrosoftMLVersion>1.0.0</MicrosoftMLVersion>
125-
<MicrosoftVisualStudioWebCodeGenerationDesignVersion>2.0.4</MicrosoftVisualStudioWebCodeGenerationDesignVersion>
126-
<MicrosoftDiaSymReaderConverterVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterVersion>
127-
<MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbVersion>
128-
<MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
129-
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20074.1</MicrosoftDotNetMaestroClientVersion>
130-
<MicrosoftSourceLinkGitHubVersion>1.1.0-beta-20464-02</MicrosoftSourceLinkGitHubVersion>
131-
<MicrosoftSourceLinkAzureReposGitVersion>1.1.0-beta-20464-02</MicrosoftSourceLinkAzureReposGitVersion>
132-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>7.0.0-beta.22215.2</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
133-
<MicrosoftDotNetXliffTasksVersion>1.0.0-beta.21376.1</MicrosoftDotNetXliffTasksVersion>
134-
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.20074.1</MicrosoftDotNetMaestroTasksVersion>
135-
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21254.2</MicrosoftDotNetXHarnessCLIVersion>
136-
<MicrosoftSymbolUploaderBuildTaskVersion>1.1.225302</MicrosoftSymbolUploaderBuildTaskVersion>
13787
</PropertyGroup>
13888
</Project>

‎eng/helix.proj

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
</PropertyGroup>
4040

4141
<ItemGroup>
42-
<AdditionalDotNetPackage Include="$(MicrosoftNETCore3PlatformsVersion)" Condition="'$(BuildArchitecture)' != 'arm64' Or !$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">
42+
<AdditionalDotNetPackage Include="$(DotNetRuntime31Version)" Condition="'$(BuildArchitecture)' != 'arm64' Or !$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">
4343
<PackageType>runtime</PackageType>
4444
<DotNetCliRuntime Condition="'$(BuildArchitecture)' == 'x86'">win-x86</DotNetCliRuntime>
4545
<DotNetCliRuntime Condition="'$(BuildArchitecture)' == 'arm' And $(HelixTargetQueues.ToLowerInvariant().Contains('ubuntu'))">linux-arm</DotNetCliRuntime>
4646
</AdditionalDotNetPackage>
4747

48-
<AdditionalDotNetPackage Include="$(MicrosoftNETCorePlatformsVersion)" Condition="'$(BuildArchitecture)' != 'arm64' Or !$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">
48+
<AdditionalDotNetPackage Include="$(DotNetRuntime21Version)" Condition="'$(BuildArchitecture)' != 'arm64' Or !$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">
4949
<PackageType>runtime</PackageType>
5050
<DotNetCliRuntime Condition="'$(BuildArchitecture)' == 'x86'">win-x86</DotNetCliRuntime>
5151
<DotNetCliRuntime Condition="'$(BuildArchitecture)' == 'arm' And $(HelixTargetQueues.ToLowerInvariant().Contains('ubuntu'))">linux-arm</DotNetCliRuntime>

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"dotnet": "7.0.100-preview.2.22153.17",
44
"runtimes": {
55
"dotnet/x64": [
6-
"$(MicrosoftNETCore3PlatformsVersion)"
6+
"$(DotNetRuntime31Version)"
77
],
88
"dotnet/x86": [
9-
"$(MicrosoftNETCore3PlatformsVersion)"
9+
"$(DotNetRuntime31Version)"
1010
]
1111
}
1212
},

‎src/Directory.Build.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
<ItemGroup Condition="'$(RunApiCompat)' == 'true'">
4141
<PackageReference Include="Microsoft.DotNet.ApiCompat"
42-
Version="$(MicrosoftDotNetApiCompatPackageVersion)"
42+
Version="$(MicrosoftDotNetApiCompatVersion)"
4343
PrivateAssets="All" />
4444
</ItemGroup>
4545

‎src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
4848
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
4949
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
50-
<PackageReference Include="System.Text.Encoding" Version="$(SystemTextEncodingVersion)" />
5150
</ItemGroup>
5251

5352
<ItemGroup>

‎src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsPackageVersion)" />
12-
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsPackageVersion)" />
13-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsPackageVersion)" />
14-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsPackageVersion)" />
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
12+
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
13+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsVersion)" />
14+
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsVersion)" />
1515

1616
<ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj">
1717
<PrivateAssets>all</PrivateAssets>

‎src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
17+
<PackageReference Include="System.CodeDom" Version="$(SystemCodeDomVersion)" />
1818
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
19-
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
2019
</ItemGroup>
2120

2221
<ItemGroup>

‎src/Microsoft.ML.Data/Microsoft.ML.Data.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
11+
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
1212
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
13-
<PackageReference Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" />
14-
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
13+
<PackageReference Include="System.Threading.Channels" Version="$(SystemThreadingChannelsVersion)" />
14+
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightVersion)" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

0 commit comments

Comments
 (0)