diff --git a/.gitmodules b/.gitmodules
index b8acf7e3dd..9b5aa17ead 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -78,18 +78,10 @@
path = modules/Localization
url = https://github.com/aspnet/Localization.git
branch = master
-[submodule "modules/Logging"]
- path = modules/Logging
- url = https://github.com/aspnet/Logging.git
- branch = master
[submodule "modules/MetaPackages"]
path = modules/MetaPackages
url = https://github.com/aspnet/MetaPackages.git
branch = master
-[submodule "modules/Microsoft.Data.Sqlite"]
- path = modules/Microsoft.Data.Sqlite
- url = https://github.com/aspnet/Microsoft.Data.Sqlite.git
- branch = master
[submodule "modules/MusicStore"]
path = modules/MusicStore
url = https://github.com/aspnet/MusicStore.git
diff --git a/build/CodeSign.props b/build/CodeSign.props
index 34db4660f2..3c1b9e862b 100644
--- a/build/CodeSign.props
+++ b/build/CodeSign.props
@@ -28,6 +28,13 @@
+
+
+
+
+
+
+
diff --git a/build/artifacts.props b/build/artifacts.props
index 6042ab8cc9..38f66145eb 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -197,17 +197,6 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/buildorder.props b/build/buildorder.props
index 87660b01e3..e491f073bd 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -11,7 +11,6 @@
-
diff --git a/build/dependencies.props b/build/dependencies.props
index f0f735dcee..5680314f40 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -31,54 +31,63 @@
4.6.0-preview1-26907-04
4.6.0-preview1-26829-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-alpha1-10706
- 3.0.0-alpha1-10706
- 3.0.0-alpha1-10706
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
- 3.0.0-preview-181106-04
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
+ 3.0.0-preview-181106-11
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index da4ae0ad99..e1c04acbb7 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -41,9 +41,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,9 +67,6 @@
-
-
-
diff --git a/build/submodules.props b/build/submodules.props
index ab7e01fbec..75ff639dc8 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -57,7 +57,6 @@
-
diff --git a/modules/Logging b/modules/Logging
deleted file mode 160000
index e94b64f96b..0000000000
--- a/modules/Logging
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e94b64f96b425190b027f5d956db34bcb529bf8c
diff --git a/src/DataProtection/samples/AzureKeyVault/Program.cs b/src/DataProtection/samples/AzureKeyVault/Program.cs
index 7d6299f3e5..7da515fa95 100644
--- a/src/DataProtection/samples/AzureKeyVault/Program.cs
+++ b/src/DataProtection/samples/AzureKeyVault/Program.cs
@@ -26,7 +26,7 @@ namespace ConsoleApplication
var cert = store.Certificates.Find(X509FindType.FindByThumbprint, config["CertificateThumbprint"], false);
var serviceCollection = new ServiceCollection();
- serviceCollection.AddLogging();
+ serviceCollection.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
serviceCollection.AddDataProtection()
.PersistKeysToFileSystem(new DirectoryInfo("."))
.ProtectKeysWithAzureKeyVault(config["KeyId"], config["ClientId"], cert.OfType().Single());
@@ -34,7 +34,6 @@ namespace ConsoleApplication
var serviceProvider = serviceCollection.BuildServiceProvider();
var loggerFactory = serviceProvider.GetService();
- loggerFactory.AddConsole();
var protector = serviceProvider.GetDataProtector("Test");
diff --git a/src/WebSockets/samples/EchoApp/Startup.cs b/src/WebSockets/samples/EchoApp/Startup.cs
index 729716693c..1fc4caafb4 100644
--- a/src/WebSockets/samples/EchoApp/Startup.cs
+++ b/src/WebSockets/samples/EchoApp/Startup.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.WebSockets;
@@ -19,13 +19,12 @@ namespace EchoApp
// For more information on how to configure your application, visit http://go.microsoft.com/fwlink/?LinkID=398940
public void ConfigureServices(IServiceCollection services)
{
+ services.AddLogging(builder => builder.AddConsole());
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
{
- loggerFactory.AddConsole(LogLevel.Debug);
-
if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();