10000 Dependency version updates by michaelgsharp · Pull Request #7457 · dotnet/machinelearning · GitHub
[go: up one dir, main page]
Skip to content

Dependency version updates #7457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 20, 2025
Merged

Dependency version updates #7457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a21d17c
version updates
michaelgsharp May 5, 2025
1eabe40
rebase fixes
michaelgsharp May 5, 2025
7d95adc
fix nuget warning
michaelgsharp May 6, 2025
14bcba0
Refactor obsolete suppressions for XUnitVerifier
ericstj May 19, 2025
4b73dea
Centralize some suppressions in analyzers/generators
ericstj May 19, 2025
4a171e8
Remove a couple more suppressions
ericstj May 19, 2025
87fa985
Update .NET runtime versions
ericstj May 19, 2025
52dc3ec
Update OnnxRuntime 1.22.0
ericstj May 20, 2025
4f6bd49
Roll back to OnnxRuntime 1.20.0
ericstj May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/samples/Microsoft.ML.GenAI.Samples/Microsoft.ML.GenAI.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
<PackageReference Include="TorchSharp-cuda-windows" Version="0.102.5" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
<PackageReference Include="Microsoft.SemanticKernel" Version="$(SemanticKernelVersion)" />
<PackageReference Include="AutoGen.SourceGenerator" Version="$(AutoGenVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingVersion)" />
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonSchema.Net" Version="$(JsonSchemaNetVersion)" />
<PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />
Expand Down
74 changes: 39 additions & 35 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,43 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<!-- .NET Runtime product dependencies -->
<MicrosoftBclAsyncInterfacesVersion>8.0.0</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsObjectPoolVersion>8.0.7</MicrosoftExtensionsObjectPoolVersion>
<MicrosoftExtensionsOptionsVersion>8.0.2</MicrosoftExtensionsOptionsVersion>
<MicrosoftBclAsyncInterfacesVersion>9.0.4</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.4</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.4</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsLoggingVersion>9.0.4</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsObjectPoolVersion>9.0.4</MicrosoftExtensionsObjectPoolVersion>
<MicrosoftExtensionsOptionsVersion>9.0.4</MicrosoftExtensionsOptionsVersion>
<NuGetVersion>6.9.1</NuGetVersion>
<SkiaSharpVersion>2.88.8</SkiaSharpVersion>
<SystemCodeDomVersion>8.0.0</SystemCodeDomVersion>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
<SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
<SystemCodeDomVersion>9.0.4</SystemCodeDomVersion>
<SystemCollectionsImmutableVersion>9.0.4</SystemCollectionsImmutableVersion>
<SystemConfigurationConfigurationManagerVersion>9.0.4</SystemConfigurationConfigurationManagerVersion>
<SystemFormatsAsn1Version>9.0.4</SystemFormatsAsn1Version>
<SystemIOFileSystemAccessControl>5.0.0</SystemIOFileSystemAccessControl>
<SystemNumericsTensorsVersion>9.0.0</SystemNumericsTensorsVersion>
<SystemIOPipelinesVersion>9.0.4</SystemIOPipelinesVersion>
<SystemNumericsTensorsVersion>9.0.4</SystemNumericsTensorsVersion>
<SystemReflectionEmitLightweightVersion>4.7.0</SystemReflectionEmitLightweightVersion>
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
<SystemSecurityPrincipalWindows>5.0.0</SystemSecurityPrincipalWindows>
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
<SystemTextEncodingsWebVersion>9.0.4</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>9.0.4</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>9.0.4</SystemThreadingChannelsVersion>
<!-- Other product dependencies -->
<ApacheArrowVersion>14.0.2</ApacheArrowVersion>
<GoogleProtobufVersion>3.27.1</GoogleProtobufVersion>
<GoogleProtobufVersion>3.30.2</GoogleProtobufVersion>
<LightGBMVersion>4.6.0</LightGBMVersion>
<JsonSchemaNetGenerationVersion>5.0.1</JsonSchemaNetGenerationVersion>
<JsonSchemaNetVersion>7.3.4</JsonSchemaNetVersion>
<MicrosoftBclHashCodeVersion>6.0.0</MicrosoftBclHashCodeVersion>
<MicrosoftBclMemoryVersion>9.0.0</MicrosoftBclMemoryVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.9.2</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftDotNetInteractiveVersion>1.0.0-beta.24375.2</MicrosoftDotNetInteractiveVersion>
<MicrosoftMLOnnxRuntimeVersion>1.18.1</MicrosoftMLOnnxRuntimeVersion>
<MicrosoftBclMemoryVersion>9.0.4</MicrosoftBclMemoryVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.13.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftDotNetInteractiveVersion>1.0.0-beta.25177.1</MicrosoftDotNetInteractiveVersion>
<MicrosoftMLOnnxRuntimeVersion>1.20.0</MicrosoftMLOnnxRuntimeVersion>
<MlNetMklDepsVersion>0.0.0.12</MlNetMklDepsVersion>
<MicrosoftExtensionsAIVersion>9.4.0-preview.1.25207.5</MicrosoftExtensionsAIVersion>
<!-- runtime.native.System.Data.SqlClient.sni is not updated by dependency flow as it is not produced live anymore. -->
<RuntimeNativeSystemDataSqlClientSniVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniVersion>
<RuntimeNativeSystemDataSqlClientSniVersion>4.7.0</RuntimeNativeSystemDataSqlClientSniVersion>
<!--
@("inteltbb.devel", "win", "2021.7.1.15305")
-->
Expand All @@ -58,8 +61,8 @@
<OneTbbPkgVersion Condition="$([MSBuild]::IsOSPlatform('osx'))">2021.7.1.14939</OneTbbPkgVersion>
<OneDalMajorBinaryVersion>1</OneDalMajorBinaryVersion>
<OneDalMinorBinaryVersion>1</OneDalMinorBinaryVersion>
<MSTestTestAdapterVersion>3.7.0</MSTestTestAdapterVersion>
<MSTestTestFrameworkVersion>3.7.0</MSTestTestFrameworkVersion>
<MSTestTestAdapterVersion>3.8.3</MSTestTestAdapterVersion>
<MSTestTestFrameworkVersion>3.8.3</MSTestTestFrameworkVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<ParquetDotNetVersion>2.1.3</ParquetDotNetVersion>
<PlotlyNETCSharpVersion>0.11.1</PlotlyNETCSharpVersion>
Expand All @@ -68,31 +71,32 @@
<TensorFlowMajorVersion>2</TensorFlowMajorVersion>
<TensorFlowVersion>2.3.1</TensorFlowVersion>
<TorchSharpPyBridgeVersion>1.4.1</TorchSharpPyBridgeVersion>
<AutoGenVersion>0.1.0</AutoGenVersion>
<SemanticKernelVersion>1.15.0</SemanticKernelVersion>
<AutoGenVersion>0.2.3</AutoGenVersion>
<SemanticKernelVersion>1.48.0</SemanticKernelVersion>
<TorchSharpVersion>0.102.7</TorchSharpVersion>
<LibTorchVersion>2.2.1.1</LibTorchVersion>
<!-- Build/infrastructure Dependencies -->
<CodecovVersion>1.12.4</CodecovVersion>
<CoverletCollectorVersion>6.0.2</CoverletCollectorVersion>
<CoverletCollectorVersion>6.0.4</CoverletCollectorVersion>
<CoverletMsbuildVersion>6.0.0</CoverletMsbuildVersion>
<MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>3.3.1</MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>
<MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>4.13.0</MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>
<MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
<ReportGeneratorVersion>4.3.6</ReportGeneratorVersion>
<SystemCompositionVersion>8.0.0</SystemCompositionVersion>

<SystemCompositionVersion>9.0.4</SystemCompositionVersion>
<!-- Test-only Dependencies -->
<ApprovalTestsVersion>6.0.0</ApprovalTestsVersion>
<MoqVersion>4.20.70</MoqVersion>
<BenchmarkDotNetVersion>0.13.12</BenchmarkDotNetVersion>
<DotNetRuntime60Version>6.0.26</DotNetRuntime60Version>
<DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
<AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
<DotNetRuntime60Version>6.0.36</DotNetRuntime60Version>
<DotNetRuntime80Version>8.0.16</DotNetRuntime80Version>
<AwesomeAssertionsVersion>8.1.0</AwesomeAssertionsVersion>
<MicrosoftCodeAnalysisTestingVersion>1.1.2</MicrosoftCodeAnalysisTestingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25253.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25225.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>9.0.4</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
<MicrosoftMLTestDatabasesVersion>0.0.6-test</MicrosoftMLTestDatabasesVersion>
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.ML.AutoML.Interactive/Microsoft.ML.AutoML.Interactive.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
<PackageReference Include="Plotly.NET.CSharp" Version="$(PlotlyNETCSharpVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 6 additions & 2 deletions src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
<ProjectReference Include="..\Microsoft.ML.DnnImageFeaturizer.ResNet50\Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj" />
<ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
<ProjectReference Include="..\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj" Pack="true" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
<ProjectReference Include="..\Microsoft.ML.TimeSeries\Microsoft.ML.TimeSeries.csproj" />
<ProjectReference Include="..\Microsoft.ML.TorchSharp\Microsoft.ML.TorchSharp.csproj" />
<ProjectReference Include="..\Microsoft.ML.Vision\Microsoft.ML.Vision.csproj" />
Expand All @@ -52,6 +50,12 @@
<ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
<PackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesVersion)" />
</ItemGroup>

<ItemGroup>
<AdditionalFiles Include="CodeGen\*search_space.json" />
<AdditionalFiles Include="CodeGen\code_gen_flag.json" />
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.ML.GenAI.Core/Microsoft.ML.GenAI.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="$(SemanticKernelVersion)" />
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.ML.GenAI.Mistral/Microsoft.ML.GenAI.Mistral.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<ItemGroup>
<PackageReference Include="TorchSharp.PyBridge" Version="$(TorchSharpPyBridgeVersion)" />
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
<PackageReference Include="JsonSchema.Net" Version="$(JsonSchemaNetVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.ML.GenAI.Phi/Microsoft.ML.GenAI.Phi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<ItemGroup>
<PackageReference Include="TorchSharp.PyBridge" Version="$(TorchSharpPyBridgeVersion)" />
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion test/Microsoft.ML.CodeAnalyzer.Tests/Code/InstanceInitializerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
Expand All @@ -13,7 +14,7 @@ namespace Microsoft.ML.InternalCodeAnalyzer.Tests
{
public sealed class InstanceInitializerTest
{
[Fact]
[Fact(Skip = "The analyzer behind this test will be removed in a future PR. Disabling for now to allow version updates.")]
public async Task InstanceInitializer()
{
const string test = @"
Expand Down
1 change: 1 addition & 0 deletions test/Microsoft.ML.CodeAnalyzer.Tests/Code/NameTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
Expand Down
1 change: 1 addition & 0 deletions test/Microsoft.ML.CodeAnalyzer.Tests/Code/ParameterVariableNameTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
Expand Down
1 change: 1 addition & 0 deletions test/Microsoft.ML.CodeAnalyzer.Tests/Code/SingleVariableDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
Expand Down
1 change: 1 addition & 0 deletions test/Microsoft.ML.CodeAnalyzer.Tests/Code/TypeParamNameTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Testing;
using Xunit;
Expand Down
4 changes: 4 additions & 0 deletions test/Microsoft.ML.CodeAnalyzer.Tests/Helpers/CSharpCodeFixVerifier`2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@ internal static class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
where TCodeFix : CodeFixProvider, new()
{
public static DiagnosticResult Diagnostic()
#pragma warning disable CS0618 // Type or member is obsolete
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic();

public static DiagnosticResult Diagnostic(string diagnosticId)
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(diagnosticId);

public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(descriptor);
#pragma warning restore CS0618 // Type or member is obsolete

public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
{
Expand Down Expand Up @@ -55,7 +57,9 @@ public static async Task VerifyCodeFixAsync(string source, DiagnosticResult[] ex
await test.RunAsync();
}

#pragma warning disable CS0618 // Type or member is obsolete
internal class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
#pragma warning restore CS0618 // Type or member is obsolete
{
public Test()
{
Expand Down
2 changes: 2 additions & 0 deletions test/Microsoft.ML.CodeAnalyzer.Tests/Microsoft.ML.CodeAnalyzer.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<PropertyGroup>
<!-- Workaround https://github.com/microsoft/msbuild/issues/4695. Remove when it is fixed in the SDK-->
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
<!-- Disable these warnings, this is not a shipping analyzer -->
<NoWarn>$(NoWarn);RS1036;RS1038;RS1041</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
Expand Down
1 change: 1 addition & 0 deletions test/Microsoft.ML.GenAI.Core.Tests/Microsoft.ML.GenAI.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<PackageReference Include="Moq" Version="$(MoqVersion)" />
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
<PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetArchitecture)' != 'x64'">
Expand Down
1 change: 1 addition & 0 deletions test/Microsoft.ML.GenAI.LLaMA.Tests/Microsoft.ML.GenAI.LLaMA.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<PackageReference Include="Moq" Version="$(MoqVersion)" />
<PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
</ItemGroup>


Expand Down
1 change: 1 addition & 0 deletions test/Microsoft.ML.GenAI.Phi.Tests/Microsoft.ML.GenAI.Phi.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<PackageReference Include="Moq" Version="$(MoqVersion)" />
<PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions tools-local/Microsoft.ML.AutoML.SourceGenerator/Microsoft.ML.AutoML.SourceGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
<IncludeBuildOutput>false</IncludeBuildOutput>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<!-- Suppress RS1042 - https://github.com/dotnet/machinelearning/issues/7468 -->
<NoWarn>$(NoWarn);RS1042</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions tools-local/Microsoft.ML.InternalCodeAnalyzer/BaseTestClassAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public sealed class BaseTestClassAnalyzer : DiagnosticAnalyzer
internal const string DiagnosticId = "MSML_ExtendBaseTestClass";

private const string Title = "Test classes should be derived from BaseTestClass or FunctionalTestBaseClass";
private const string Format = "Test class '{0}' should extend BaseTestClass or FunctionalTestBaseClass.";
private const string Format = "Test class '{0}' should extend BaseTestClass or FunctionalTestBaseClass";
private const string Description =
"Test classes should be derived from BaseTestClass or FunctionalTestBaseClass.";

Expand Down Expand Up @@ -52,7 +52,7 @@ private sealed class AnalyzerImpl
private readonly INamedTypeSymbol _factAttribute;
private readonly INamedTypeSymbol _baseTestClass;
private readonly INamedTypeSymbol _ITbaseTestClass;
private readonly ConcurrentDictionary<INamedTypeSymbol, bool> _knownTestAttributes = new ConcurrentDictionary<INamedTypeSymbol, bool>();
private readonly ConcurrentDictionary<INamedTypeSymbol, bool> _knownTestAttributes = new ConcurrentDictionary<INamedTypeSymbol, bool>(SymbolEqualityComparer.Default);

public AnalyzerImpl(Compilation compilation, INamedTypeSymbol factAttribute)
{
Expand Down Expand Up @@ -89,8 +89,8 @@ private bool ExtendsBaseTestClass(INamedTypeSymbol namedType)

for (var current = namedType; current is object; current = current.BaseType)
{
if (Equals(current, _baseTestClass) ||
Equals(current, _ITbaseTestClass))
if (SymbolEqualityComparer.Default.Equals(current, _baseTestClass) ||
SymbolEqualityComparer.Default.Equals(current, _ITbaseTestClass))
return true;
}

Expand Down
Loading
0