From 47c964820652095762dc7a65b23cbf165f780503 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Wed, 17 Oct 2018 14:39:15 -0500 Subject: [PATCH] cleanup R# solution-wide warnings --- .../{IWebHostExtension.cs => IWebHostExtensions.cs} | 3 ++- .../Migrations/20180324001253_addChatUrl.Designer.cs | 1 + .../Migrations/20180324001253_addChatUrl.cs | 1 + ...0815174531_fixTimestampNullsAndDefaults.Designer.cs | 1 + .../20180815174531_fixTimestampNullsAndDefaults.cs | 3 +++ .../Migrations/20180909161810_AddDependent.cs | 4 ++-- src/FilterLists.Web/ClientApp/utils/loader.css | 1 + src/FilterLists.Web/webpack.config.js | 2 ++ src/FilterLists.Web/webpack.config.vendor.js | 10 ++++++---- 9 files changed, 19 insertions(+), 7 deletions(-) rename src/FilterLists.Api/DependencyInjection/Extensions/{IWebHostExtension.cs => IWebHostExtensions.cs} (88%) diff --git a/src/FilterLists.Api/DependencyInjection/Extensions/IWebHostExtension.cs b/src/FilterLists.Api/DependencyInjection/Extensions/IWebHostExtensions.cs similarity index 88% rename from src/FilterLists.Api/DependencyInjection/Extensions/IWebHostExtension.cs rename to src/FilterLists.Api/DependencyInjection/Extensions/IWebHostExtensions.cs index fb783bd80..4434bf971 100644 --- a/src/FilterLists.Api/DependencyInjection/Extensions/IWebHostExtension.cs +++ b/src/FilterLists.Api/DependencyInjection/Extensions/IWebHostExtensions.cs @@ -5,7 +5,8 @@ namespace FilterLists.Api.DependencyInjection.Extensions { - public static class IWebHostExtension + // ReSharper disable once InconsistentNaming + public static class IWebHostExtensions { public static IWebHost MigrateAndSeedDbContext(this IWebHost webHost, Action seeder) where TContext : DbContext diff --git a/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.Designer.cs b/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.Designer.cs index edc0e175c..5c430eaaa 100644 --- a/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.Designer.cs +++ b/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.Designer.cs @@ -11,6 +11,7 @@ namespace FilterLists.Api.Migrations { [DbContext(typeof(FilterListsDbContext))] [Migration("20180324001253_addChatUrl")] + // ReSharper disable once InconsistentNaming partial class addChatUrl { protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs b/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs index 5f1eab0df..8b289684c 100644 --- a/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs +++ b/src/FilterLists.Api/Migrations/20180324001253_addChatUrl.cs @@ -4,6 +4,7 @@ namespace FilterLists.Api.Migrations { [UsedImplicitly] + // ReSharper disable once InconsistentNaming public partial class addChatUrl : Migration { protected override void Up(MigrationBuilder migrationBuilder) diff --git a/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs b/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs index 587e8795c..ce7088b45 100644 --- a/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs +++ b/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.Designer.cs @@ -11,6 +11,7 @@ namespace FilterLists.Api.Migrations { [DbContext(typeof(FilterListsDbContext))] [Migration("20180815174531_fixTimestampNullsAndDefaults")] + // ReSharper disable once InconsistentNaming partial class fixTimestampNullsAndDefaults { protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs b/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs index cea310be7..b0997e060 100644 --- a/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs +++ b/src/FilterLists.Api/Migrations/20180815174531_fixTimestampNullsAndDefaults.cs @@ -1,9 +1,12 @@ using System; +using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; namespace FilterLists.Api.Migrations { + [UsedImplicitly] + // ReSharper disable once InconsistentNaming public partial class fixTimestampNullsAndDefaults : Migration { protected override void Up(MigrationBuilder migrationBuilder) diff --git a/src/FilterLists.Api/Migrations/20180909161810_AddDependent.cs b/src/FilterLists.Api/Migrations/20180909161810_AddDependent.cs index c2dfc1f28..b00d03972 100644 --- a/src/FilterLists.Api/Migrations/20180909161810_AddDependent.cs +++ b/src/FilterLists.Api/Migrations/20180909161810_AddDependent.cs @@ -13,8 +13,8 @@ protected override void Up(MigrationBuilder migrationBuilder) { CreatedDateUtc = table.Column("TIMESTAMP", nullable: false, defaultValueSql: "current_timestamp()"), - DependentFilterListId = table.Column(nullable: false), - DependencyFilterListId = table.Column(nullable: false) + DependentFilterListId = table.Column(), + DependencyFilterListId = table.Column() }, constraints: table => { diff --git a/src/FilterLists.Web/ClientApp/utils/loader.css b/src/FilterLists.Web/ClientApp/utils/loader.css index d3d86d1e1..396eb8671 100644 --- a/src/FilterLists.Web/ClientApp/utils/loader.css +++ b/src/FilterLists.Web/ClientApp/utils/loader.css @@ -3,6 +3,7 @@ .loader, .loader:before, .loader:after { + -ms-animation: load1 1s infinite ease-in-out; -webkit-animation: load1 1s infinite ease-in-out; animation: load1 1s infinite ease-in-out; background: #000000; diff --git a/src/FilterLists.Web/webpack.config.js b/src/FilterLists.Web/webpack.config.js index df10c2fc9..42bca01a4 100644 --- a/src/FilterLists.Web/webpack.config.js +++ b/src/FilterLists.Web/webpack.config.js @@ -12,6 +12,7 @@ module.exports = (env) => { entry: { 'main': "./ClientApp/Boot.tsx" }, resolve: { extensions: [".js", ".jsx", ".ts", ".tsx"] }, output: { + // ReSharper disable once UseOfImplicitGlobalInFunctionScope path: path.join(__dirname, bundleOutputDir), filename: "[name].js", publicPath: "dist/" @@ -31,6 +32,7 @@ module.exports = (env) => { plugins: [ new CheckerPlugin(), new webpack.DllReferencePlugin({ + // ReSharper disable once UseOfImplicitGlobalInFunctionScope context: __dirname, manifest: require("./wwwroot/dist/vendor-manifest.json") }) diff --git a/src/FilterLists.Web/webpack.config.vendor.js b/src/FilterLists.Web/webpack.config.vendor.js index 1abee2f1b..217d4bbfb 100644 --- a/src/FilterLists.Web/webpack.config.vendor.js +++ b/src/FilterLists.Web/webpack.config.vendor.js @@ -27,6 +27,7 @@ module.exports = (env) => { ] }, output: { + // ReSharper disable once UseOfImplicitGlobalInFunctionScope path: path.join(__dirname, "wwwroot", "dist"), publicPath: "dist/", filename: "[name].js", @@ -39,6 +40,7 @@ module.exports = (env) => { jQuery: "jquery" }), // Maps these identifiers to the jQuery package (because Bootstrap expects it to be a global variable) new webpack.DllPlugin({ + // ReSharper disable once UseOfImplicitGlobalInFunctionScope path: path.join(__dirname, "wwwroot", "dist", "[name]-manifest.json"), name: "[name]_[hash]" }), @@ -46,10 +48,10 @@ module.exports = (env) => { 'process.env.NODE_ENV': isDevBuild ? '"development"' : '"production"' }) ].concat(isDevBuild - ? [] - : [ - new webpack.optimize.UglifyJsPlugin() - ]) + ? [] + : [ + new webpack.optimize.UglifyJsPlugin() + ]) } ]; }; \ No newline at end of file