From 26918a471fc604ef153ab86f9955a85bc6bcad29 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam.harwell@microsoft.com>
Date: Fri, 3 Apr 2020 17:38:10 -0700
Subject: [PATCH] Update Microsoft.Extensions.* to 3.0.1 for testing (#4536)

The 3.0 release includes a fix to cases where ChangeToken.OnChange would
not unregister callbacks even when disposed.
---
 build/Dependencies.props                                  | 1 +
 test/Directory.Build.props                                | 8 ++++++++
 .../Microsoft.Extensions.ML.Tests.csproj                  | 1 -
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/Dependencies.props b/build/Dependencies.props
index 0817651d09..919bce77d8 100644
--- a/build/Dependencies.props
+++ b/build/Dependencies.props
@@ -52,6 +52,7 @@
   <PropertyGroup>
     <BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20080.1</MicrosoftCodeAnalysisTestingVersion>
+    <MicrosoftExtensionsTestPackageVersion>3.0.1</MicrosoftExtensionsTestPackageVersion>
     <MicrosoftMLTestDatabasesPackageVersion>0.0.5-test</MicrosoftMLTestDatabasesPackageVersion>
     <MicrosoftMLTestModelsPackageVersion>0.0.6-test</MicrosoftMLTestModelsPackageVersion>
     <MicrosoftMLTensorFlowTestModelsVersion>0.0.11-test</MicrosoftMLTensorFlowTestModelsVersion>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 35d5b7f8e7..68034bc2eb 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -37,6 +37,14 @@
     <PackageReference Include="coverlet.msbuild" Version="$(CoverletVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Make sure to use the updated version of Microsoft.Extensions.* in test projects -->
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsTestPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsTestPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsTestPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsTestPackageVersion)" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference
       Condition="'$(UseMLCodeAnalyzer)' != 'false' and '$(MSBuildProjectExtension)' == '.csproj'"
diff --git a/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj b/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj
index eaa190e025..377369de9b 100644
--- a/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj
+++ b/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsPackageVersion)" />
     <PackageReference Include="Microsoft.ML.TestModels" Version="$(MicrosoftMLTestModelsPackageVersion)" />
   </ItemGroup>