Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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>
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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>
Comment thread
ericstj marked this conversation as resolved.
<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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,13 +18,15 @@ internal static class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
where TCodeFix : CodeFixProvider, new()
{
public static DiagnosticResult Diagnostic()
Comment thread
ericstj marked this conversation as resolved.
#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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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>
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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>
Comment thread
ericstj marked this conversation as resolved.
<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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,13 +18,15 @@ internal static class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
where TCodeFix : CodeFixProvider, new()
{
public static DiagnosticResult Diagnostic()
Comment thread
ericstj marked this conversation as resolved.
#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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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>
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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>
Comment thread
ericstj marked this conversation as resolved.
<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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,13 +18,15 @@ internal static class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
where TCodeFix : CodeFixProvider, new()
{
public static DiagnosticResult Diagnostic()
Comment thread
ericstj marked this conversation as resolved.
#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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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>
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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>
Comment thread
ericstj marked this conversation as resolved.
<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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,13 +18,15 @@ internal static class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
where TCodeFix : CodeFixProvider, new()
{
public static DiagnosticResult Diagnostic()
Comment thread
ericstj marked this conversation as resolved.
#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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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>
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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>
Comment thread
ericstj marked this conversation as resolved.
<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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,13 +18,15 @@ internal static class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
where TCodeFix : CodeFixProvider, new()
{
public static DiagnosticResult Diagnostic()
Comment thread
ericstj marked this conversation as resolved.
#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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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>
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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>
Comment thread
ericstj marked this conversation as resolved.
<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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,13 +18,15 @@ internal static class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
where TCodeFix : CodeFixProvider, new()
{
public static DiagnosticResult Diagnostic()
Comment thread
ericstj marked this conversation as resolved.
#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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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>
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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>
Comment thread
ericstj marked this conversation as resolved.
<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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,13 +18,15 @@ internal static class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
where TCodeFix : CodeFixProvider, new()
{
public static DiagnosticResult Diagnostic()
Comment thread
ericstj marked this conversation as resolved.
#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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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>
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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>
Comment thread
ericstj marked this conversation as resolved.
<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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,13 +18,15 @@ internal static class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
where TCodeFix : CodeFixProvider, new()
{
public static DiagnosticResult Diagnostic()
Comment thread
ericstj marked this conversation as resolved.
#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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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