From c9702aa4fe093d50656f7721153b41532fec0cb9 Mon Sep 17 00:00:00 2001 From: Jovan Popovic Date: Fri, 4 Nov 2016 13:04:31 -0700 Subject: [PATCH] Removed Caching.Memory Removed references to Caching.Memory from the project due to issues with .net 4.6 compilaiton on mac. --- samples/demos/BelgradeProductCatalogDemo/.gitignore | 3 ++- samples/demos/BelgradeProductCatalogDemo/Startup.cs | 1 - samples/demos/BelgradeProductCatalogDemo/project.json | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/samples/demos/BelgradeProductCatalogDemo/.gitignore b/samples/demos/BelgradeProductCatalogDemo/.gitignore index cee26d9b..d012fcb9 100644 --- a/samples/demos/BelgradeProductCatalogDemo/.gitignore +++ b/samples/demos/BelgradeProductCatalogDemo/.gitignore @@ -7,4 +7,5 @@ obj/* *.log *.lock.json Properties/PublishProfiles/* -appsettings.Development.json \ No newline at end of file +appsettings.Development.json +appsettings.Production.json \ No newline at end of file diff --git a/samples/demos/BelgradeProductCatalogDemo/Startup.cs b/samples/demos/BelgradeProductCatalogDemo/Startup.cs index f4f13ad0..42eb7458 100644 --- a/samples/demos/BelgradeProductCatalogDemo/Startup.cs +++ b/samples/demos/BelgradeProductCatalogDemo/Startup.cs @@ -54,7 +54,6 @@ namespace ProductCatalog // Add framework services. services.AddSingleton(); - services.AddDistributedMemoryCache(); services.AddSession(); services.AddMvc(); } diff --git a/samples/demos/BelgradeProductCatalogDemo/project.json b/samples/demos/BelgradeProductCatalogDemo/project.json index b62d09db..974e6c10 100644 --- a/samples/demos/BelgradeProductCatalogDemo/project.json +++ b/samples/demos/BelgradeProductCatalogDemo/project.json @@ -6,7 +6,6 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.Session": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.Extensions.Caching.Memory": "1.0.0", "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", "Microsoft.Extensions.Configuration.Json": "1.0.0", @@ -34,7 +33,6 @@ }, "net46": { "dependencies": { - "Microsoft.Framework.Caching.Memory": "1.0.0-*" } } },