From 3cf8a41e4a1d4b6705e8024be2aaa5248ad5a7bc Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 6 Nov 2018 17:30:26 -0800
Subject: [PATCH] Remove the aspnet/Logging submodule
---
.gitmodules | 4 ----
build/CodeSign.props | 8 ++++++++
build/artifacts.props | 11 -----------
build/buildorder.props | 1 -
build/dependencies.props | 9 +++++++++
build/external-dependencies.props | 15 ++++++++++++---
build/submodules.props | 1 -
modules/Logging | 1 -
8 files changed, 29 insertions(+), 21 deletions(-)
delete mode 160000 modules/Logging
diff --git a/.gitmodules b/.gitmodules
index b328994a6b7..55b650c605e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,10 +82,6 @@
path = modules/Localization
url = https://github.com/aspnet/Localization.git
branch = release/2.2
-[submodule "modules/Logging"]
- path = modules/Logging
- url = https://github.com/aspnet/Logging.git
- branch = release/2.2
[submodule "modules/MetaPackages"]
path = modules/MetaPackages
url = https://github.com/aspnet/MetaPackages.git
diff --git a/build/CodeSign.props b/build/CodeSign.props
index 55b5a7cfe48..dc6b6008937 100644
--- a/build/CodeSign.props
+++ b/build/CodeSign.props
@@ -19,6 +19,7 @@
<!-- These files came from the aspnet/Extensions build, but have to be re-signed because we crossgen them. -->
<FilesToSign Include="Microsoft.Extensions.Configuration.AzureKeyVault.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+ <FilesToSign Include="Microsoft.Extensions.Logging.AzureAppServices" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
<FilesToSign Include="Microsoft.Extensions.Configuration.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Configuration.Binder.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
@@ -39,6 +40,13 @@
<FilesToSign Include="Microsoft.Extensions.FileProviders.Embedded.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.FileProviders.Physical.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.FileSystemGlobbing.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+ <FilesToSign Include="Microsoft.Extensions.Logging.Abstractions" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+ <FilesToSign Include="Microsoft.Extensions.Logging.Configuration" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+ <FilesToSign Include="Microsoft.Extensions.Logging.Console" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+ <FilesToSign Include="Microsoft.Extensions.Logging.Debug" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+ <FilesToSign Include="Microsoft.Extensions.Logging.EventSource" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+ <FilesToSign Include="Microsoft.Extensions.Logging.TraceSource" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+ <FilesToSign Include="Microsoft.Extensions.Logging" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.ObjectPool.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Options.ConfigurationExtensions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Options.DataAnnotations.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
diff --git a/build/artifacts.props b/build/artifacts.props
index e176e35291e..a404466e788 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -204,17 +204,6 @@
<PackageArtifact Include="Microsoft.Extensions.Identity.Stores" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Localization" Category="ship" />
- <PackageArtifact Include="Microsoft.Extensions.Logging.Abstractions" Category="ship" />
- <PackageArtifact Include="Microsoft.Extensions.Logging.Analyzers" Category="shipoob" />
- <PackageArtifact Include="Microsoft.Extensions.Logging.AzureAppServices" Category="ship" />
- <PackageArtifact Include="Microsoft.Extensions.Logging.Configuration" Category="ship" />
- <PackageArtifact Include="Microsoft.Extensions.Logging.Console" Category="ship" />
- <PackageArtifact Include="Microsoft.Extensions.Logging.Debug" Category="ship" />
- <PackageArtifact Include="Microsoft.Extensions.Logging.EventLog" Category="ship" />
- <PackageArtifact Include="Microsoft.Extensions.Logging.EventSource" Category="ship" />
- <PackageArtifact Include="Microsoft.Extensions.Logging.Testing" Category="noship" />
- <PackageArtifact Include="Microsoft.Extensions.Logging.TraceSource" Category="ship" />
- <PackageArtifact Include="Microsoft.Extensions.Logging" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.WebEncoders" Category="ship" />
<PackageArtifact Include="Microsoft.Net.Http.Headers" Category="ship" />
<PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" />
diff --git a/build/buildorder.props b/build/buildorder.props
index 766161e0e4f..a29d0cb8f63 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -11,7 +11,6 @@
<RepositoryBuildOrder Include="DotNetTools" Order="4" />
<RepositoryBuildOrder Include="Caching" Order="5" />
<RepositoryBuildOrder Include="HtmlAbstractions" Order="5" />
- <RepositoryBuildOrder Include="Logging" Order="5" />
<RepositoryBuildOrder Include="Razor" Order="6" />
<RepositoryBuildOrder Include="HttpAbstractions" Order="6" />
<RepositoryBuildOrder Include="HttpClientFactory" Order="6" />
diff --git a/build/dependencies.props b/build/dependencies.props
index d42cc5589cf..f557bb9f2ce 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -37,6 +37,15 @@
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
+ <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
+ <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
+ <MicrosoftExtensionsLoggingConfigurationPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsLoggingConfigurationPackageVersion>
+ <MicrosoftExtensionsLoggingConsolePackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsLoggingConsolePackageVersion>
+ <MicrosoftExtensionsLoggingDebugPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsLoggingDebugPackageVersion>
+ <MicrosoftExtensionsLoggingEventSourcePackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsLoggingEventSourcePackageVersion>
+ <MicrosoftExtensionsLoggingPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsLoggingPackageVersion>
+ <MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsLoggingTestingPackageVersion>
+ <MicrosoftExtensionsLoggingTraceSourcePackageVersion>2.2.0-rtm-35636</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion>
<MicrosoftExtensionsObjectPoolPackageVersion>2.2.0-rtm-181105-01</MicrosoftExtensionsObjectPoolPackageVersion>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index b3fae958f2e..48e6241288d 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -42,9 +42,21 @@
<ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Logging.EventSource" Version="$(MicrosoftExtensionsLoggingEventSourcePackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Logging.TraceSource" Version="$(MicrosoftExtensionsLoggingTraceSourcePackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.NonCapturingTimer.Sources" Version="$(MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" Version="$(MicrosoftExtensionsObjectMethodExecutorSourcesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Options.DataAnnotations" Version="$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)" />
+ <ExternalDependency Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="$(MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Process.Sources" Version="$(MicrosoftExtensionsProcessSourcesPackageVersion)" />
@@ -56,9 +68,6 @@
<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.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Options.DataAnnotations" Version="$(MicrosoftExtensionsOptionsDataAnnotationsPackageVersion)" />
- <ExternalDependency Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
</ItemGroup>
<ItemGroup>
diff --git a/build/submodules.props b/build/submodules.props
index f5fd966f7fc..5d02446138b 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -58,7 +58,6 @@
<Repository Include="JsonPatch" />
<Repository Include="KestrelHttpServer" />
<Repository Include="Localization" />
- <Repository Include="Logging" />
<Repository Include="MetaPackages" PatchPolicy="CascadeVersions" />
<Repository Include="Mvc" />
<Repository Include="MvcPrecompilation" />
diff --git a/modules/Logging b/modules/Logging
deleted file mode 160000
index d39ac3492dc..00000000000
--- a/modules/Logging
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d39ac3492dc075a13580419b698960fe084a7c00
--
GitLab