From acf0b8f3127f9a7a24167387dcb90c2814a70f49 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Fri, 6 Jan 2017 14:55:48 +0100 Subject: [PATCH] removes warnings --- Yavsc/ApiControllers/DjProfileApiController.cs | 6 +++--- Yavsc/ApiControllers/ProfileApiController.cs | 7 ++----- Yavsc/Controllers/InstrumentsController.cs | 6 ++---- Yavsc/Controllers/LocationTypesController.cs | 6 ++---- Yavsc/Controllers/MusicalTendenciesController.cs | 6 ++---- Yavsc/Helpers/TeXHelpers.cs | 3 +-- Yavsc/Hubs/ChatHub.cs | 2 -- .../20161231163016_musicalPreferences.Designer.cs | 1 - Yavsc/Migrations/20161231163016_musicalPreferences.cs | 2 -- .../20170102140332_musicalTendencies.Designer.cs | 1 - Yavsc/Migrations/20170102140332_musicalTendencies.cs | 3 +-- .../Migrations/20170102152745_locationTypes.Designer.cs | 1 - Yavsc/Migrations/20170102152745_locationTypes.cs | 3 +-- ...0170106092028_WFActivityParentAndProfiles.Designer.cs | 1 - .../20170106092028_WFActivityParentAndProfiles.cs | 3 +-- Yavsc/Migrations/20170106113614_ownerProfile.Designer.cs | 1 - Yavsc/Migrations/20170106113614_ownerProfile.cs | 3 +-- Yavsc/Migrations/20170106122307_Instruments.Designer.cs | 1 - Yavsc/Migrations/20170106122307_Instruments.cs | 3 +-- .../20170106124548_instrumentation.Designer.cs | 1 - Yavsc/Migrations/20170106124548_instrumentation.cs | 3 +-- Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs | 2 -- Yavsc/Models/Access/BlackList.cs | 1 - Yavsc/Models/ApplicationDbContext.cs | 9 ++++----- Yavsc/Models/Booking/MusicalPreference.cs | 2 +- Yavsc/Models/Booking/MusicalTendency.cs | 2 +- Yavsc/Models/Chat/Connection.cs | 3 +-- Yavsc/Startup/Startup.WebSockets.cs | 4 ---- YavscLib/IChatUserInfo.cs | 2 -- 29 files changed, 25 insertions(+), 63 deletions(-) diff --git a/Yavsc/ApiControllers/DjProfileApiController.cs b/Yavsc/ApiControllers/DjProfileApiController.cs index 3a252d34..5480c844 100644 --- a/Yavsc/ApiControllers/DjProfileApiController.cs +++ b/Yavsc/ApiControllers/DjProfileApiController.cs @@ -1,9 +1,9 @@ -using Yavsc.Models; -using Yavsc.Models.Booking; -using Yavsc.Models.Workflow; namespace Yavsc.ApiControllers { + using Models; + using Models.Booking; + public class DjProfileApiController : ProfileApiController { public DjProfileApiController(ApplicationDbContext context) : base(context) diff --git a/Yavsc/ApiControllers/ProfileApiController.cs b/Yavsc/ApiControllers/ProfileApiController.cs index ce09e44c..5309454c 100644 --- a/Yavsc/ApiControllers/ProfileApiController.cs +++ b/Yavsc/ApiControllers/ProfileApiController.cs @@ -1,11 +1,9 @@ -using System.Linq; -using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Mvc; -using Yavsc.Models; -using Yavsc.Models.Workflow; namespace Yavsc.ApiControllers { + using Models; + using Models.Workflow; [Produces("application/json"),Route("api/profile")] public abstract class ProfileApiController : Controller where T : PerformerProfile { @@ -15,6 +13,5 @@ namespace Yavsc.ApiControllers dbContext = context; } - } } \ No newline at end of file diff --git a/Yavsc/Controllers/InstrumentsController.cs b/Yavsc/Controllers/InstrumentsController.cs index eae9f98a..b63ce9d9 100644 --- a/Yavsc/Controllers/InstrumentsController.cs +++ b/Yavsc/Controllers/InstrumentsController.cs @@ -1,12 +1,10 @@ using System.Linq; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Rendering; -using Microsoft.Data.Entity; -using Yavsc.Models; -using Yavsc.Models.Booking; namespace Yavsc.Controllers { + using Models; + using Models.Booking; public class InstrumentsController : Controller { private ApplicationDbContext _context; diff --git a/Yavsc/Controllers/LocationTypesController.cs b/Yavsc/Controllers/LocationTypesController.cs index e2479286..d7890aaa 100644 --- a/Yavsc/Controllers/LocationTypesController.cs +++ b/Yavsc/Controllers/LocationTypesController.cs @@ -1,12 +1,10 @@ using System.Linq; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Rendering; -using Microsoft.Data.Entity; -using Yavsc.Models; -using Yavsc.Models.Relationship; namespace Yavsc.Controllers { + using Models; + using Models.Relationship; public class LocationTypesController : Controller { private ApplicationDbContext _context; diff --git a/Yavsc/Controllers/MusicalTendenciesController.cs b/Yavsc/Controllers/MusicalTendenciesController.cs index 1731a7f9..61d7c5e4 100644 --- a/Yavsc/Controllers/MusicalTendenciesController.cs +++ b/Yavsc/Controllers/MusicalTendenciesController.cs @@ -1,12 +1,10 @@ using System.Linq; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Rendering; -using Microsoft.Data.Entity; -using Yavsc.Models; -using Yavsc.Models.Booking; namespace Yavsc.Controllers { + using Models; + using Models.Booking; public class MusicalTendenciesController : Controller { private ApplicationDbContext _context; diff --git a/Yavsc/Helpers/TeXHelpers.cs b/Yavsc/Helpers/TeXHelpers.cs index d0404486..39ddf3c7 100644 --- a/Yavsc/Helpers/TeXHelpers.cs +++ b/Yavsc/Helpers/TeXHelpers.cs @@ -2,15 +2,14 @@ using System; using System.Diagnostics; using System.IO; using System.Linq; -using System.Text; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewEngines; -using Yavsc.ViewModels.Gen; namespace Yavsc.Helpers { + using ViewModels.Gen; public class TeXString : HtmlString { diff --git a/Yavsc/Hubs/ChatHub.cs b/Yavsc/Hubs/ChatHub.cs index 53d24d5e..a5f0522b 100644 --- a/Yavsc/Hubs/ChatHub.cs +++ b/Yavsc/Hubs/ChatHub.cs @@ -19,7 +19,6 @@ // You should have received a copy of the GNU Lesser General Public License // along with this program. If not, see . using Microsoft.AspNet.SignalR; -using Microsoft.Data.Entity; using System.Threading.Tasks; using System.Collections.Generic; using System.Linq; @@ -28,7 +27,6 @@ namespace Yavsc { using Models; using Models.Chat; - using ViewModels.Chat; public class ChatHub : Hub { diff --git a/Yavsc/Migrations/20161231163016_musicalPreferences.Designer.cs b/Yavsc/Migrations/20161231163016_musicalPreferences.Designer.cs index fb458712..f40f5766 100644 --- a/Yavsc/Migrations/20161231163016_musicalPreferences.Designer.cs +++ b/Yavsc/Migrations/20161231163016_musicalPreferences.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20161231163016_musicalPreferences.cs b/Yavsc/Migrations/20161231163016_musicalPreferences.cs index 8ddfb23e..4416e436 100644 --- a/Yavsc/Migrations/20161231163016_musicalPreferences.cs +++ b/Yavsc/Migrations/20161231163016_musicalPreferences.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/20170102140332_musicalTendencies.Designer.cs b/Yavsc/Migrations/20170102140332_musicalTendencies.Designer.cs index 012613c2..cfa15e41 100644 --- a/Yavsc/Migrations/20170102140332_musicalTendencies.Designer.cs +++ b/Yavsc/Migrations/20170102140332_musicalTendencies.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20170102140332_musicalTendencies.cs b/Yavsc/Migrations/20170102140332_musicalTendencies.cs index 75041249..730efea8 100644 --- a/Yavsc/Migrations/20170102140332_musicalTendencies.cs +++ b/Yavsc/Migrations/20170102140332_musicalTendencies.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; + using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/20170102152745_locationTypes.Designer.cs b/Yavsc/Migrations/20170102152745_locationTypes.Designer.cs index d58c41c6..88300f8d 100644 --- a/Yavsc/Migrations/20170102152745_locationTypes.Designer.cs +++ b/Yavsc/Migrations/20170102152745_locationTypes.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20170102152745_locationTypes.cs b/Yavsc/Migrations/20170102152745_locationTypes.cs index b880d0cd..e9b8eecf 100644 --- a/Yavsc/Migrations/20170102152745_locationTypes.cs +++ b/Yavsc/Migrations/20170102152745_locationTypes.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; + using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.Designer.cs b/Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.Designer.cs index f3f24adc..8f96f8a3 100644 --- a/Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.Designer.cs +++ b/Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.cs b/Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.cs index ce5e5d25..dae3c2d2 100644 --- a/Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.cs +++ b/Yavsc/Migrations/20170106092028_WFActivityParentAndProfiles.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; + using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/20170106113614_ownerProfile.Designer.cs b/Yavsc/Migrations/20170106113614_ownerProfile.Designer.cs index 1492613a..40cc8471 100644 --- a/Yavsc/Migrations/20170106113614_ownerProfile.Designer.cs +++ b/Yavsc/Migrations/20170106113614_ownerProfile.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20170106113614_ownerProfile.cs b/Yavsc/Migrations/20170106113614_ownerProfile.cs index 10bc19f0..37504b8c 100644 --- a/Yavsc/Migrations/20170106113614_ownerProfile.cs +++ b/Yavsc/Migrations/20170106113614_ownerProfile.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; + using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/20170106122307_Instruments.Designer.cs b/Yavsc/Migrations/20170106122307_Instruments.Designer.cs index c106e80e..23ab6d93 100644 --- a/Yavsc/Migrations/20170106122307_Instruments.Designer.cs +++ b/Yavsc/Migrations/20170106122307_Instruments.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20170106122307_Instruments.cs b/Yavsc/Migrations/20170106122307_Instruments.cs index 3ee3b039..7d3a1d1f 100644 --- a/Yavsc/Migrations/20170106122307_Instruments.cs +++ b/Yavsc/Migrations/20170106122307_Instruments.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; + using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/20170106124548_instrumentation.Designer.cs b/Yavsc/Migrations/20170106124548_instrumentation.Designer.cs index 30409910..f89c2350 100644 --- a/Yavsc/Migrations/20170106124548_instrumentation.Designer.cs +++ b/Yavsc/Migrations/20170106124548_instrumentation.Designer.cs @@ -1,7 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; using Microsoft.Data.Entity.Migrations; using Yavsc.Models; diff --git a/Yavsc/Migrations/20170106124548_instrumentation.cs b/Yavsc/Migrations/20170106124548_instrumentation.cs index d8e010c1..927ed13f 100644 --- a/Yavsc/Migrations/20170106124548_instrumentation.cs +++ b/Yavsc/Migrations/20170106124548_instrumentation.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; + using Microsoft.Data.Entity.Migrations; namespace Yavsc.Migrations diff --git a/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs b/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs index a0925463..a1acc47e 100644 --- a/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1,8 +1,6 @@ using System; using Microsoft.Data.Entity; using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; -using Microsoft.Data.Entity.Migrations; using Yavsc.Models; namespace Yavsc.Migrations diff --git a/Yavsc/Models/Access/BlackList.cs b/Yavsc/Models/Access/BlackList.cs index 1d3fc354..961e7f23 100644 --- a/Yavsc/Models/Access/BlackList.cs +++ b/Yavsc/Models/Access/BlackList.cs @@ -1,6 +1,5 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using YavscLib; namespace Yavsc.Models.Access { diff --git a/Yavsc/Models/ApplicationDbContext.cs b/Yavsc/Models/ApplicationDbContext.cs index 72b0f516..212a88aa 100644 --- a/Yavsc/Models/ApplicationDbContext.cs +++ b/Yavsc/Models/ApplicationDbContext.cs @@ -5,8 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Authentication.OAuth; using Microsoft.AspNet.Identity.EntityFramework; using Microsoft.Data.Entity; -using Yavsc.Models.Booking; -using Yavsc.Models.Relationship; +using Yavsc.Models.Relationship; namespace Yavsc.Models { @@ -197,11 +196,11 @@ namespace Yavsc.Models public DbSet MusicalPreferences { get; set; } - public DbSet MusicalTendency { get; set; } + public DbSet MusicalTendency { get; set; } - public DbSet LocationType { get; set; } + public DbSet LocationType { get; set; } - public DbSet Instrument { get; set; } + public DbSet Instrument { get; set; } } } diff --git a/Yavsc/Models/Booking/MusicalPreference.cs b/Yavsc/Models/Booking/MusicalPreference.cs index ad2782ef..1b2d23bf 100644 --- a/Yavsc/Models/Booking/MusicalPreference.cs +++ b/Yavsc/Models/Booking/MusicalPreference.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; + using System.ComponentModel.DataAnnotations.Schema; using Yavsc.Models.Workflow; diff --git a/Yavsc/Models/Booking/MusicalTendency.cs b/Yavsc/Models/Booking/MusicalTendency.cs index 0079fa98..3afda65c 100644 --- a/Yavsc/Models/Booking/MusicalTendency.cs +++ b/Yavsc/Models/Booking/MusicalTendency.cs @@ -1,4 +1,4 @@ -using System; + using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/Yavsc/Models/Chat/Connection.cs b/Yavsc/Models/Chat/Connection.cs index b644926d..acdc3433 100644 --- a/Yavsc/Models/Chat/Connection.cs +++ b/Yavsc/Models/Chat/Connection.cs @@ -1,11 +1,10 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Newtonsoft.Json; -using Yavsc.Models; -using YavscLib; namespace Yavsc.Models.Chat { + using YavscLib; public class Connection : IConnection { diff --git a/Yavsc/Startup/Startup.WebSockets.cs b/Yavsc/Startup/Startup.WebSockets.cs index dc3935f6..1ceabba7 100644 --- a/Yavsc/Startup/Startup.WebSockets.cs +++ b/Yavsc/Startup/Startup.WebSockets.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Concurrent; -using System.Net.WebSockets; -using System.Threading; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Hosting; diff --git a/YavscLib/IChatUserInfo.cs b/YavscLib/IChatUserInfo.cs index 56e128a9..0ad66a1c 100644 --- a/YavscLib/IChatUserInfo.cs +++ b/YavscLib/IChatUserInfo.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace YavscLib { public interface IConnection