diff --git a/WebGoatCore.sln b/WebGoat.NET.sln similarity index 88% rename from WebGoatCore.sln rename to WebGoat.NET.sln index 5647d2e..0696b55 100644 --- a/WebGoatCore.sln +++ b/WebGoat.NET.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29418.71 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebGoatCore", "WebGoatCore\WebGoatCore.csproj", "{706965ED-4ADB-4E9B-AD9F-6EE2C8B8382F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebGoat.NET", "WebGoat.NET\WebGoat.NET.csproj", "{706965ED-4ADB-4E9B-AD9F-6EE2C8B8382F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/WebGoatCore/ApiResponse.cs b/WebGoat.NET/ApiResponse.cs similarity index 100% rename from WebGoatCore/ApiResponse.cs rename to WebGoat.NET/ApiResponse.cs diff --git a/WebGoatCore/Controllers/AccountController.cs b/WebGoat.NET/Controllers/AccountController.cs similarity index 100% rename from WebGoatCore/Controllers/AccountController.cs rename to WebGoat.NET/Controllers/AccountController.cs diff --git a/WebGoatCore/Controllers/BlogController.cs b/WebGoat.NET/Controllers/BlogController.cs similarity index 100% rename from WebGoatCore/Controllers/BlogController.cs rename to WebGoat.NET/Controllers/BlogController.cs diff --git a/WebGoatCore/Controllers/CartController.cs b/WebGoat.NET/Controllers/CartController.cs similarity index 100% rename from WebGoatCore/Controllers/CartController.cs rename to WebGoat.NET/Controllers/CartController.cs diff --git a/WebGoatCore/Controllers/CheckoutController.cs b/WebGoat.NET/Controllers/CheckoutController.cs similarity index 100% rename from WebGoatCore/Controllers/CheckoutController.cs rename to WebGoat.NET/Controllers/CheckoutController.cs diff --git a/WebGoatCore/Controllers/HomeController.cs b/WebGoat.NET/Controllers/HomeController.cs similarity index 100% rename from WebGoatCore/Controllers/HomeController.cs rename to WebGoat.NET/Controllers/HomeController.cs diff --git a/WebGoatCore/Controllers/ProductController.cs b/WebGoat.NET/Controllers/ProductController.cs similarity index 100% rename from WebGoatCore/Controllers/ProductController.cs rename to WebGoat.NET/Controllers/ProductController.cs diff --git a/WebGoatCore/Controllers/StatusCodeController.cs b/WebGoat.NET/Controllers/StatusCodeController.cs similarity index 100% rename from WebGoatCore/Controllers/StatusCodeController.cs rename to WebGoat.NET/Controllers/StatusCodeController.cs diff --git a/WebGoatCore/Data/BlogEntryRepository.cs b/WebGoat.NET/Data/BlogEntryRepository.cs similarity index 100% rename from WebGoatCore/Data/BlogEntryRepository.cs rename to WebGoat.NET/Data/BlogEntryRepository.cs diff --git a/WebGoatCore/Data/BlogResponseRepository.cs b/WebGoat.NET/Data/BlogResponseRepository.cs similarity index 100% rename from WebGoatCore/Data/BlogResponseRepository.cs rename to WebGoat.NET/Data/BlogResponseRepository.cs diff --git a/WebGoatCore/Data/CategoryRepository.cs b/WebGoat.NET/Data/CategoryRepository.cs similarity index 100% rename from WebGoatCore/Data/CategoryRepository.cs rename to WebGoat.NET/Data/CategoryRepository.cs diff --git a/WebGoatCore/Data/Constants.cs b/WebGoat.NET/Data/Constants.cs similarity index 100% rename from WebGoatCore/Data/Constants.cs rename to WebGoat.NET/Data/Constants.cs diff --git a/WebGoatCore/Data/CustomerRepository.cs b/WebGoat.NET/Data/CustomerRepository.cs similarity index 100% rename from WebGoatCore/Data/CustomerRepository.cs rename to WebGoat.NET/Data/CustomerRepository.cs diff --git a/WebGoatCore/Data/NorthwindContext.cs b/WebGoat.NET/Data/NorthwindContext.cs similarity index 100% rename from WebGoatCore/Data/NorthwindContext.cs rename to WebGoat.NET/Data/NorthwindContext.cs diff --git a/WebGoatCore/Data/OrderRepository.cs b/WebGoat.NET/Data/OrderRepository.cs similarity index 100% rename from WebGoatCore/Data/OrderRepository.cs rename to WebGoat.NET/Data/OrderRepository.cs diff --git a/WebGoatCore/Data/ProductRepository.cs b/WebGoat.NET/Data/ProductRepository.cs similarity index 100% rename from WebGoatCore/Data/ProductRepository.cs rename to WebGoat.NET/Data/ProductRepository.cs diff --git a/WebGoatCore/Data/ShipperRepository.cs b/WebGoat.NET/Data/ShipperRepository.cs similarity index 100% rename from WebGoatCore/Data/ShipperRepository.cs rename to WebGoat.NET/Data/ShipperRepository.cs diff --git a/WebGoatCore/Data/SupplierRepository.cs b/WebGoat.NET/Data/SupplierRepository.cs similarity index 100% rename from WebGoatCore/Data/SupplierRepository.cs rename to WebGoat.NET/Data/SupplierRepository.cs diff --git a/WebGoatCore/Exceptions/AbstractWebGoatException.cs b/WebGoat.NET/Exceptions/AbstractWebGoatException.cs similarity index 100% rename from WebGoatCore/Exceptions/AbstractWebGoatException.cs rename to WebGoat.NET/Exceptions/AbstractWebGoatException.cs diff --git a/WebGoatCore/Exceptions/WebGoatCreditCardNotFoundException.cs b/WebGoat.NET/Exceptions/WebGoatCreditCardNotFoundException.cs similarity index 100% rename from WebGoatCore/Exceptions/WebGoatCreditCardNotFoundException.cs rename to WebGoat.NET/Exceptions/WebGoatCreditCardNotFoundException.cs diff --git a/WebGoatCore/Exceptions/WebGoatFatalException.cs b/WebGoat.NET/Exceptions/WebGoatFatalException.cs similarity index 100% rename from WebGoatCore/Exceptions/WebGoatFatalException.cs rename to WebGoat.NET/Exceptions/WebGoatFatalException.cs diff --git a/WebGoatCore/Exceptions/WebGoatModelException.cs b/WebGoat.NET/Exceptions/WebGoatModelException.cs similarity index 100% rename from WebGoatCore/Exceptions/WebGoatModelException.cs rename to WebGoat.NET/Exceptions/WebGoatModelException.cs diff --git a/WebGoatCore/Exceptions/WebGoatStartupException.cs b/WebGoat.NET/Exceptions/WebGoatStartupException.cs similarity index 100% rename from WebGoatCore/Exceptions/WebGoatStartupException.cs rename to WebGoat.NET/Exceptions/WebGoatStartupException.cs diff --git a/WebGoatCore/Models/BlogEntry.cs b/WebGoat.NET/Models/BlogEntry.cs similarity index 100% rename from WebGoatCore/Models/BlogEntry.cs rename to WebGoat.NET/Models/BlogEntry.cs diff --git a/WebGoatCore/Models/BlogResponse.cs b/WebGoat.NET/Models/BlogResponse.cs similarity index 100% rename from WebGoatCore/Models/BlogResponse.cs rename to WebGoat.NET/Models/BlogResponse.cs diff --git a/WebGoatCore/Models/Cart.cs b/WebGoat.NET/Models/Cart.cs similarity index 100% rename from WebGoatCore/Models/Cart.cs rename to WebGoat.NET/Models/Cart.cs diff --git a/WebGoatCore/Models/Category.cs b/WebGoat.NET/Models/Category.cs similarity index 100% rename from WebGoatCore/Models/Category.cs rename to WebGoat.NET/Models/Category.cs diff --git a/WebGoatCore/Models/CreditCard.cs b/WebGoat.NET/Models/CreditCard.cs similarity index 100% rename from WebGoatCore/Models/CreditCard.cs rename to WebGoat.NET/Models/CreditCard.cs diff --git a/WebGoatCore/Models/Customer.cs b/WebGoat.NET/Models/Customer.cs similarity index 100% rename from WebGoatCore/Models/Customer.cs rename to WebGoat.NET/Models/Customer.cs diff --git a/WebGoatCore/Models/Order.cs b/WebGoat.NET/Models/Order.cs similarity index 100% rename from WebGoatCore/Models/Order.cs rename to WebGoat.NET/Models/Order.cs diff --git a/WebGoatCore/Models/OrderDetail.cs b/WebGoat.NET/Models/OrderDetail.cs similarity index 100% rename from WebGoatCore/Models/OrderDetail.cs rename to WebGoat.NET/Models/OrderDetail.cs diff --git a/WebGoatCore/Models/OrderPayment.cs b/WebGoat.NET/Models/OrderPayment.cs similarity index 100% rename from WebGoatCore/Models/OrderPayment.cs rename to WebGoat.NET/Models/OrderPayment.cs diff --git a/WebGoatCore/Models/Product.cs b/WebGoat.NET/Models/Product.cs similarity index 100% rename from WebGoatCore/Models/Product.cs rename to WebGoat.NET/Models/Product.cs diff --git a/WebGoatCore/Models/Shipment.cs b/WebGoat.NET/Models/Shipment.cs similarity index 100% rename from WebGoatCore/Models/Shipment.cs rename to WebGoat.NET/Models/Shipment.cs diff --git a/WebGoatCore/Models/Shipper.cs b/WebGoat.NET/Models/Shipper.cs similarity index 100% rename from WebGoatCore/Models/Shipper.cs rename to WebGoat.NET/Models/Shipper.cs diff --git a/WebGoatCore/Models/Supplier.cs b/WebGoat.NET/Models/Supplier.cs similarity index 100% rename from WebGoatCore/Models/Supplier.cs rename to WebGoat.NET/Models/Supplier.cs diff --git a/WebGoatCore/NORTHWND.sqlite b/WebGoat.NET/NORTHWND.sqlite similarity index 100% rename from WebGoatCore/NORTHWND.sqlite rename to WebGoat.NET/NORTHWND.sqlite diff --git a/WebGoatCore/Program.cs b/WebGoat.NET/Program.cs similarity index 100% rename from WebGoatCore/Program.cs rename to WebGoat.NET/Program.cs diff --git a/WebGoatCore/Properties/launchSettings.json b/WebGoat.NET/Properties/launchSettings.json similarity index 100% rename from WebGoatCore/Properties/launchSettings.json rename to WebGoat.NET/Properties/launchSettings.json diff --git a/WebGoatCore/Startup.cs b/WebGoat.NET/Startup.cs similarity index 94% rename from WebGoatCore/Startup.cs rename to WebGoat.NET/Startup.cs index d0254d4..72e425d 100644 --- a/WebGoatCore/Startup.cs +++ b/WebGoat.NET/Startup.cs @@ -44,11 +44,11 @@ private static string GetExecDirectory() { string? entryDir = null; string? entryLocation = Assembly.GetEntryAssembly()?.Location; - if(!string.IsNullOrEmpty(entryLocation)) + if (!string.IsNullOrEmpty(entryLocation)) { entryDir = Path.GetDirectoryName(entryLocation); } - if(!string.IsNullOrEmpty(entryDir)) + if (!string.IsNullOrEmpty(entryDir)) { return entryDir; } @@ -153,5 +153,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) pattern: "{controller=Home}/{action=Index}"); }); } + + public int startupNotUsed(int a, int b) // Function added to generate same FA Violation + { + var c = 1; + b = 0; + return a / b; + } } } diff --git a/WebGoatCore/Utils/EmailSender.cs b/WebGoat.NET/Utils/EmailSender.cs similarity index 100% rename from WebGoatCore/Utils/EmailSender.cs rename to WebGoat.NET/Utils/EmailSender.cs diff --git a/WebGoatCore/Utils/LinqExtensions.cs b/WebGoat.NET/Utils/LinqExtensions.cs similarity index 100% rename from WebGoatCore/Utils/LinqExtensions.cs rename to WebGoat.NET/Utils/LinqExtensions.cs diff --git a/WebGoatCore/Utils/SessionExtensions.cs b/WebGoat.NET/Utils/SessionExtensions.cs similarity index 100% rename from WebGoatCore/Utils/SessionExtensions.cs rename to WebGoat.NET/Utils/SessionExtensions.cs diff --git a/WebGoatCore/ViewModels/AddUserTempViewModel.cs b/WebGoat.NET/ViewModels/AddUserTempViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/AddUserTempViewModel.cs rename to WebGoat.NET/ViewModels/AddUserTempViewModel.cs diff --git a/WebGoatCore/ViewModels/ChangeAccountInfoViewModel.cs b/WebGoat.NET/ViewModels/ChangeAccountInfoViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/ChangeAccountInfoViewModel.cs rename to WebGoat.NET/ViewModels/ChangeAccountInfoViewModel.cs diff --git a/WebGoatCore/ViewModels/ChangePasswordViewModel.cs b/WebGoat.NET/ViewModels/ChangePasswordViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/ChangePasswordViewModel.cs rename to WebGoat.NET/ViewModels/ChangePasswordViewModel.cs diff --git a/WebGoatCore/ViewModels/CheckoutViewModel.cs b/WebGoat.NET/ViewModels/CheckoutViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/CheckoutViewModel.cs rename to WebGoat.NET/ViewModels/CheckoutViewModel.cs diff --git a/WebGoatCore/ViewModels/ErrorViewModel.cs b/WebGoat.NET/ViewModels/ErrorViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/ErrorViewModel.cs rename to WebGoat.NET/ViewModels/ErrorViewModel.cs diff --git a/WebGoatCore/ViewModels/HomeViewModel.cs b/WebGoat.NET/ViewModels/HomeViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/HomeViewModel.cs rename to WebGoat.NET/ViewModels/HomeViewModel.cs diff --git a/WebGoatCore/ViewModels/LoginViewModel.cs b/WebGoat.NET/ViewModels/LoginViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/LoginViewModel.cs rename to WebGoat.NET/ViewModels/LoginViewModel.cs diff --git a/WebGoatCore/ViewModels/PackageTrackingViewModel.cs b/WebGoat.NET/ViewModels/PackageTrackingViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/PackageTrackingViewModel.cs rename to WebGoat.NET/ViewModels/PackageTrackingViewModel.cs diff --git a/WebGoatCore/ViewModels/ProductAddOrEditViewModel.cs b/WebGoat.NET/ViewModels/ProductAddOrEditViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/ProductAddOrEditViewModel.cs rename to WebGoat.NET/ViewModels/ProductAddOrEditViewModel.cs diff --git a/WebGoatCore/ViewModels/ProductDetailsViewModel.cs b/WebGoat.NET/ViewModels/ProductDetailsViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/ProductDetailsViewModel.cs rename to WebGoat.NET/ViewModels/ProductDetailsViewModel.cs diff --git a/WebGoatCore/ViewModels/ProductListViewModel.cs b/WebGoat.NET/ViewModels/ProductListViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/ProductListViewModel.cs rename to WebGoat.NET/ViewModels/ProductListViewModel.cs diff --git a/WebGoatCore/ViewModels/RegisterViewModel.cs b/WebGoat.NET/ViewModels/RegisterViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/RegisterViewModel.cs rename to WebGoat.NET/ViewModels/RegisterViewModel.cs diff --git a/WebGoatCore/ViewModels/StatusCodeViewModel.cs b/WebGoat.NET/ViewModels/StatusCodeViewModel.cs similarity index 100% rename from WebGoatCore/ViewModels/StatusCodeViewModel.cs rename to WebGoat.NET/ViewModels/StatusCodeViewModel.cs diff --git a/WebGoatCore/Views/Account/AddUserTemp.cshtml b/WebGoat.NET/Views/Account/AddUserTemp.cshtml similarity index 100% rename from WebGoatCore/Views/Account/AddUserTemp.cshtml rename to WebGoat.NET/Views/Account/AddUserTemp.cshtml diff --git a/WebGoatCore/Views/Account/ChangeAccountInfo.cshtml b/WebGoat.NET/Views/Account/ChangeAccountInfo.cshtml similarity index 100% rename from WebGoatCore/Views/Account/ChangeAccountInfo.cshtml rename to WebGoat.NET/Views/Account/ChangeAccountInfo.cshtml diff --git a/WebGoatCore/Views/Account/ChangePassword.cshtml b/WebGoat.NET/Views/Account/ChangePassword.cshtml similarity index 100% rename from WebGoatCore/Views/Account/ChangePassword.cshtml rename to WebGoat.NET/Views/Account/ChangePassword.cshtml diff --git a/WebGoatCore/Views/Account/ChangePasswordSuccess.cshtml b/WebGoat.NET/Views/Account/ChangePasswordSuccess.cshtml similarity index 100% rename from WebGoatCore/Views/Account/ChangePasswordSuccess.cshtml rename to WebGoat.NET/Views/Account/ChangePasswordSuccess.cshtml diff --git a/WebGoatCore/Views/Account/Login.cshtml b/WebGoat.NET/Views/Account/Login.cshtml similarity index 100% rename from WebGoatCore/Views/Account/Login.cshtml rename to WebGoat.NET/Views/Account/Login.cshtml diff --git a/WebGoatCore/Views/Account/MyAccount.cshtml b/WebGoat.NET/Views/Account/MyAccount.cshtml similarity index 100% rename from WebGoatCore/Views/Account/MyAccount.cshtml rename to WebGoat.NET/Views/Account/MyAccount.cshtml diff --git a/WebGoatCore/Views/Account/Register.cshtml b/WebGoat.NET/Views/Account/Register.cshtml similarity index 100% rename from WebGoatCore/Views/Account/Register.cshtml rename to WebGoat.NET/Views/Account/Register.cshtml diff --git a/WebGoatCore/Views/Account/ViewAccountInfo.cshtml b/WebGoat.NET/Views/Account/ViewAccountInfo.cshtml similarity index 100% rename from WebGoatCore/Views/Account/ViewAccountInfo.cshtml rename to WebGoat.NET/Views/Account/ViewAccountInfo.cshtml diff --git a/WebGoatCore/Views/Blog/Create.cshtml b/WebGoat.NET/Views/Blog/Create.cshtml similarity index 100% rename from WebGoatCore/Views/Blog/Create.cshtml rename to WebGoat.NET/Views/Blog/Create.cshtml diff --git a/WebGoatCore/Views/Blog/Index.cshtml b/WebGoat.NET/Views/Blog/Index.cshtml similarity index 100% rename from WebGoatCore/Views/Blog/Index.cshtml rename to WebGoat.NET/Views/Blog/Index.cshtml diff --git a/WebGoatCore/Views/Blog/Reply.cshtml b/WebGoat.NET/Views/Blog/Reply.cshtml similarity index 100% rename from WebGoatCore/Views/Blog/Reply.cshtml rename to WebGoat.NET/Views/Blog/Reply.cshtml diff --git a/WebGoatCore/Views/Blog/_BlogEntryPartial.cshtml b/WebGoat.NET/Views/Blog/_BlogEntryPartial.cshtml similarity index 100% rename from WebGoatCore/Views/Blog/_BlogEntryPartial.cshtml rename to WebGoat.NET/Views/Blog/_BlogEntryPartial.cshtml diff --git a/WebGoatCore/Views/Cart/Index.cshtml b/WebGoat.NET/Views/Cart/Index.cshtml similarity index 100% rename from WebGoatCore/Views/Cart/Index.cshtml rename to WebGoat.NET/Views/Cart/Index.cshtml diff --git a/WebGoatCore/Views/Cart/RemoveOrderError.cshtml b/WebGoat.NET/Views/Cart/RemoveOrderError.cshtml similarity index 100% rename from WebGoatCore/Views/Cart/RemoveOrderError.cshtml rename to WebGoat.NET/Views/Cart/RemoveOrderError.cshtml diff --git a/WebGoatCore/Views/Checkout/Checkout.cshtml b/WebGoat.NET/Views/Checkout/Checkout.cshtml similarity index 100% rename from WebGoatCore/Views/Checkout/Checkout.cshtml rename to WebGoat.NET/Views/Checkout/Checkout.cshtml diff --git a/WebGoatCore/Views/Checkout/PackageTracking.cshtml b/WebGoat.NET/Views/Checkout/PackageTracking.cshtml similarity index 100% rename from WebGoatCore/Views/Checkout/PackageTracking.cshtml rename to WebGoat.NET/Views/Checkout/PackageTracking.cshtml diff --git a/WebGoatCore/Views/Checkout/Receipt.cshtml b/WebGoat.NET/Views/Checkout/Receipt.cshtml similarity index 100% rename from WebGoatCore/Views/Checkout/Receipt.cshtml rename to WebGoat.NET/Views/Checkout/Receipt.cshtml diff --git a/WebGoatCore/Views/Checkout/Receipts.cshtml b/WebGoat.NET/Views/Checkout/Receipts.cshtml similarity index 100% rename from WebGoatCore/Views/Checkout/Receipts.cshtml rename to WebGoat.NET/Views/Checkout/Receipts.cshtml diff --git a/WebGoatCore/Views/Home/About.cshtml b/WebGoat.NET/Views/Home/About.cshtml similarity index 100% rename from WebGoatCore/Views/Home/About.cshtml rename to WebGoat.NET/Views/Home/About.cshtml diff --git a/WebGoatCore/Views/Home/Admin.cshtml b/WebGoat.NET/Views/Home/Admin.cshtml similarity index 100% rename from WebGoatCore/Views/Home/Admin.cshtml rename to WebGoat.NET/Views/Home/Admin.cshtml diff --git a/WebGoatCore/Views/Home/Index.cshtml b/WebGoat.NET/Views/Home/Index.cshtml similarity index 100% rename from WebGoatCore/Views/Home/Index.cshtml rename to WebGoat.NET/Views/Home/Index.cshtml diff --git a/WebGoatCore/Views/Product/AddOrEdit.cshtml b/WebGoat.NET/Views/Product/AddOrEdit.cshtml similarity index 77% rename from WebGoatCore/Views/Product/AddOrEdit.cshtml rename to WebGoat.NET/Views/Product/AddOrEdit.cshtml index 37ffb30..301914a 100644 --- a/WebGoatCore/Views/Product/AddOrEdit.cshtml +++ b/WebGoat.NET/Views/Product/AddOrEdit.cshtml @@ -16,26 +16,19 @@ Product information @if (!Model.AddsNew) { - #pragma warning disable CS8602 // False positive, cannot happen in template usage Html.HiddenFor(m => m.Product.ProductId); Html.HiddenFor(m => m.Product.SupplierId); - #pragma warning restore CS8602

- @{ #pragma warning disable CS8602 } @Html.LabelFor(m => m.Product.ProductId) - @{ #pragma warning restore CS8602 } @Model.Product?.ProductId

}

- @{ #pragma warning disable CS8602 } @Html.LabelFor(m => m.Product.ProductName) @Html.TextBoxFor(m => m.Product.ProductName, new { @value = Model.Product?.ProductName }) @Html.ValidationMessageFor(m => m.Product.ProductName) - @{ #pragma warning restore CS8602 }

- @{ #pragma warning disable CS8602 } @Html.LabelFor(m => m.Product.Category) - @{ #pragma warning restore CS8602 }

- @{ #pragma warning disable CS8602 }

@Html.LabelFor(m => m.Product.QuantityPerUnit) @Html.TextBoxFor(m => m.Product.QuantityPerUnit, new { @value = Model.Product?.QuantityPerUnit }) @@ -75,11 +66,9 @@ @Html.TextBoxFor(m => m.Product.ReorderLevel, new { @value = Model.Product?.ReorderLevel }) @Html.ValidationMessageFor(m => m.Product.ReorderLevel)

- @{ #pragma warning restore CS8602 } @if (Model.AddsNew) {

- @{ #pragma warning disable CS8602 } @Html.LabelFor(m => m.Product.Supplier) @if(Model.Suppliers != null) { @@ -93,18 +82,15 @@ } @Html.ValidationMessageFor(m => m.Product.Supplier) - @{ #pragma warning restore CS8602 }

}

- @{ #pragma warning disable CS8602 } @Html.CheckBoxFor(m => m.Product.Discontinued, new { @checked = Model.Product?.Discontinued ?? false }) @Html.LabelFor(m => m.Product.Discontinued) - @{ #pragma warning restore CS8602 }

} - \ No newline at end of file + diff --git a/WebGoatCore/Views/Product/Details.cshtml b/WebGoat.NET/Views/Product/Details.cshtml similarity index 100% rename from WebGoatCore/Views/Product/Details.cshtml rename to WebGoat.NET/Views/Product/Details.cshtml diff --git a/WebGoatCore/Views/Product/Manage.cshtml b/WebGoat.NET/Views/Product/Manage.cshtml similarity index 100% rename from WebGoatCore/Views/Product/Manage.cshtml rename to WebGoat.NET/Views/Product/Manage.cshtml diff --git a/WebGoatCore/Views/Product/Search.cshtml b/WebGoat.NET/Views/Product/Search.cshtml similarity index 100% rename from WebGoatCore/Views/Product/Search.cshtml rename to WebGoat.NET/Views/Product/Search.cshtml diff --git a/WebGoatCore/Views/Shared/Error.cshtml b/WebGoat.NET/Views/Shared/Error.cshtml similarity index 100% rename from WebGoatCore/Views/Shared/Error.cshtml rename to WebGoat.NET/Views/Shared/Error.cshtml diff --git a/WebGoatCore/Views/Shared/_CartPartial.cshtml b/WebGoat.NET/Views/Shared/_CartPartial.cshtml similarity index 100% rename from WebGoatCore/Views/Shared/_CartPartial.cshtml rename to WebGoat.NET/Views/Shared/_CartPartial.cshtml diff --git a/WebGoatCore/Views/Shared/_CookieConsentPartial.cshtml b/WebGoat.NET/Views/Shared/_CookieConsentPartial.cshtml similarity index 100% rename from WebGoatCore/Views/Shared/_CookieConsentPartial.cshtml rename to WebGoat.NET/Views/Shared/_CookieConsentPartial.cshtml diff --git a/WebGoatCore/Views/Shared/_Layout.cshtml b/WebGoat.NET/Views/Shared/_Layout.cshtml similarity index 100% rename from WebGoatCore/Views/Shared/_Layout.cshtml rename to WebGoat.NET/Views/Shared/_Layout.cshtml diff --git a/WebGoatCore/Views/Shared/_LoginPartial.cshtml b/WebGoat.NET/Views/Shared/_LoginPartial.cshtml similarity index 100% rename from WebGoatCore/Views/Shared/_LoginPartial.cshtml rename to WebGoat.NET/Views/Shared/_LoginPartial.cshtml diff --git a/WebGoatCore/Views/Shared/_ValidationScriptsPartial.cshtml b/WebGoat.NET/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from WebGoatCore/Views/Shared/_ValidationScriptsPartial.cshtml rename to WebGoat.NET/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/WebGoatCore/Views/StatusCode/StatusCodeView.cshtml b/WebGoat.NET/Views/StatusCode/StatusCodeView.cshtml similarity index 100% rename from WebGoatCore/Views/StatusCode/StatusCodeView.cshtml rename to WebGoat.NET/Views/StatusCode/StatusCodeView.cshtml diff --git a/WebGoatCore/Views/_ViewImports.cshtml b/WebGoat.NET/Views/_ViewImports.cshtml similarity index 100% rename from WebGoatCore/Views/_ViewImports.cshtml rename to WebGoat.NET/Views/_ViewImports.cshtml diff --git a/WebGoatCore/Views/_ViewStart.cshtml b/WebGoat.NET/Views/_ViewStart.cshtml similarity index 100% rename from WebGoatCore/Views/_ViewStart.cshtml rename to WebGoat.NET/Views/_ViewStart.cshtml diff --git a/WebGoatCore/WebGoatCore.csproj b/WebGoat.NET/WebGoat.NET.csproj similarity index 89% rename from WebGoatCore/WebGoatCore.csproj rename to WebGoat.NET/WebGoat.NET.csproj index 32928c8..5309281 100644 --- a/WebGoatCore/WebGoatCore.csproj +++ b/WebGoat.NET/WebGoat.NET.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 enable 669676e4-410e-47bc-a260-8c851a25b590 @@ -13,20 +13,13 @@ - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + + + + diff --git a/WebGoatCore/appsettings.Development.json b/WebGoat.NET/appsettings.Development.json similarity index 100% rename from WebGoatCore/appsettings.Development.json rename to WebGoat.NET/appsettings.Development.json diff --git a/WebGoatCore/appsettings.json b/WebGoat.NET/appsettings.json similarity index 100% rename from WebGoatCore/appsettings.json rename to WebGoat.NET/appsettings.json diff --git a/WebGoatCore/wwwroot/Images/ProductImages/1.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/1.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/1.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/1.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/10.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/10.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/10.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/10.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/11.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/11.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/11.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/11.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/12.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/12.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/12.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/12.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/13.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/13.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/13.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/13.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/14.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/14.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/14.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/14.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/15.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/15.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/15.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/15.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/16.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/16.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/16.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/16.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/17.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/17.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/17.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/17.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/18.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/18.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/18.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/18.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/19.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/19.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/19.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/19.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/2.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/2.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/2.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/2.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/20.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/20.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/20.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/20.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/21.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/21.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/21.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/21.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/22.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/22.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/22.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/22.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/23.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/23.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/23.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/23.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/24.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/24.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/24.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/24.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/25.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/25.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/25.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/25.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/26.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/26.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/26.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/26.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/27.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/27.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/27.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/27.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/28.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/28.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/28.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/28.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/29.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/29.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/29.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/29.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/3.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/3.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/3.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/3.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/30.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/30.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/30.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/30.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/31.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/31.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/31.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/31.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/32.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/32.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/32.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/32.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/33.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/33.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/33.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/33.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/34.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/34.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/34.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/34.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/35.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/35.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/35.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/35.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/36.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/36.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/36.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/36.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/37.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/37.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/37.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/37.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/38.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/38.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/38.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/38.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/39.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/39.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/39.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/39.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/4.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/4.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/4.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/4.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/40.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/40.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/40.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/40.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/41.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/41.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/41.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/41.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/42.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/42.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/42.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/42.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/43.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/43.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/43.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/43.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/44.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/44.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/44.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/44.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/45.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/45.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/45.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/45.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/46.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/46.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/46.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/46.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/47.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/47.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/47.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/47.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/48.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/48.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/48.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/48.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/49.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/49.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/49.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/49.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/5.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/5.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/5.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/5.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/50.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/50.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/50.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/50.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/51.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/51.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/51.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/51.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/52.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/52.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/52.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/52.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/53.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/53.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/53.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/53.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/54.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/54.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/54.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/54.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/55.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/55.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/55.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/55.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/56.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/56.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/56.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/56.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/57.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/57.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/57.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/57.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/58.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/58.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/58.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/58.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/59.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/59.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/59.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/59.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/6.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/6.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/6.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/6.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/60.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/60.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/60.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/60.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/61.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/61.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/61.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/61.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/62.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/62.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/62.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/62.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/63.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/63.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/63.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/63.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/64.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/64.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/64.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/64.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/65.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/65.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/65.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/65.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/66.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/66.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/66.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/66.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/67.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/67.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/67.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/67.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/68.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/68.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/68.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/68.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/69.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/69.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/69.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/69.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/7.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/7.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/7.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/7.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/70.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/70.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/70.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/70.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/71.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/71.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/71.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/71.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/72.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/72.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/72.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/72.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/73.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/73.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/73.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/73.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/74.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/74.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/74.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/74.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/75.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/75.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/75.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/75.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/76.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/76.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/76.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/76.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/77.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/77.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/77.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/77.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/78.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/78.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/78.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/78.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/79.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/79.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/79.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/79.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/8.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/8.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/8.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/8.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/80.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/80.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/80.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/80.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/9.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/9.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/9.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/9.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/Breadsticks.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/Breadsticks.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/Breadsticks.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/Breadsticks.jpg diff --git a/WebGoatCore/wwwroot/Images/ProductImages/NoImage.jpg b/WebGoat.NET/wwwroot/Images/ProductImages/NoImage.jpg similarity index 100% rename from WebGoatCore/wwwroot/Images/ProductImages/NoImage.jpg rename to WebGoat.NET/wwwroot/Images/ProductImages/NoImage.jpg diff --git a/WebGoatCore/wwwroot/Images/goat.png b/WebGoat.NET/wwwroot/Images/goat.png similarity index 100% rename from WebGoatCore/wwwroot/Images/goat.png rename to WebGoat.NET/wwwroot/Images/goat.png diff --git a/WebGoatCore/wwwroot/Images/goatLogo.png b/WebGoat.NET/wwwroot/Images/goatLogo.png similarity index 100% rename from WebGoatCore/wwwroot/Images/goatLogo.png rename to WebGoat.NET/wwwroot/Images/goatLogo.png diff --git a/WebGoatCore/wwwroot/StoredCreditCards.xml b/WebGoat.NET/wwwroot/StoredCreditCards.xml similarity index 100% rename from WebGoatCore/wwwroot/StoredCreditCards.xml rename to WebGoat.NET/wwwroot/StoredCreditCards.xml diff --git a/WebGoatCore/wwwroot/Users.txt b/WebGoat.NET/wwwroot/Users.txt similarity index 100% rename from WebGoatCore/wwwroot/Users.txt rename to WebGoat.NET/wwwroot/Users.txt diff --git a/WebGoatCore/wwwroot/css/site.css b/WebGoat.NET/wwwroot/css/site.css similarity index 100% rename from WebGoatCore/wwwroot/css/site.css rename to WebGoat.NET/wwwroot/css/site.css diff --git a/WebGoatCore/wwwroot/favicon.ico b/WebGoat.NET/wwwroot/favicon.ico similarity index 100% rename from WebGoatCore/wwwroot/favicon.ico rename to WebGoat.NET/wwwroot/favicon.ico diff --git a/WebGoatCore/wwwroot/js/site.js b/WebGoat.NET/wwwroot/js/site.js similarity index 100% rename from WebGoatCore/wwwroot/js/site.js rename to WebGoat.NET/wwwroot/js/site.js diff --git a/WebGoatCore/wwwroot/lib/bootstrap/LICENSE b/WebGoat.NET/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/LICENSE rename to WebGoat.NET/wwwroot/lib/bootstrap/LICENSE diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map similarity index 100% rename from WebGoatCore/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map rename to WebGoat.NET/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map diff --git a/WebGoatCore/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/WebGoat.NET/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt rename to WebGoat.NET/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt diff --git a/WebGoatCore/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/WebGoat.NET/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to WebGoat.NET/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/WebGoatCore/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/WebGoat.NET/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to WebGoat.NET/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/WebGoatCore/wwwroot/lib/jquery-validation/LICENSE.md b/WebGoat.NET/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery-validation/LICENSE.md rename to WebGoat.NET/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/WebGoatCore/wwwroot/lib/jquery-validation/dist/additional-methods.js b/WebGoat.NET/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to WebGoat.NET/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/WebGoatCore/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/WebGoat.NET/wwwroot/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery-validation/dist/additional-methods.min.js rename to WebGoat.NET/wwwroot/lib/jquery-validation/dist/additional-methods.min.js diff --git a/WebGoatCore/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/WebGoat.NET/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to WebGoat.NET/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/WebGoatCore/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/WebGoat.NET/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js rename to WebGoat.NET/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js diff --git a/WebGoatCore/wwwroot/lib/jquery/LICENSE.txt b/WebGoat.NET/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery/LICENSE.txt rename to WebGoat.NET/wwwroot/lib/jquery/LICENSE.txt diff --git a/WebGoatCore/wwwroot/lib/jquery/dist/jquery.js b/WebGoat.NET/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery/dist/jquery.js rename to WebGoat.NET/wwwroot/lib/jquery/dist/jquery.js diff --git a/WebGoatCore/wwwroot/lib/jquery/dist/jquery.min.js b/WebGoat.NET/wwwroot/lib/jquery/dist/jquery.min.js similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery/dist/jquery.min.js rename to WebGoat.NET/wwwroot/lib/jquery/dist/jquery.min.js diff --git a/WebGoatCore/wwwroot/lib/jquery/dist/jquery.min.map b/WebGoat.NET/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from WebGoatCore/wwwroot/lib/jquery/dist/jquery.min.map rename to WebGoat.NET/wwwroot/lib/jquery/dist/jquery.min.map