Skip to content

Commit d105477

Browse files
michaelgsharpericstj
michaelgsharp
and
ericstj
authored
Dependency version updates (#7457)
* version updates * rebase fixes * fix nuget warning * Refactor obsolete suppressions for XUnitVerifier * Centralize some suppressions in analyzers/generators * Remove a couple more suppressions * Update .NET runtime versions * Update OnnxRuntime 1.22.0 * Roll back to OnnxRuntime 1.20.0 --------- Co-authored-by: Eric StJohn <[email protected]>
1 parent b17e794 commit d105477

26 files changed

+90
-56
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<PackageReference Include="TorchSharp-cuda-windows" Version="0.102.5" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
2020
<PackageReference Include="Microsoft.SemanticKernel" Version="$(SemanticKernelVersion)" />
2121
<PackageReference Include="AutoGen.SourceGenerator" Version="$(AutoGenVersion)" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingVersion)" />
23+
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
2324
</ItemGroup>
2425

2526
</Project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -974,6 +974,7 @@
974974
</ItemGroup>
975975

976976
<ItemGroup>
977+
<PackageReference Include="JsonSchema.Net" Version="$(JsonSchemaNetVersion)" />
977978
<PackageReference Include="Microsoft.ML.Onnx.TestModels" Version="$(MicrosoftMLOnnxTestModelsVersion)" />
978979
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="$(TensorFlowVersion)" />
979980
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="$(MicrosoftMLOnnxRuntimeVersion)" />

‎eng/Versions.props

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,43 @@
1212
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
1313
<AssemblyVersion>1.0.0.0</AssemblyVersion>
1414
<!-- .NET Runtime product dependencies -->
15-
<MicrosoftBclAsyncInterfacesVersion>8.0.0</MicrosoftBclAsyncInterfacesVersion>
16-
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0</MicrosoftExtensionsDependencyInjectionVersion>
17-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
18-
<MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
19-
<MicrosoftExtensionsObjectPoolVersion>8.0.7</MicrosoftExtensionsObjectPoolVersion>
20-
<MicrosoftExtensionsOptionsVersion>8.0.2</MicrosoftExtensionsOptionsVersion>
15+
<MicrosoftBclAsyncInterfacesVersion>9.0.4</MicrosoftBclAsyncInterfacesVersion>
16+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.4</MicrosoftExtensionsDependencyInjectionVersion>
17+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.4</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
18+
<MicrosoftExtensionsLoggingVersion>9.0.4</MicrosoftExtensionsLoggingVersion>
19+
<MicrosoftExtensionsObjectPoolVersion>9.0.4</MicrosoftExtensionsObjectPoolVersion>
20+
<MicrosoftExtensionsOptionsVersion>9.0.4</MicrosoftExtensionsOptionsVersion>
2121
<NuGetVersion>6.9.1</NuGetVersion>
2222
<SkiaSharpVersion>2.88.8</SkiaSharpVersion>
23-
<SystemCodeDomVersion>8.0.0</SystemCodeDomVersion>
24-
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
25-
<SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
26-
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
23+
<SystemCodeDomVersion>9.0.4</SystemCodeDomVersion>
24+
<SystemCollectionsImmutableVersion>9.0.4</SystemCollectionsImmutableVersion>
25+
<SystemConfigurationConfigurationManagerVersion>9.0.4</SystemConfigurationConfigurationManagerVersion>
26+
<SystemFormatsAsn1Version>9.0.4</SystemFormatsAsn1Version>
2727
<SystemIOFileSystemAccessControl>5.0.0</SystemIOFileSystemAccessControl>
28-
<SystemNumericsTensorsVersion>9.0.0</SystemNumericsTensorsVersion>
28+
<SystemIOPipelinesVersion>9.0.4</SystemIOPipelinesVersion>
29+
<SystemNumericsTensorsVersion>9.0.4</SystemNumericsTensorsVersion>
2930
<SystemReflectionEmitLightweightVersion>4.7.0</SystemReflectionEmitLightweightVersion>
30-
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>
31+
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
3132
<SystemSecurityPrincipalWindows>5.0.0</SystemSecurityPrincipalWindows>
32-
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
33-
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
34-
<SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
33+
<SystemTextEncodingsWebVersion>9.0.4</SystemTextEncodingsWebVersion>
34+
<SystemTextJsonVersion>9.0.4</SystemTextJsonVersion>
35+
<SystemThreadingChannelsVersion>9.0.4</SystemThreadingChannelsVersion>
3536
<!-- Other product dependencies -->
3637
<ApacheArrowVersion>14.0.2</ApacheArrowVersion>
37-
<GoogleProtobufVersion>3.27.1</GoogleProtobufVersion>
38+
<GoogleProtobufVersion>3.30.2</GoogleProtobufVersion>
3839
<LightGBMVersion>4.6.0</LightGBMVersion>
40+
<JsonSchemaNetGenerationVersion>5.0.1</JsonSchemaNetGenerationVersion>
41+
<JsonSchemaNetVersion>7.3.4</JsonSchemaNetVersion>
3942
<MicrosoftBclHashCodeVersion>6.0.0</MicrosoftBclHashCodeVersion>
40-
<MicrosoftBclMemoryVersion>9.0.0</MicrosoftBclMemoryVersion>
41-
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
42-
<MicrosoftCodeAnalysisCSharpVersion>4.9.2</MicrosoftCodeAnalysisCSharpVersion>
43-
<MicrosoftDotNetInteractiveVersion>1.0.0-beta.24375.2</MicrosoftDotNetInteractiveVersion>
44-
<MicrosoftMLOnnxRuntimeVersion>1.18.1</MicrosoftMLOnnxRuntimeVersion>
43+
<MicrosoftBclMemoryVersion>9.0.4</MicrosoftBclMemoryVersion>
44+
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0</MicrosoftCodeAnalysisAnalyzersVersion>
45+
<MicrosoftCodeAnalysisCSharpVersion>4.13.0</MicrosoftCodeAnalysisCSharpVersion>
46+
<MicrosoftDotNetInteractiveVersion>1.0.0-beta.25177.1</MicrosoftDotNetInteractiveVersion>
47+
<MicrosoftMLOnnxRuntimeVersion>1.20.0</MicrosoftMLOnnxRuntimeVersion>
4548
<MlNetMklDepsVersion>0.0.0.12</MlNetMklDepsVersion>
4649
<MicrosoftExtensionsAIVersion>9.5.0</MicrosoftExtensionsAIVersion>
4750
<!-- runtime.native.System.Data.SqlClient.sni is not updated by dependency flow as it is not produced live anymore. -->
48-
<RuntimeNativeSystemDataSqlClientSniVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniVersion>
51+
<RuntimeNativeSystemDataSqlClientSniVersion>4.7.0</RuntimeNativeSystemDataSqlClientSniVersion>
4952
<!--
5053
@("inteltbb.devel", "win", "2021.7.1.15305")
5154
-->
@@ -58,8 +61,8 @@
5861
<OneTbbPkgVersion Condition="$([MSBuild]::IsOSPlatform('osx'))">2021.7.1.14939</OneTbbPkgVersion>
5962
<OneDalMajorBinaryVersion>1</OneDalMajorBinaryVersion>
6063
<OneDalMinorBinaryVersion>1</OneDalMinorBinaryVersion>
61-
<MSTestTestAdapterVersion>3.7.0</MSTestTestAdapterVersion>
62-
<MSTestTestFrameworkVersion>3.7.0</MSTestTestFrameworkVersion>
64+
<MSTestTestAdapterVersion>3.8.3</MSTestTestAdapterVersion>
65+
<MSTestTestFrameworkVersion>3.8.3</MSTestTestFrameworkVersion>
6366
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
6467
<ParquetDotNetVersion>2.1.3</ParquetDotNetVersion>
6568
<PlotlyNETCSharpVersion>0.11.1</PlotlyNETCSharpVersion>
@@ -68,31 +71,32 @@
6871
<TensorFlowMajorVersion>2</TensorFlowMajorVersion>
6972
<TensorFlowVersion>2.3.1</TensorFlowVersion>
7073
<TorchSharpPyBridgeVersion>1.4.1</TorchSharpPyBridgeVersion>
71-
<AutoGenVersion>0.1.0</AutoGenVersion>
72-
<SemanticKernelVersion>1.15.0</SemanticKernelVersion>
74+
<AutoGenVersion>0.2.3</AutoGenVersion>
75+
<SemanticKernelVersion>1.48.0</SemanticKernelVersion>
7376
<TorchSharpVersion>0.102.7</TorchSharpVersion>
7477
<LibTorchVersion>2.2.1.1</LibTorchVersion>
7578
<!-- Build/infrastructure Dependencies -->
7679
<CodecovVersion>1.12.4</CodecovVersion>
77-
<CoverletCollectorVersion>6.0.2</CoverletCollectorVersion>
80+
<CoverletCollectorVersion>6.0.4</CoverletCollectorVersion>
7881
<CoverletMsbuildVersion>6.0.0</CoverletMsbuildVersion>
79-
<MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>3.3.1</MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>
82+
<MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>4.13.0</MicrosoftCodeAnalysisCSharpInternalAnalyzerVersion>
8083
<MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
8184
<ReportGeneratorVersion>4.3.6</ReportGeneratorVersion>
82-
<SystemCompositionVersion>8.0.0</SystemCompositionVersion>
85+
86+
<SystemCompositionVersion>9.0.4</SystemCompositionVersion>
8387
<!-- Test-only Dependencies -->
8488
<ApprovalTestsVersion>6.0.0</ApprovalTestsVersion>
8589
<MoqVersion>4.20.70</MoqVersion>
8690
<BenchmarkDotNetVersion>0.13.12</BenchmarkDotNetVersion>
87-
<DotNetRuntime60Version>6.0.26</DotNetRuntime60Version>
88-
<DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
89-
<AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
90-
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
91+
<DotNetRuntime60Version>6.0.36</DotNetRuntime60Version>
92+
<DotNetRuntime80Version>8.0.16</DotNetRuntime80Version>
93+
<AwesomeAssertionsVersion>8.1.0</AwesomeAssertionsVersion>
94+
<MicrosoftCodeAnalysisTestingVersion>1.1.2</MicrosoftCodeAnalysisTestingVersion>
9195
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9296
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
9397
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25253.1</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
98+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25225.4</MicrosoftDotNetXUnitExtensionsVersion>
99+
<MicrosoftExtensionsDependencyModelVersion>9.0.4</MicrosoftExtensionsDependencyModelVersion>
96100
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
97101
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>
98102
<MicrosoftMLTestDatabasesVersion>0.0.6-test</MicrosoftMLTestDatabasesVersion>

‎src/Microsoft.ML.AutoML.Interactive/Microsoft.ML.AutoML.Interactive.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
1515
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveVersion)" />
1616
<PackageReference Include="Plotly.NET.CSharp" Version="$(PlotlyNETCSharpVersion)" />
17+
<PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
1718
</ItemGroup>
1819

1920
<ItemGroup>

‎src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
<ProjectReference Include="..\Microsoft.ML.DnnImageFeaturizer.ResNet50\Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj" />
3939
<ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
4040
<ProjectReference Include="..\Microsoft.ML.SearchSpace\Microsoft.ML.SearchSpace.csproj" Pack="true" PrivateAssets="all" />
41-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
42-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
4341
<ProjectReference Include="..\Microsoft.ML.TimeSeries\Microsoft.ML.TimeSeries.csproj" />
4442
<ProjectReference Include="..\Microsoft.ML.TorchSharp\Microsoft.ML.TorchSharp.csproj" />
4543
<ProjectReference Include="..\Microsoft.ML.Vision\Microsoft.ML.Vision.csproj" />
@@ -52,6 +50,12 @@
5250
<ProjectReference Include="..\Microsoft.ML\Microsoft.ML.csproj" />
5351
</ItemGroup>
5452

53+
<ItemGroup>
54+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
55+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
56+
<PackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesVersion)" />
57+
</ItemGroup>
58+
5559
<ItemGroup>
5660
<AdditionalFiles Include="CodeGen\*search_space.json" />
5761
<AdditionalFiles Include="CodeGen\code_gen_flag.json" />

‎src/Microsoft.ML.GenAI.Core/Microsoft.ML.GenAI.Core.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="$(SemanticKernelVersion)" />
1818
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
1919
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
20+
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
2021
</ItemGroup>
2122

2223
<ItemGroup>

‎src/Microsoft.ML.GenAI.Mistral/Microsoft.ML.GenAI.Mistral.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<ItemGroup>
1515
<PackageReference Include="TorchSharp.PyBridge" Version="$(TorchSharpPyBridgeVersion)" />
1616
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
17+
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
18+
<PackageReference Include="JsonSchema.Net" Version="$(JsonSchemaNetVersion)" />
1719
</ItemGroup>
1820

1921
<ItemGroup>

‎src/Microsoft.ML.GenAI.Phi/Microsoft.ML.GenAI.Phi.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<ItemGroup>
1515
<PackageReference Include="TorchSharp.PyBridge" Version="$(TorchSharpPyBridgeVersion)" />
1616
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
17+
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
1718
</ItemGroup>
1819

1920
<ItemGroup>

‎test/Microsoft.ML.CodeAnalyzer.Tests/Code/InstanceInitializerTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
56
using System.Threading.Tasks;
67
using Microsoft.CodeAnalysis.Testing;
78
using Xunit;
@@ -13,7 +14,7 @@ namespace Microsoft.ML.InternalCodeAnalyzer.Tests
1314
{
1415
public sealed class InstanceInitializerTest
1516
{
16-
[Fact]
17+
[Fact(Skip = "The analyzer behind this test will be removed in a future PR. Disabling for now to allow version updates.")]
1718
public async Task InstanceInitializer()
1819
{
1920
const string test = @"

‎test/Microsoft.ML.CodeAnalyzer.Tests/Code/NameTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
56
using System.Threading.Tasks;
67
using Microsoft.CodeAnalysis.Testing;
78
using Xunit;

‎test/Microsoft.ML.CodeAnalyzer.Tests/Code/ParameterVariableNameTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
56
using System.Threading.Tasks;
67
using Microsoft.CodeAnalysis.Testing;
78
using Xunit;

‎test/Microsoft.ML.CodeAnalyzer.Tests/Code/SingleVariableDeclarationTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
56
using System.Threading.Tasks;
67
using Microsoft.CodeAnalysis.Testing;
78
using Xunit;

‎test/Microsoft.ML.CodeAnalyzer.Tests/Code/TypeParamNameTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System;
56
using System.Threading.Tasks;
67
using Microsoft.CodeAnalysis.Testing;
78
using Xunit;

‎test/Microsoft.ML.CodeAnalyzer.Tests/Helpers/CSharpCodeFixVerifier`2.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ internal static class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
1818
where TCodeFix : CodeFixProvider, new()
1919
{
2020
public static DiagnosticResult Diagnostic()
21+
#pragma warning disable CS0618 // Type or member is obsolete
2122
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic();
2223

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

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

2931
public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)
3032
{
@@ -55,7 +57,9 @@ public static async Task VerifyCodeFixAsync(string source, DiagnosticResult[] ex
5557
await test.RunAsync();
5658
}
5759

60+
#pragma warning disable CS0618 // Type or member is obsolete
5861
internal class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
62+
#pragma warning restore CS0618 // Type or member is obsolete
5963
{
6064
public Test()
6165
{

‎test/Microsoft.ML.CodeAnalyzer.Tests/Microsoft.ML.CodeAnalyzer.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<PropertyGroup>
44
<!-- Workaround https://github.com/microsoft/msbuild/issues/4695. Remove when it is fixed in the SDK-->
55
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
6+
<!-- Disable these warnings, this is not a shipping analyzer -->
7+
<NoWarn>$(NoWarn);RS1036;RS1038;RS1041</NoWarn>
68
</PropertyGroup>
79
<ItemGroup>
810
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisTestingVersion)" />

‎test/Microsoft.ML.GenAI.Core.Tests/Microsoft.ML.GenAI.Core.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<PackageReference Include="Moq" Version="$(MoqVersion)" />
2222
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
2323
<PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
24+
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
2425
</ItemGroup>
2526

2627
<ItemGroup Condition="'$(TargetArchitecture)' != 'x64'">

‎test/Microsoft.ML.GenAI.LLaMA.Tests/Microsoft.ML.GenAI.LLaMA.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<PackageReference Include="Moq" Version="$(MoqVersion)" />
2323
<PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
2424
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
25+
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
2526
</ItemGroup>
2627

2728

‎test/Microsoft.ML.GenAI.Phi.Tests/Microsoft.ML.GenAI.Phi.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<PackageReference Include="Moq" Version="$(MoqVersion)" />
2424
<PackageReference Include="Microsoft.ML.TestTokenizers" Version="$(MicrosoftMLTestTokenizersVersion)" />
2525
<PackageReference Include="TorchSharp" Version="$(TorchSharpVersion)" />
26+
<PackageReference Include="JsonSchema.Net.Generation" Version="$(JsonSchemaNetGenerationVersion)" />
2627
</ItemGroup>
2728

2829
<ItemGroup>

‎tools-local/Microsoft.ML.AutoML.SourceGenerator/Microsoft.ML.AutoML.SourceGenerator.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
77
<IncludeBuildOutput>false</IncludeBuildOutput>
88
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
9+
<!-- Suppress RS1042 - https://github.com/dotnet/machinelearning/issues/7468 -->
10+
<NoWarn>$(NoWarn);RS1042</NoWarn>
911
</PropertyGroup>
1012

1113
<ItemGroup>

‎tools-local/Microsoft.ML.InternalCodeAnalyzer/BaseTestClassAnalyzer.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public sealed class BaseTestClassAnalyzer : DiagnosticAnalyzer
1717
internal const string DiagnosticId = "MSML_ExtendBaseTestClass";
1818

1919
private const string Title = "Test classes should be derived from BaseTestClass or FunctionalTestBaseClass";
20-
private const string Format = "Test class '{0}' should extend BaseTestClass or FunctionalTestBaseClass.";
20+
private const string Format = "Test class '{0}' should extend BaseTestClass or FunctionalTestBaseClass";
2121
private const string Description =
2222
"Test classes should be derived from BaseTestClass or FunctionalTestBaseClass.";
2323

@@ -52,7 +52,7 @@ private sealed class AnalyzerImpl
5252
private readonly INamedTypeSymbol _factAttribute;
5353
private readonly INamedTypeSymbol _baseTestClass;
5454
private readonly INamedTypeSymbol _ITbaseTestClass;
55-
private readonly ConcurrentDictionary<INamedTypeSymbol, bool> _knownTestAttributes = new ConcurrentDictionary<INamedTypeSymbol, bool>();
55+
private readonly ConcurrentDictionary<INamedTypeSymbol, bool> _knownTestAttributes = new ConcurrentDictionary<INamedTypeSymbol, bool>(SymbolEqualityComparer.Default);
5656

5757
public AnalyzerImpl(Compilation compilation, INamedTypeSymbol factAttribute)
5858
{
@@ -89,8 +89,8 @@ private bool ExtendsBaseTestClass(INamedTypeSymbol namedType)
8989

9090
for (var current = namedType; current is object; current = current.BaseType)
9191
{
92-
if (Equals(current, _baseTestClass) ||
93-
Equals(current, _ITbaseTestClass))
92+
if (SymbolEqualityComparer.Default.Equals(current, _baseTestClass) ||
93+
SymbolEqualityComparer.Default.Equals(current, _ITbaseTestClass))
9494
return true;
9595
}
9696

0 commit comments

Comments
 (0)