Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup of namespaces #949

Merged
merged 5 commits into from
Jan 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Whipstaff.Couchbase/CouchbaseLockProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
using Couchbase.Extensions.Locks;
using Couchbase.KeyValue;
using Foundatio.Lock;
using Whipstaff.Couchbase;

namespace Dhgms.NetContrib.Playground.Features.Couchbase.Foundatio
namespace Whipstaff.Couchbase
{
/// <summary>
/// A Couchbase Lock Distributed Log Provider.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

namespace Whipstaff.EntityFramework
namespace Whipstaff.Entityframework.Relational
{
/// <summary>
/// Entity Framework Model Builder Helpers for SQL Lite.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
using Whipstaff.Core.MediaTypeHeaders;
using Whipstaff.OpenXml.Excel;

namespace Dhgms.AspNetCoreContrib.Example.WebSite.Controllers
namespace Dhgms.AspNetCoreContrib.Example.WebMvcApp.Controllers
{
/// <summary>
/// Sample web controller for an XLSX download.
Expand Down
8 changes: 2 additions & 6 deletions src/Whipstaff.Example.WebMvcApp/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
// This file is licensed to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using Dhgms.AspNetCoreContrib.Examples.WebMvcApp.Models;
using Dhgms.AspNetCoreContrib.Example.WebMvcApp.Models;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;

namespace Dhgms.AspNetCoreContrib.Examples.WebMvcApp.Controllers
namespace Dhgms.AspNetCoreContrib.Example.WebMvcApp.Controllers
{
/// <summary>
/// Sample home controller.
Expand Down
6 changes: 1 addition & 5 deletions src/Whipstaff.Example.WebMvcApp/Controllers/PdfController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
// This file is licensed to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Whipstaff.AspNetCore.Features.Pdf;
using Whipstaff.AspNetCore.FileTransfer;
using Whipstaff.Core.MediaTypeHeaders;

namespace Dhgms.AspNetCoreContrib.Example.WebSite.Controllers
namespace Dhgms.AspNetCoreContrib.Example.WebMvcApp.Controllers
{
/// <summary>
/// Example controller for serving pdf files.
Expand Down
4 changes: 1 addition & 3 deletions src/Whipstaff.Example.WebMvcApp/Models/ErrorViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
// This file is licensed to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using System;

namespace Dhgms.AspNetCoreContrib.Examples.WebMvcApp.Models
namespace Dhgms.AspNetCoreContrib.Example.WebMvcApp.Models
{
/// <summary>
/// View Model for rendering errors.
Expand Down
8 changes: 1 addition & 7 deletions src/Whipstaff.Example.WebMvcApp/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,10 @@
// This file is licensed to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;

namespace Dhgms.AspNetCoreContrib.Examples.WebMvcApp
namespace Dhgms.AspNetCoreContrib.Example.WebMvcApp
{
/// <summary>
/// Represents the core Program start up logic.
Expand Down
2 changes: 1 addition & 1 deletion src/Whipstaff.Example.WebMvcApp/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using Whipstaff.Testing.EntityFramework;
using Whipstaff.Testing.MediatR;

namespace Dhgms.AspNetCoreContrib.Examples.WebMvcApp
namespace Dhgms.AspNetCoreContrib.Example.WebMvcApp
{
/// <summary>
/// Start up logic for the sample Web MVC app.
Expand Down
2 changes: 1 addition & 1 deletion src/Whipstaff.Example.WebMvcApp/Views/Shared/Error.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@model ErrorViewModel
@model Dhgms.AspNetCoreContrib.Example.WebMvcApp.Models.ErrorViewModel
@{
ViewData["Title"] = "Error";
}
Expand Down
4 changes: 1 addition & 3 deletions src/Whipstaff.Example.WebMvcApp/Views/_ViewImports.cshtml
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
@using Dhgms.AspNetCoreContrib.Examples.WebMvcApp
@using Dhgms.AspNetCoreContrib.Examples.WebMvcApp.Models
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
6 changes: 1 addition & 5 deletions src/Whipstaff.IntegrationTests/ApiSiteTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
// This file is licensed to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Text;

namespace Dhgms.AspNetCoreContrib.IntegrationTests
namespace Whipstaff.IntegrationTests
{
/// <summary>
/// Integration Tests for the API site example.
Expand Down
6 changes: 1 addition & 5 deletions src/Whipstaff.IntegrationTests/BaseWebApplicationTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,15 @@
// This file is licensed to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Testing;
using Microsoft.Extensions.Logging;
using Xunit;
using Xunit.Abstractions;

namespace Dhgms.AspNetCoreContrib.IntegrationTests
namespace Whipstaff.IntegrationTests
{
/// <summary>
/// Base class for unit tests for netcore web apps.
Expand Down
6 changes: 1 addition & 5 deletions src/Whipstaff.IntegrationTests/PublicWebsiteTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
// This file is licensed to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;
using System.Text;

namespace Dhgms.AspNetCoreContrib.IntegrationTests
namespace Whipstaff.IntegrationTests
{
/// <summary>
/// Integration Tests for a public website.
Expand Down
4 changes: 2 additions & 2 deletions src/Whipstaff.IntegrationTests/SecuredWebsiteTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
using Dhgms.AspNetCoreContrib.IntegrationTests;
using Dhgms.AspNetCoreContrib.Example.WebMvcApp;
using Xunit;
using Xunit.Abstractions;

Expand All @@ -16,7 +16,7 @@ namespace Whipstaff.IntegrationTests
/// Unit Tests for a secured website.
/// </summary>
[ExcludeFromCodeCoverage]
public sealed class SecuredWebsiteTests : BaseWebApplicationTest<Dhgms.AspNetCoreContrib.Examples.WebMvcApp.Startup>
public sealed class SecuredWebsiteTests : BaseWebApplicationTest<Startup>
{
/// <summary>
/// Initializes a new instance of the <see cref="SecuredWebsiteTests"/> class.
Expand Down
7 changes: 2 additions & 5 deletions src/Whipstaff.IntegrationTests/WebApiAppApplicationTest.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Text;
using System.Threading.Tasks;
using Dhgms.AspNetCoreContrib.Example.WebApiApp;
using Microsoft.AspNetCore.Mvc.Testing;
using Xunit;
using Xunit.Abstractions;

namespace Dhgms.AspNetCoreContrib.IntegrationTests
namespace Whipstaff.IntegrationTests
{
/// <summary>
/// Unit Tests for a Web API app startup.
Expand Down
8 changes: 3 additions & 5 deletions src/Whipstaff.IntegrationTests/WebMvcAppApplicationTest.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Text;
using System.Threading.Tasks;
using Dhgms.AspNetCoreContrib.Examples.WebMvcApp;
using Microsoft.AspNetCore.Mvc.Testing;
using Dhgms.AspNetCoreContrib.Example.WebMvcApp;
using Xunit;
using Xunit.Abstractions;

namespace Dhgms.AspNetCoreContrib.IntegrationTests
namespace Whipstaff.IntegrationTests
{
/// <summary>
/// Unit Tests for a Web MVC app startup.
/// </summary>
[ExcludeFromCodeCoverage]
public class WebMvcAppApplicationTest : BaseWebApplicationTest<Dhgms.AspNetCoreContrib.Examples.WebMvcApp.Startup>
public class WebMvcAppApplicationTest : BaseWebApplicationTest<Startup>
{
/// <summary>
/// Initializes a new instance of the <see cref="WebMvcAppApplicationTest"/> class.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Reactive.Subjects;

namespace Whipstaff.Rx
namespace Whipstaff.Rx.ReadOnlyObservables
{
/// <summary>
/// Extension Methods for <see cref="System.Reactive.Subjects.BehaviorSubject{T}">BehaviorSubject</see>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Whipstaff.Rx
namespace Whipstaff.Rx.ReadOnlyObservables
{
/// <summary>
/// Represents a <see cref="System.Reactive.Subjects.BehaviorSubject{T}">BehaviorSubject</see> that has been wrapped to make it read only by hiding the next, error, completed methods.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Reactive.Subjects;

namespace Whipstaff.Rx
namespace Whipstaff.Rx.ReadOnlyObservables
{
/// <summary>
/// Represents a <see cref="System.Reactive.Subjects.BehaviorSubject{T}">BehaviorSubject</see> that has been wrapped to make it read only by hiding the next, error, completed methods.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Microsoft.EntityFrameworkCore.Internal;
using Microsoft.EntityFrameworkCore.Metadata.Conventions;
using Whipstaff.EntityFramework;
using Whipstaff.Entityframework.Relational;
using Xunit;

namespace Whipstaff.UnitTests.EntityFramework.Relational
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using System.ComponentModel;
using System.Reactive.Linq;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging;
using Microsoft.Win32;

// using ReactiveMarbles.ObservableEvents;

namespace Dhgms.Whipstaff.Desktop.Features.GroupPolicyMonitoring
namespace Whipstaff.Windows.GroupPolicyMonitoring
{
/// <summary>
/// Process Manager for handling Group Policy changes.
Expand Down
2 changes: 1 addition & 1 deletion src/Whipstaff.Windows/HResult.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

namespace Dhgms.Whipstaff.Model.Helper
namespace Whipstaff.Windows
{
/// <summary>
/// HRESULT for WinApi calls
Expand Down
1 change: 0 additions & 1 deletion src/Whipstaff.Windows/NativeMethods.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Runtime.InteropServices;
using Dhgms.Whipstaff.Model.Helper;

namespace Whipstaff.Windows
{
Expand Down
2 changes: 1 addition & 1 deletion src/Whipstaff.Windows/SecurityCenter/SecurityProvider.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Dhgms.Whipstaff.Core.Model
namespace Whipstaff.Windows.SecurityCenter
{
/// <summary>
/// Enumeration representing the available security providers
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Dhgms.Whipstaff.Core.Model
namespace Whipstaff.Windows.SecurityCenter
{
/// <summary>
/// Enumeration of Security Provider Health States
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Reactive.Linq;
using Dhgms.Whipstaff.Core.Model;
using Dhgms.Whipstaff.Model.Helper;

namespace Whipstaff.Windows.SecurityCenter
{
Expand Down
5 changes: 1 addition & 4 deletions src/Whipstaff.Windows/SpeechSynthesis/SpeechSynthesizer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@
// </copyright>
// -----------------------------------------------------------------------

using System;
using System.Speech.Synthesis;
using ReactiveMarbles.ObservableEvents;

namespace Dhgms.Whipstaff.Model
namespace Whipstaff.Windows.SpeechSynthesis
{

using Dhgms.Whipstaff.Core.Model;
/// <summary>
/// Handler for speech synthesis.
/// </summary>
Expand Down
4 changes: 1 addition & 3 deletions src/Whipstaff.Wpf/JumpLists/JumpListHelper.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.Contracts;
using System.Linq;
using System.Reactive;
using System.Reactive.Linq;
using System.Reflection;
using System.Windows;
using System.Windows.Shell;
using Microsoft.Extensions.Logging;

namespace Dhgms.Whipstaff.Desktop.Helper
namespace Whipstaff.Wpf.JumpLists
{
/// <summary>
/// Jump List Process Manager
Expand Down