Fix for issue #67 https://github.com/dotnet/eShopOnContainers/issues/67 renamed Models folder to ViewModels in WebMVC

src/Services/Identity/Identity.API/Data/Migrations/20161019122215_Init_Scheme.Designer.cs

@@ -124,7 +124,7 @@ namespace WebMVC.Migrations
                     b.ToTable("AspNetUserTokens");
                 });
 
-            modelBuilder.Entity("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser", b =>
+            modelBuilder.Entity("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser", b =>
                 {
                     b.Property<string>("Id");
 
@@ -211,7 +211,7 @@ namespace WebMVC.Migrations
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", b =>
                 {
-                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser")
+                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser")
                         .WithMany("Claims")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -219,7 +219,7 @@ namespace WebMVC.Migrations
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", b =>
                 {
-                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser")
+                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser")
                         .WithMany("Logins")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -232,7 +232,7 @@ namespace WebMVC.Migrations
                         .HasForeignKey("RoleId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser")
+                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser")
                         .WithMany("Roles")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

src/Services/Identity/Identity.API/Data/Migrations/20161020101725_extendProfile.Designer.cs

@@ -124,7 +124,7 @@ namespace WebMVC.Migrations
                     b.ToTable("AspNetUserTokens");
                 });
 
-            modelBuilder.Entity("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser", b =>
+            modelBuilder.Entity("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser", b =>
                 {
                     b.Property<string>("Id");
 
@@ -215,7 +215,7 @@ namespace WebMVC.Migrations
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", b =>
                 {
-                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser")
+                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser")
                         .WithMany("Claims")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -223,7 +223,7 @@ namespace WebMVC.Migrations
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", b =>
                 {
-                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser")
+                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser")
                         .WithMany("Logins")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -236,7 +236,7 @@ namespace WebMVC.Migrations
                         .HasForeignKey("RoleId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser")
+                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser")
                         .WithMany("Roles")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

src/Services/Identity/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -122,7 +122,7 @@ namespace WebMVC.Migrations
                     b.ToTable("AspNetUserTokens");
                 });
 
-            modelBuilder.Entity("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser", b =>
+            modelBuilder.Entity("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser", b =>
                 {
                     b.Property<string>("Id");
 
@@ -213,7 +213,7 @@ namespace WebMVC.Migrations
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", b =>
                 {
-                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser")
+                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser")
                         .WithMany("Claims")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -221,7 +221,7 @@ namespace WebMVC.Migrations
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", b =>
                 {
-                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser")
+                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser")
                         .WithMany("Logins")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
@@ -234,7 +234,7 @@ namespace WebMVC.Migrations
                         .HasForeignKey("RoleId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.Models.ApplicationUser")
+                    b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser")
                         .WithMany("Roles")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);

src/Web/WebMVC/Controllers/AccountController.cs

@@ -1,7 +1,7 @@
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.eShopOnContainers.WebMVC.Services;
 using Microsoft.AspNetCore.Http.Authentication;
 

src/Web/WebMVC/Controllers/CartController.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.WebMVC.Services;
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Authentication;
 

src/Web/WebMVC/Controllers/CatalogController.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopOnContainers.WebMVC.Models.Pagination;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels.Pagination;
 using Microsoft.eShopOnContainers.WebMVC.Services;
-using Microsoft.eShopOnContainers.WebMVC.Models.CatalogViewModels;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels;
 
 
 namespace Microsoft.eShopOnContainers.WebMVC.Controllers

src/Web/WebMVC/Controllers/OrderController.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.WebMVC.Services;
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.AspNetCore.Authorization;
 using System.Net.Http;
 

src/Web/WebMVC/Services/BasketService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.AspNetCore.Http;
 using System.Net.Http;
 using Microsoft.Extensions.Options;

src/Web/WebMVC/Services/CatalogService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.Extensions.Options;
 using System.Net.Http;

src/Web/WebMVC/Services/IBasketService.cs

@@ -1,4 +1,4 @@
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Web/WebMVC/Services/ICatalogService.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Web/WebMVC/Services/IOrderingService.cs

@@ -1,4 +1,4 @@
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Web/WebMVC/Services/IdentityParser.cs

@@ -1,4 +1,4 @@
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Web/WebMVC/Services/OrderingService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using System.Net.Http;

src/Web/WebMVC/Startup.cs

@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.eShopOnContainers.WebMVC.Services;
 using System.IdentityModel.Tokens.Jwt;
 using Microsoft.IdentityModel.Tokens;

src/Web/WebMVC/ViewComponents/Cart.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
-using Microsoft.eShopOnContainers.WebMVC.Models.CartViewModels;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels.CartViewModels;
 using Microsoft.eShopOnContainers.WebMVC.Services;
 using System;
 using System.Collections.Generic;

src/Web/WebMVC/ViewComponents/CartList.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.eShopOnContainers.WebMVC.Services;
 using System;
 using System.Collections.Generic;

src/Web/WebMVC/ViewModels/Annotations/CardExpiration.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models.Annotations
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.Annotations
 {
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = true)]
     public class CardExpirationAttribute : ValidationAttribute

src/Web/WebMVC/ViewModels/ApplicationUser.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     // Add profile data for application users by adding properties to the ApplicationUser class
     public class ApplicationUser : IdentityUser

src/Web/WebMVC/ViewModels/Basket.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class Basket
     {

src/Web/WebMVC/ViewModels/BasketItem.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class BasketItem
     {

src/Web/WebMVC/ViewModels/CartViewModels/IndexViewModel.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models.CartViewModels
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.CartViewModels
 {
     public class CartComponentViewModel
     {

src/Web/WebMVC/ViewModels/Catalog.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class Catalog
     {

src/Web/WebMVC/ViewModels/CatalogItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class CatalogItem
     {

src/Web/WebMVC/ViewModels/CatalogViewModels/IndexViewModel.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.eShopOnContainers.WebMVC.Models.Pagination;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels.Pagination;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models.CatalogViewModels
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels
 {
     public class IndexViewModel
     {

src/Web/WebMVC/ViewModels/Header.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class Header
     {

src/Web/WebMVC/ViewModels/Order.cs

@@ -1,4 +1,4 @@
-using Microsoft.eShopOnContainers.WebMVC.Models.Annotations;
+using Microsoft.eShopOnContainers.WebMVC.ViewModels.Annotations;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class Order
     {

src/Web/WebMVC/ViewModels/OrderItem.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels
 {
     public class OrderItem
     {

src/Web/WebMVC/ViewModels/Pagination/PaginationInfo.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.WebMVC.Models.Pagination
+namespace Microsoft.eShopOnContainers.WebMVC.ViewModels.Pagination
 {
     public class PaginationInfo
     {

src/Web/WebMVC/Views/Cart/Index.cshtml

@@ -1,7 +1,7 @@
 @using Microsoft.eShopOnContainers.WebMVC.Services
-@using Microsoft.eShopOnContainers.WebMVC.Models
+@using Microsoft.eShopOnContainers.WebMVC.ViewModels
 
-@model Microsoft.eShopOnContainers.WebMVC.Models.Basket
+@model Microsoft.eShopOnContainers.WebMVC.ViewModels.Basket
 @inject IIdentityParser<ApplicationUser> UserManager
 
 @{

src/Web/WebMVC/Views/Catalog/Index.cshtml

@@ -1,6 +1,6 @@
 @{
     ViewData["Title"] = "Catalog";
-    @model Microsoft.eShopOnContainers.WebMVC.Models.CatalogViewModels.IndexViewModel
+    @model Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels.IndexViewModel
 }
 <section class="esh-catalog-hero">
     <div class="container">

src/Web/WebMVC/Views/Catalog/_pagination.cshtml

@@ -1,4 +1,4 @@
-@model Microsoft.eShopOnContainers.WebMVC.Models.Pagination.PaginationInfo
+@model Microsoft.eShopOnContainers.WebMVC.ViewModels.Pagination.PaginationInfo
 
 <div class="esh-pager">
     <div class="container">

src/Web/WebMVC/Views/Order/Create.cshtml

@@ -1,5 +1,5 @@
 @using Microsoft.eShopOnContainers.WebMVC.Services
-@model Microsoft.eShopOnContainers.WebMVC.Models.Order
+@model Microsoft.eShopOnContainers.WebMVC.ViewModels.Order
 @inject IIdentityParser<ApplicationUser> UserManager
 
 @{

src/Web/WebMVC/Views/Order/Detail.cshtml

@@ -1,6 +1,6 @@
-@using Microsoft.eShopOnContainers.WebMVC.Models
+@using Microsoft.eShopOnContainers.WebMVC.ViewModels
 
-@model Microsoft.eShopOnContainers.WebMVC.Models.Order
+@model Microsoft.eShopOnContainers.WebMVC.ViewModels.Order
 
 @{
     ViewData["Title"] = "Order Detail";

src/Web/WebMVC/Views/Order/Index.cshtml

@@ -1,6 +1,6 @@
-@using Microsoft.eShopOnContainers.WebMVC.Models
+@using Microsoft.eShopOnContainers.WebMVC.ViewModels
 
-@model IEnumerable<Microsoft.eShopOnContainers.WebMVC.Models.Order>
+@model IEnumerable<Microsoft.eShopOnContainers.WebMVC.ViewModels.Order>
 
 @{
     ViewData["Title"] = "My Orders";

src/Web/WebMVC/Views/Order/_OrderItems.cshtml

@@ -1,4 +1,4 @@
-@model Microsoft.eShopOnContainers.WebMVC.Models.Order
+@model Microsoft.eShopOnContainers.WebMVC.ViewModels.Order
 
 
 <section class="esh-orders_new-section">

src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml

@@ -1,4 +1,4 @@
-@model Microsoft.eShopOnContainers.WebMVC.Models.CartViewModels.CartComponentViewModel
+@model Microsoft.eShopOnContainers.WebMVC.ViewModels.CartViewModels.CartComponentViewModel
 
 @{
     ViewData["Title"] = "My Cart";

src/Web/WebMVC/Views/Shared/Components/CartList/Default.cshtml

@@ -1,4 +1,4 @@
-@model Microsoft.eShopOnContainers.WebMVC.Models.Basket
+@model Microsoft.eShopOnContainers.WebMVC.ViewModels.Basket
 
 @{
     ViewData["Title"] = "My Cart";

src/Web/WebMVC/Views/Shared/_Header.cshtml

@@ -1,4 +1,4 @@
-@model Microsoft.eShopOnContainers.WebMVC.Models.Header
+@model Microsoft.eShopOnContainers.WebMVC.ViewModels.Header
 
 <div class="esh-header">
     <div class="container">

src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml

@@ -1,5 +1,5 @@
 @using Microsoft.AspNetCore.Identity
-@using Microsoft.eShopOnContainers.WebMVC.Models
+@using Microsoft.eShopOnContainers.WebMVC.ViewModels
 @using Microsoft.eShopOnContainers.WebMVC.Services
 
 @inject IIdentityParser<ApplicationUser> UserManager

src/Web/WebMVC/Views/_ViewImports.cshtml

@@ -1,5 +1,5 @@
 @using Microsoft.eShopOnContainers.WebMVC
-@using Microsoft.eShopOnContainers.WebMVC.Models
+@using Microsoft.eShopOnContainers.WebMVC.ViewModels
 @using Microsoft.AspNetCore.Identity
 
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers