Skip to content

Commit 4a6ce50

Browse files
authored
Update dependencies from maintenance-packages to latest versions (dotnet#7301)
* Update dependencies from maintenance-packages to latest preview * Fix sni.dll failure
1 parent e968d32 commit 4a6ce50

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

eng/Versions.props

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
<MicrosoftExtensionsOptionsVersion>8.0.2</MicrosoftExtensionsOptionsVersion>
2222
<NuGetVersion>6.9.1</NuGetVersion>
2323
<SkiaSharpVersion>2.88.8</SkiaSharpVersion>
24-
<SystemBuffersVersion>4.6.0-preview.1.24529.4</SystemBuffersVersion>
24+
<SystemBuffersVersion>4.6.0-rtm.24561.10</SystemBuffersVersion>
2525
<SystemCodeDomVersion>8.0.0</SystemCodeDomVersion>
2626
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
2727
<SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
2828
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
2929
<SystemIOFileSystemAccessControl>5.0.0</SystemIOFileSystemAccessControl>
30-
<SystemMemoryVersion>4.6.0-preview.1.24529.4</SystemMemoryVersion>
30+
<SystemMemoryVersion>4.6.0-rtm.24561.10</SystemMemoryVersion>
3131
<SystemNumericsTensorsVersion>8.0.0</SystemNumericsTensorsVersion>
3232
<SystemReflectionEmitLightweightVersion>4.7.0</SystemReflectionEmitLightweightVersion>
3333
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>
34-
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0-preview.1.24529.4</SystemRuntimeCompilerServicesUnsafeVersion>
34+
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0-rtm.24561.10</SystemRuntimeCompilerServicesUnsafeVersion>
3535
<SystemSecurityPrincipalWindows>5.0.0</SystemSecurityPrincipalWindows>
3636
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
3737
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
@@ -40,14 +40,16 @@
4040
<ApacheArrowVersion>14.0.2</ApacheArrowVersion>
4141
<GoogleProtobufVersion>3.27.1</GoogleProtobufVersion>
4242
<LightGBMVersion>3.3.5</LightGBMVersion>
43-
<MicrosoftBclHashCodeVersion>6.0.0-preview.1.24529.4</MicrosoftBclHashCodeVersion>
43+
<MicrosoftBclHashCodeVersion>6.0.0-rtm.24561.10</MicrosoftBclHashCodeVersion>
4444
<MicrosoftBclMemoryVersion>9.0.0-rc.1.24431.7</MicrosoftBclMemoryVersion>
4545
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
4646
<MicrosoftCodeAnalysisCSharpVersion>4.9.2</MicrosoftCodeAnalysisCSharpVersion>
4747
<MicrosoftDotNetInteractiveVersion>1.0.0-beta.24375.2</MicrosoftDotNetInteractiveVersion>
4848
<MicrosoftMLOnnxRuntimeVersion>1.18.1</MicrosoftMLOnnxRuntimeVersion>
4949
<MlNetMklDepsVersion>0.0.0.12</MlNetMklDepsVersion>
5050
<MicrosoftExtensionsAIVersion>9.0.0-preview.9.24507.7</MicrosoftExtensionsAIVersion>
51+
<!-- runtime.native.System.Data.SqlClient.sni is not updated by dependency flow as it is not produced live anymore. -->
52+
<RuntimeNativeSystemDataSqlClientSniVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniVersion>
5153
<!--
5254
@("inteltbb.devel", "win", "2021.7.1.15305")
5355
-->
@@ -99,7 +101,7 @@
99101
<MicrosoftMLTestDatabasesVersion>0.0.6-test</MicrosoftMLTestDatabasesVersion>
100102
<MicrosoftMLTestModelsVersion>0.0.7-test</MicrosoftMLTestModelsVersion>
101103
<MicrosoftMLTestTokenizersVersion>2.0.0-beta.24455.2</MicrosoftMLTestTokenizersVersion>
102-
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>
104+
<SystemDataSqlClientVersion>4.9.0-rtm.24561.10</SystemDataSqlClientVersion>
103105
<SystemDataSQLiteCoreVersion>1.0.118</SystemDataSQLiteCoreVersion>
104106
<XunitCombinatorialVersion>1.6.24</XunitCombinatorialVersion>
105107
<!-- Opt-out repo features -->

test/Microsoft.ML.Tests/DatabaseLoaderTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ public void TestLoadDatetimeColumnWithNullValue()
275275
private DatabaseSource GetIrisDatabaseSource(string command, int commandTimeoutInSeconds = 30)
276276
{
277277
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
278+
#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead.'
278279
return new DatabaseSource(
279280
SqlClientFactory.Instance,
280281
GetMSSQLConnectionString(TestDatasets.irisDb.name),
@@ -286,6 +287,7 @@ private DatabaseSource GetIrisDatabaseSource(string command, int commandTimeoutI
286287
GetSQLiteConnectionString(TestDatasets.irisDbSQLite.name),
287288
String.Format(command, TestDatasets.irisDbSQLite.trainFilename),
288289
commandTimeoutInSeconds);
290+
#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead.'
289291
}
290292

291293
private string GetMSSQLConnectionString(string databaseName)

test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
5555
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
5656
<PackageReference Include="System.Data.SQLite.Core" Version="$(SystemDataSQLiteCoreVersion)" />
57+
<PackageReference Include="runtime.native.System.Data.SqlClient.sni" Version="$(RuntimeNativeSystemDataSqlClientSniVersion)" />
5758
</ItemGroup>
5859

5960
<ItemGroup>

0 commit comments

Comments
 (0)