From b75fa54ad2be3fc09b49064a01b7dae9af1ebda3 Mon Sep 17 00:00:00 2001 From: Nate McMaster <natemcmaster@users.noreply.github.com> Date: Wed, 7 Nov 2018 14:00:19 -0800 Subject: [PATCH] Remove the EntityFrameworkCore submodule (#3964) This removes EntityFrameworkCore as a git submodule. The EFCore repo will build on its own, and the AspNetCore repo will consume EFCore via PackageReference. --- .gitmodules | 4 ---- build/CodeSign.props | 7 +++++++ build/artifacts.props | 19 ------------------- build/buildorder.props | 1 - build/dependencies.props | 25 +++++++++++-------------- build/external-dependencies.props | 26 ++++++++++---------------- build/submodules.props | 1 - modules/EntityFrameworkCore | 1 - 8 files changed, 28 insertions(+), 56 deletions(-) delete mode 160000 modules/EntityFrameworkCore diff --git a/.gitmodules b/.gitmodules index 618bf1ac795..50e0b0d5164 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,10 +30,6 @@ path = modules/DotNetTools url = https://github.com/aspnet/DotNetTools.git branch = master -[submodule "modules/EntityFrameworkCore"] - path = modules/EntityFrameworkCore - url = https://github.com/aspnet/EntityFrameworkCore.git - branch = master [submodule "modules/Hosting"] path = modules/Hosting url = https://github.com/aspnet/Hosting.git diff --git a/build/CodeSign.props b/build/CodeSign.props index 384171e3a08..d7d412b0731 100644 --- a/build/CodeSign.props +++ b/build/CodeSign.props @@ -43,6 +43,13 @@ <FilesToSign Include="Microsoft.Extensions.Options.DataAnnotations.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.Options.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <FilesToSign Include="Microsoft.Extensions.Primitives.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> + <!-- These files came from the aspnet/EntityFrameworkCore build, but have to be re-signed because we crossgen them. --> + <FilesToSign Include="Microsoft.EntityFrameworkCore.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> + <FilesToSign Include="Microsoft.EntityFrameworkCore.Design.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> + <FilesToSign Include="Microsoft.EntityFrameworkCore.InMemory.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> + <FilesToSign Include="Microsoft.EntityFrameworkCore.Relational.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> + <FilesToSign Include="Microsoft.EntityFrameworkCore.SqlServer.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> + <FilesToSign Include="Microsoft.EntityFrameworkCore.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" /> <!-- These files came from partner teams. They have to be re-signed because we crossgen them and redistributable them in our installers. --> diff --git a/build/artifacts.props b/build/artifacts.props index 3eccc3934a8..9df9a579f96 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -14,7 +14,6 @@ <ItemGroup> <PackageArtifact Include="dotnet-dev-certs" Category="ship" /> - <PackageArtifact Include="dotnet-ef" Category="ship" /> <PackageArtifact Include="dotnet-sql-cache" Category="ship" /> <PackageArtifact Include="dotnet-user-secrets" Category="ship" /> <PackageArtifact Include="dotnet-watch" Category="ship" /> @@ -156,28 +155,10 @@ <PackageArtifact Include="Microsoft.CodeAnalysis.Razor.Workspaces" Category="shipoob" /> <PackageArtifact Include="Microsoft.CodeAnalysis.Razor" Category="ship" /> <PackageArtifact Include="Microsoft.CodeAnalysis.Remote.Razor" Category="shipoob" /> - <PackageArtifact Include="Microsoft.Data.Sqlite.Core" Category="ship" /> - <PackageArtifact Include="Microsoft.Data.Sqlite" Category="ship" /> <PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="ship" /> <PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="ship" /> <PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" Category="ship" /> <PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Abstractions" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Analyzers" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Cosmos" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Design" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.InMemory" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Proxies" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Relational" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Specification.Tests" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.SqlServer" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools" Category="ship" /> - <PackageArtifact Include="Microsoft.EntityFrameworkCore" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.ApiDescription.Design" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" /> <PackageArtifact Include="Microsoft.Extensions.Buffers.MemoryPool.Sources" Category="noship" /> diff --git a/build/buildorder.props b/build/buildorder.props index 75496d9a966..1939ecb1a7b 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -15,7 +15,6 @@ <RepositoryBuildOrder Include="HttpClientFactory" Order="6" /> <RepositoryBuildOrder Include="Hosting" Order="7" /> <RepositoryBuildOrder Include="KestrelHttpServer" Order="8" /> - <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" /> <RepositoryBuildOrder Include="HttpSysServer" Order="8" /> <RepositoryBuildOrder Include="DataProtection" Order="9" RootPath="$(RepositoryRoot)src\DataProtection\" /> <RepositoryBuildOrder Include="BasicMiddleware" Order="9" /> diff --git a/build/dependencies.props b/build/dependencies.props index 245a5466c5d..d254b977173 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -39,8 +39,8 @@ <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion> <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsCachingAbstractionsPackageVersion> <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsCachingMemoryPackageVersion> - <MicrosoftExtensionsCachingRedisPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsCachingRedisPackageVersion> <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsCachingSqlServerPackageVersion> + <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion> <MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion> <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsConfigurationAbstractionsPackageVersion> @@ -92,6 +92,16 @@ <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion> <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsValueStopwatchSourcesPackageVersion> <MicrosoftExtensionsWebEncodersSourcesPackageVersion>3.0.0-preview-181106-14</MicrosoftExtensionsWebEncodersSourcesPackageVersion> + <!-- Packages from aspnet/EntityFrameworkCore --> + <MicrosoftEntityFrameworkCoreAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreAbstractionsPackageVersion> + <MicrosoftEntityFrameworkCoreAnalyzersPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreAnalyzersPackageVersion> + <MicrosoftEntityFrameworkCoreDesignPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreDesignPackageVersion> + <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> + <MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreRelationalPackageVersion> + <MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreSqlitePackageVersion> + <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> + <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCoreToolsPackageVersion> + <MicrosoftEntityFrameworkCorePackageVersion>3.0.0-alpha1-10706</MicrosoftEntityFrameworkCorePackageVersion> </PropertyGroup> <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> @@ -103,7 +113,6 @@ <MicrosoftNETCoreAppPackageVersion>$(MicrosoftNETCoreApp30PackageVersion)</MicrosoftNETCoreAppPackageVersion> <!-- Determined by build tools --> - <MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion> <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion> </PropertyGroup> @@ -139,7 +148,6 @@ <MicrosoftApplicationInsightsAspNetCorePackageVersion>2.1.1</MicrosoftApplicationInsightsAspNetCorePackageVersion> <MicrosoftAspNetIdentityEntityFrameworkPackageVersion>2.2.1</MicrosoftAspNetIdentityEntityFrameworkPackageVersion> <MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion> - <MicrosoftAzureDocumentDBCorePackageVersion>1.7.1</MicrosoftAzureDocumentDBCorePackageVersion> <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion> <MicrosoftAzureManagementFluentPackageVersion>1.1.3</MicrosoftAzureManagementFluentPackageVersion> <MicrosoftAzureServicesAppAuthenticationPackageVersion>1.0.1</MicrosoftAzureServicesAppAuthenticationPackageVersion> @@ -192,36 +200,25 @@ <MicrosoftVisualStudioThreadingPackageVersion>15.8.168</MicrosoftVisualStudioThreadingPackageVersion> <MicrosoftWebAdministrationPackageVersion>11.1.0</MicrosoftWebAdministrationPackageVersion> <MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion> - <mod_spatialitePackageVersion>4.3.0.1</mod_spatialitePackageVersion> <MonoAddinsPackageVersion>1.3.8</MonoAddinsPackageVersion> <MonoDevelopSdkPackageVersion>1.0.1</MonoDevelopSdkPackageVersion> <MoqPackageVersion>4.10.0</MoqPackageVersion> <NETStandard16PackageVersion>1.6.1</NETStandard16PackageVersion> <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion> - <NetTopologySuiteCorePackageVersion>1.15.1</NetTopologySuiteCorePackageVersion> - <NetTopologySuiteIOSpatiaLitePackageVersion>1.15.0</NetTopologySuiteIOSpatiaLitePackageVersion> - <NetTopologySuiteIOSqlServerBytesPackageVersion>1.15.0</NetTopologySuiteIOSqlServerBytesPackageVersion> <NewtonsoftJsonBsonPackageVersion>1.0.1</NewtonsoftJsonBsonPackageVersion> <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion> - <NuGetFrameworksPackageVersion>4.7.0</NuGetFrameworksPackageVersion> - <OracleManagedDataAccessPackageVersion>12.2.1100</OracleManagedDataAccessPackageVersion> <PollyExtensionsHttpPackageVersion>2.0.1</PollyExtensionsHttpPackageVersion> <PollyPackageVersion>6.0.1</PollyPackageVersion> - <RemotionLinqPackageVersion>2.2.0</RemotionLinqPackageVersion> <SeleniumFirefoxWebDriverPackageVersion>0.20.0</SeleniumFirefoxWebDriverPackageVersion> <SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion> <SeleniumWebDriverMicrosoftDriverPackageVersion>17.17134.0</SeleniumWebDriverMicrosoftDriverPackageVersion> <SeleniumWebDriverPackageVersion>3.12.1</SeleniumWebDriverPackageVersion> <SerilogExtensionsLoggingPackageVersion>1.4.0</SerilogExtensionsLoggingPackageVersion> <SerilogSinksFilePackageVersion>4.0.0</SerilogSinksFilePackageVersion> - <SQLitePCLRawBundleGreenPackageVersion>1.1.11</SQLitePCLRawBundleGreenPackageVersion> - <SQLitePCLRawBundleSqlcipherPackageVersion>1.1.11</SQLitePCLRawBundleSqlcipherPackageVersion> - <SQLitePCLRawCorePackageVersion>1.1.11</SQLitePCLRawCorePackageVersion> <StackExchangeRedisPackageVersion>2.0.513</StackExchangeRedisPackageVersion> <StreamJsonRpcPackageVersion>1.3.23</StreamJsonRpcPackageVersion> <StyleCopAnalyzersPackageVersion>1.0.0</StyleCopAnalyzersPackageVersion> <SystemIdentityModelTokensJwtPackageVersion>5.3.0</SystemIdentityModelTokensJwtPackageVersion> - <SystemInteractiveAsyncPackageVersion>3.2.0</SystemInteractiveAsyncPackageVersion> <SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion> <SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion> <SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion> diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 34b70e6c752..223187a8cca 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -18,8 +18,8 @@ <ExternalDependency Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftExtensionsCachingAbstractionsPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" /> - <ExternalDependency Include="Microsoft.Extensions.Caching.Redis" Version="$(MicrosoftExtensionsCachingRedisPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.Caching.SqlServer" Version="$(MicrosoftExtensionsCachingSqlServerPackageVersion)" /> + <ExternalDependency Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="$(MicrosoftExtensionsCachingStackExchangeRedisPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(MicrosoftExtensionsClosedGenericMatcherSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" /> @@ -71,22 +71,28 @@ <ExternalDependency Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.ValueStopwatch.Sources" Version="$(MicrosoftExtensionsValueStopwatchSourcesPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.WebEncoders.Sources" Version="$(MicrosoftExtensionsWebEncodersSourcesPackageVersion)" /> + <ExternalDependency Include="Microsoft.EntityFrameworkCore.Abstractions" Version="$(MicrosoftEntityFrameworkCoreAbstractionsPackageVersion)" /> + <ExternalDependency Include="Microsoft.EntityFrameworkCore.Analyzers" Version="$(MicrosoftEntityFrameworkCoreAnalyzersPackageVersion)" /> + <ExternalDependency Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignPackageVersion)" /> + <ExternalDependency Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" /> + <ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" /> + <ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqlitePackageVersion)" /> + <ExternalDependency Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" /> + <ExternalDependency Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" /> + <ExternalDependency Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" /> </ItemGroup> <ItemGroup> <ExternalDependency Include="AngleSharp" Version="$(AngleSharpPackageVersion)" /> <ExternalDependency Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" /> - <ExternalDependency Include="Castle.Core" Version="$(CastleCorePackageVersion)" /> <ExternalDependency Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" /> <ExternalDependency Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" /> <ExternalDependency Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkPackageVersion)" /> - <ExternalDependency Include="Microsoft.AspNetCore.BuildTools.ApiCheck" Version="$(MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion)" /> <ExternalDependency Include="Internal.AspNetCore.SiteExtension.Sdk" Version="$(InternalAspNetCoreSiteExtensionSdkPackageVersion)" /> <ExternalDependency Include="Libuv" Version="$(LibuvPackageVersion)" /> <ExternalDependency Include="Microsoft.ApplicationInsights.AspNetCore" Version="$(MicrosoftApplicationInsightsAspNetCorePackageVersion)" /> <ExternalDependency Include="Microsoft.AspNet.Identity.EntityFramework" Version="$(MicrosoftAspNetIdentityEntityFrameworkPackageVersion)" /> <ExternalDependency Include="Microsoft.AspNet.WebApi.Client" Version="$(MicrosoftAspNetWebApiClientPackageVersion)" /> - <ExternalDependency Include="Microsoft.Azure.DocumentDB.Core" Version="$(MicrosoftAzureDocumentDBCorePackageVersion)" /> <ExternalDependency Include="Microsoft.Azure.KeyVault" Version="$(MicrosoftAzureKeyVaultPackageVersion)" /> <ExternalDependency Include="Microsoft.Azure.Management.Fluent" Version="$(MicrosoftAzureManagementFluentPackageVersion)" /> <ExternalDependency Include="Microsoft.Azure.Services.AppAuthentication" Version="$(MicrosoftAzureServicesAppAuthenticationPackageVersion)" /> @@ -174,7 +180,6 @@ <ExternalDependency Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" /> <ExternalDependency Include="Microsoft.Web.Administration" Version="$(MicrosoftWebAdministrationPackageVersion)" /> <ExternalDependency Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" /> - <ExternalDependency Include="mod_spatialite" Version="$(mod_spatialitePackageVersion)" /> <ExternalDependency Include="Mono.Addins" Version="$(MonoAddinsPackageVersion)" /> <ExternalDependency Include="MonoDevelop.Sdk" Version="$(MonoDevelopSdkPackageVersion)" /> <ExternalDependency Include="Moq" Version="$(MoqPackageVersion)" /> @@ -185,30 +190,20 @@ <!-- netstandard2.0 --> <ExternalDependency Include="NETStandard.Library" Version="$(NETStandardLibrary20PackageVersion)" VariableName="NETStandardLibrary20PackageVersion" /> - <ExternalDependency Include="NetTopologySuite.Core" Version="$(NetTopologySuiteCorePackageVersion)" /> - <ExternalDependency Include="NetTopologySuite.IO.SpatiaLite" Version="$(NetTopologySuiteIOSpatiaLitePackageVersion)" /> - <ExternalDependency Include="NetTopologySuite.IO.SqlServerBytes" Version="$(NetTopologySuiteIOSqlServerBytesPackageVersion)" /> - <!-- This version should be used by runtime packages --> <ExternalDependency Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" /> <!-- This version is required by MSBuild tasks or Visual Studio extensions. --> <ExternalDependency Include="Newtonsoft.Json" Version="$(VisualStudio_NewtonsoftJsonPackageVersion)" VariableName="VisualStudio_NewtonsoftJsonPackageVersion" /> <ExternalDependency Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" /> - <ExternalDependency Include="NuGet.Frameworks" Version="$(NuGetFrameworksPackageVersion)" /> - <ExternalDependency Include="Oracle.ManagedDataAccess" Version="$(OracleManagedDataAccessPackageVersion)" /> <ExternalDependency Include="Polly.Extensions.Http" Version="$(PollyExtensionsHttpPackageVersion)" /> <ExternalDependency Include="Polly" Version="$(PollyPackageVersion)" /> - <ExternalDependency Include="Remotion.Linq" Version="$(RemotionLinqPackageVersion)" /> <ExternalDependency Include="Selenium.Firefox.WebDriver" Version="$(SeleniumFirefoxWebDriverPackageVersion)" /> <ExternalDependency Include="Selenium.Support" Version="$(SeleniumSupportPackageVersion)" /> <ExternalDependency Include="Selenium.WebDriver.MicrosoftDriver" Version="$(SeleniumWebDriverMicrosoftDriverPackageVersion)" /> <ExternalDependency Include="Selenium.WebDriver" Version="$(SeleniumWebDriverPackageVersion)" /> <ExternalDependency Include="Serilog.Extensions.Logging" Version="$(SerilogExtensionsLoggingPackageVersion)" /> <ExternalDependency Include="Serilog.Sinks.File" Version="$(SerilogSinksFilePackageVersion)" /> - <ExternalDependency Include="SQLitePCLRaw.bundle_green" Version="$(SQLitePCLRawBundleGreenPackageVersion)" /> - <ExternalDependency Include="SQLitePCLRaw.bundle_sqlcipher" Version="$(SQLitePCLRawBundleSqlcipherPackageVersion)" /> - <ExternalDependency Include="SQLitePCLRaw.core" Version="$(SQLitePCLRawCorePackageVersion)" /> <ExternalDependency Include="StackExchange.Redis" Version="$(StackExchangeRedisPackageVersion)" /> <ExternalDependency Include="StreamJsonRpc" Version="$(StreamJsonRpcPackageVersion)" /> <ExternalDependency Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" /> @@ -219,7 +214,6 @@ <ExternalDependency Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" /> <ExternalDependency Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" /> <ExternalDependency Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtPackageVersion)" /> - <ExternalDependency Include="System.Interactive.Async" Version="$(SystemInteractiveAsyncPackageVersion)" /> <ExternalDependency Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" /> <ExternalDependency Include="System.Memory" Version="$(SystemMemoryPackageVersion)" /> <ExternalDependency Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" /> diff --git a/build/submodules.props b/build/submodules.props index 5fca99af204..74d00d31abd 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -44,7 +44,6 @@ <Repository Include="DataProtection" RootPath="$(RepositoryRoot)src\DataProtection\" /> <Repository Include="Diagnostics" /> <Repository Include="DotNetTools" /> - <Repository Include="EntityFrameworkCore" /> <Repository Include="Hosting" /> <Repository Include="HtmlAbstractions" /> <Repository Include="HttpAbstractions" /> diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore deleted file mode 160000 index f54a7241e78..00000000000 --- a/modules/EntityFrameworkCore +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f54a7241e78c9d9c8d87e80ec7cd68a1526767da -- GitLab