FIXME SR is private

src/Yavsc/ViewComponents/BillViewComponent.cs

@@ -1,16 +1,13 @@
-using System.IO;
-using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
-using Microsoft.Data.Entity;
+
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
-using Yavsc.Abstract.FileSystem;
 using Yavsc.Billing;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.ViewModels;
 using Yavsc.ViewModels.Gen;
 using Yavsc.Services;
+using Microsoft.EntityFrameworkCore;
 
 namespace Yavsc.ViewComponents
 {
@@ -86,9 +83,9 @@ namespace Yavsc.ViewComponents
                             BaseFileName = billable.GetFileBaseName(billing)
                         };
                     if (genrtrData.GenerateEstimatePdf()) {
-                        return Json(new { Generated = genrtrData.BaseFileName+".pdf" });
+                        return this.View(new { Generated = genrtrData.BaseFileName+".pdf" });
                     } else {
-                        return Json(new { Error = genrtrData.GenerationErrorMessage } );
+                        return View(new { Error = genrtrData.GenerationErrorMessage } );
                     }
             }
             ViewBag.BillFileInfo =  billable.GetBillInfo(billing);

src/Yavsc/ViewComponents/BlogIndexViewComponent.cs

@@ -1,12 +1,7 @@
-using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Identity;
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNet.Authorization;
-using Microsoft.Extensions.OptionsModel;
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Yavsc.Models;
-using Microsoft.Data.Entity;
-using System.Linq;
 using Yavsc.Models.Blog;
 
 namespace Yavsc.ViewComponents

src/Yavsc/ViewComponents/CalendarViewComponent.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Yavsc.Models;
 using Yavsc.Services;
 

src/Yavsc/ViewComponents/CirclesControlViewComponent.cs

@@ -1,6 +1,6 @@
 using System.Linq;
-using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace Yavsc.ViewComponents
 {

src/Yavsc/ViewComponents/CommentViewComponent.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
 using Yavsc.Models.Blog;
 

src/Yavsc/ViewComponents/DirectoryViewComponent.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using Yavsc.Helpers;
 using Yavsc.ViewModels.UserFiles;
@@ -18,4 +18,4 @@ namespace Yavsc.ViewComponents
             return result;
         }
     }
-}
+}

src/Yavsc/ViewComponents/PayPalButtonComponent.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Yavsc.Helpers;
 using Yavsc.Models.Billing;
 

src/Yavsc/ViewComponents/TaggerComponent.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Yavsc.Interfaces;