Clean up residual net461 code

Part of dotnet#15498
ErikEJ · May 18, 2019 · 4b2e969 · 4b2e969
1 parent baab073
commit 4b2e969
Show file tree

Hide file tree

Showing 34 changed files with 49 additions and 360 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,10 +7,6 @@
 
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
-  <Import
-    Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
-    Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
-
   <PropertyGroup Condition="'$(CopyrightMicrosoft)' != ''">
     <Copyright>$(CopyrightMicrosoft)</Copyright>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

diff --git a/src/EFCore.Design/Design/Internal/ForwardingProxy.cs b/src/EFCore.Design/Design/Internal/ForwardingProxy.cs
diff --git a/src/EFCore.Design/Design/Internal/ForwardingProxy`.cs b/src/EFCore.Design/Design/Internal/ForwardingProxy`.cs
diff --git a/src/EFCore.Design/Design/OperationExecutor.cs b/src/EFCore.Design/Design/OperationExecutor.cs
@@ -49,14 +49,12 @@ public class OperationExecutor : MarshalByRefObject
         /// </summary>
         /// <param name="reportHandler"> The <see cref="IOperationReportHandler" />. </param>
         /// <param name="args"> The executor arguments. </param>
-        public OperationExecutor([NotNull] object reportHandler, [NotNull] IDictionary args)
+        public OperationExecutor([NotNull] IOperationReportHandler reportHandler, [NotNull] IDictionary args)
         {
             Check.NotNull(reportHandler, nameof(reportHandler));
             Check.NotNull(args, nameof(args));
 
-            var unwrappedReportHandler = ForwardingProxy.Unwrap<IOperationReportHandler>(reportHandler);
-
-            _reporter = new OperationReporter(unwrappedReportHandler);
+            _reporter = new OperationReporter(reportHandler);
             _targetName = (string)args["targetName"];
             _startupTargetName = (string)args["startupTargetName"];
             _projectDir = (string)args["projectDir"];
@@ -152,7 +150,7 @@ public class AddMigration : OperationBase
             /// <param name="args"> The operation arguments. </param>
             public AddMigration(
                 [NotNull] OperationExecutor executor,
-                [NotNull] object resultHandler,
+                [NotNull] IOperationResultHandler resultHandler,
                 [NotNull] IDictionary args)
                 : base(resultHandler)
             {
@@ -200,7 +198,7 @@ public class GetContextInfo : OperationBase
             /// <param name="executor"> The operation executor. </param>
             /// <param name="resultHandler"> The <see cref="IOperationResultHandler" />. </param>
             /// <param name="args"> The operation arguments. </param>
-            public GetContextInfo([NotNull] OperationExecutor executor, [NotNull] object resultHandler, [NotNull] IDictionary args)
+            public GetContextInfo([NotNull] OperationExecutor executor, [NotNull] IOperationResultHandler resultHandler, [NotNull] IDictionary args)
                 : base(resultHandler)
             {
                 Check.NotNull(executor, nameof(executor));
@@ -240,7 +238,7 @@ public class UpdateDatabase : OperationBase
             /// <param name="executor"> The operation executor. </param>
             /// <param name="resultHandler"> The <see cref="IOperationResultHandler" />. </param>
             /// <param name="args"> The operation arguments. </param>
-            public UpdateDatabase([NotNull] OperationExecutor executor, [NotNull] object resultHandler, [NotNull] IDictionary args)
+            public UpdateDatabase([NotNull] OperationExecutor executor, [NotNull] IOperationResultHandler resultHandler, [NotNull] IDictionary args)
                 : base(resultHandler)
             {
                 Check.NotNull(executor, nameof(executor));
@@ -274,7 +272,7 @@ public class ScriptMigration : OperationBase
             /// <param name="args"> The operation arguments. </param>
             public ScriptMigration(
                 [NotNull] OperationExecutor executor,
-                [NotNull] object resultHandler,
+                [NotNull] IOperationResultHandler resultHandler,
                 [NotNull] IDictionary args)
                 : base(resultHandler)
             {
@@ -317,7 +315,7 @@ public class RemoveMigration : OperationBase
             /// <param name="args"> The operation arguments. </param>
             public RemoveMigration(
                 [NotNull] OperationExecutor executor,
-                [NotNull] object resultHandler,
+                [NotNull] IOperationResultHandler resultHandler,
                 [NotNull] IDictionary args)
                 : base(resultHandler)
             {
@@ -355,7 +353,7 @@ public class GetContextTypes : OperationBase
             /// <param name="executor"> The operation executor. </param>
             /// <param name="resultHandler"> The <see cref="IOperationResultHandler" />. </param>
             /// <param name="args"> The operation arguments. </param>
-            public GetContextTypes([NotNull] OperationExecutor executor, [NotNull] object resultHandler, [NotNull] IDictionary args)
+            public GetContextTypes([NotNull] OperationExecutor executor, [NotNull] IOperationResultHandler resultHandler, [NotNull] IDictionary args)
                 : base(resultHandler)
             {
                 Check.NotNull(executor, nameof(executor));
@@ -398,7 +396,7 @@ public class GetMigrations : OperationBase
             /// <param name="executor"> The operation executor. </param>
             /// <param name="resultHandler"> The <see cref="IOperationResultHandler" />. </param>
             /// <param name="args"> The operation arguments. </param>
-            public GetMigrations([NotNull] OperationExecutor executor, [NotNull] object resultHandler, [NotNull] IDictionary args)
+            public GetMigrations([NotNull] OperationExecutor executor, [NotNull] IOperationResultHandler resultHandler, [NotNull] IDictionary args)
                 : base(resultHandler)
             {
                 Check.NotNull(executor, nameof(executor));
@@ -448,7 +446,7 @@ public class ScaffoldContext : OperationBase
             /// <param name="executor"> The operation executor. </param>
             /// <param name="resultHandler"> The <see cref="IOperationResultHandler" />. </param>
             /// <param name="args"> The operation arguments. </param>
-            public ScaffoldContext([NotNull] OperationExecutor executor, [NotNull] object resultHandler, [NotNull] IDictionary args)
+            public ScaffoldContext([NotNull] OperationExecutor executor, [NotNull] IOperationResultHandler resultHandler, [NotNull] IDictionary args)
                 : base(resultHandler)
             {
                 Check.NotNull(executor, nameof(executor));
@@ -515,7 +513,7 @@ public class DropDatabase : OperationBase
             /// <param name="args"> The operation arguments. </param>
             public DropDatabase(
                 [NotNull] OperationExecutor executor,
-                [NotNull] object resultHandler,
+                [NotNull] IOperationResultHandler resultHandler,
                 [NotNull] IDictionary args)
                 : base(resultHandler)
             {
@@ -546,7 +544,7 @@ public class ScriptDbContext : OperationBase
             /// <param name="args"> The operation arguments. </param>
             public ScriptDbContext(
                 [NotNull] OperationExecutor executor,
-                [NotNull] object resultHandler,
+                [NotNull] IOperationResultHandler resultHandler,
                 [NotNull] IDictionary args)
                 : base(resultHandler)
             {
@@ -573,11 +571,11 @@ public abstract class OperationBase : MarshalByRefObject
             ///     Initializes a new instance of the <see cref="OperationBase" /> class.
             /// </summary>
             /// <param name="resultHandler"> The <see cref="IOperationResultHandler" />. </param>
-            protected OperationBase([NotNull] object resultHandler)
+            protected OperationBase([NotNull] IOperationResultHandler resultHandler)
             {
                 Check.NotNull(resultHandler, nameof(resultHandler));
 
-                _resultHandler = ForwardingProxy.Unwrap<IOperationResultHandler>(resultHandler);
+                _resultHandler = resultHandler;
             }
 
             /// <summary>

diff --git a/src/EFCore.Design/EFCore.Design.csproj b/src/EFCore.Design/EFCore.Design.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Shared design-time components for Entity Framework Core tools.</Description>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Microsoft.EntityFrameworkCore.Design</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/ef/AppDomainOperationExecutor.cs b/src/ef/AppDomainOperationExecutor.cs
@@ -26,7 +26,7 @@ public AppDomainOperationExecutor(
             string dataDirectory,
             string rootNamespace,
             string language)
-            : base(assembly, startupAssembly, projectDir, dataDirectory, rootNamespace, language)
+            : base(assembly, startupAssembly, projectDir, rootNamespace, language)
         {
             var info = new AppDomainSetup { ApplicationBase = AppBasePath };
 

diff --git a/src/ef/OperationExecutorBase.cs b/src/ef/OperationExecutorBase.cs
@@ -26,7 +26,6 @@ protected OperationExecutorBase(
             string assembly,
             string startupAssembly,
             string projectDir,
-            string dataDirectory,
             string rootNamespace,
             string language)
         {

diff --git a/src/ef/ReflectionOperationExecutor.cs b/src/ef/ReflectionOperationExecutor.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Reflection;
 using Microsoft.EntityFrameworkCore.Internal;
+using Microsoft.EntityFrameworkCore.Tools.Properties;
 
 namespace Microsoft.EntityFrameworkCore.Tools
 {
@@ -25,8 +26,14 @@ public ReflectionOperationExecutor(
             string dataDirectory,
             string rootNamespace,
             string language)
-            : base(assembly, startupAssembly, projectDir, dataDirectory, rootNamespace, language)
+            : base(assembly, startupAssembly, projectDir, rootNamespace, language)
         {
+            if (dataDirectory != null)
+            {
+                Reporter.WriteVerbose(Resources.UsingDataDir(dataDirectory));
+                AppDomain.CurrentDomain.SetData("DataDirectory", dataDirectory);
+            }
+
             AppDomain.CurrentDomain.AssemblyResolve += ResolveAssembly;
 
             _commandsAssembly = Assembly.Load(new AssemblyName { Name = DesignAssemblyName });

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
diff --git a/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj b/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj
@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Microsoft.EntityFrameworkCore.Cosmos.FunctionalTests</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore.Cosmos</RootNamespace>
-    <!-- Put this project into its own test group to avoid running parallel with other test projects. The test assembly is not loaded propertly on net461 otherwise. -->
-    <TestGroupName>Cosmos.FunctionalTests</TestGroupName>
     <CodeAnalysisRuleSet>..\..\EFCore.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
@@ -26,10 +24,6 @@
     <ProjectReference Include="..\EFCore.Specification.Tests\EFCore.Specification.Tests.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />

diff --git a/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj b/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Microsoft.EntityFrameworkCore.Cosmos.Tests</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore.Cosmos</RootNamespace>
     <CodeAnalysisRuleSet>..\..\EFCore.ruleset</CodeAnalysisRuleSet>

diff --git a/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj b/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Microsoft.EntityFrameworkCore.CrossStore.FunctionalTests</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
     <!-- Workaround https://github.com/Microsoft/vstest/issues/792. -->