Move global using to props file.

xavierjohn · Dec 30, 2022 · fde78e2 · fde78e2
1 parent 5ee3b8a
commit fde78e2
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 34 deletions.
diff --git a/BuberDinner.Api/src/ApiControllerBase.cs b/BuberDinner.Api/src/ApiControllerBase.cs
@@ -1,6 +1,5 @@
 namespace BuberDinner.Api;
 
-using FunctionalDDD;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 

diff --git a/BuberDinner.Api/tests/Netural/AuthenticationControllerTests.cs b/BuberDinner.Api/tests/Netural/AuthenticationControllerTests.cs
@@ -3,7 +3,6 @@
 using System.Net;
 using System.Text;
 using Microsoft.AspNetCore.Mvc.Testing;
-using Xunit;
 using Xunit.Priority;
 
 [TestCaseOrderer(PriorityOrderer.Name, PriorityOrderer.Assembly)]

diff --git a/BuberDinner.Application/src/Common/Interfaces/Persistence/IUserRepository.cs b/BuberDinner.Application/src/Common/Interfaces/Persistence/IUserRepository.cs
@@ -1,7 +1,6 @@
 namespace BuberDinner.Application.Common.Interfaces.Persistence;
 
 using BuberDinner.Domain.User.Entities;
-using FunctionalDDD;
 
 public interface IUserRepository
 {

diff --git a/BuberDinner.Application/src/Services/Authentication/Commands/RegisterCommandHandler.cs b/BuberDinner.Application/src/Services/Authentication/Commands/RegisterCommandHandler.cs
@@ -7,7 +7,6 @@
 using BuberDinner.Domain.Errors;
 using BuberDinner.Domain.Menu.ValueObject;
 using BuberDinner.Domain.User.Entities;
-using FunctionalDDD;
 using Mediator;
 
 

diff --git a/BuberDinner.Application/src/Services/Authentication/Queries/LoginQueryHandler.cs b/BuberDinner.Application/src/Services/Authentication/Queries/LoginQueryHandler.cs
@@ -7,7 +7,6 @@
     using BuberDinner.Application.Common.Interfaces.Authentication;
     using BuberDinner.Application.Common.Interfaces.Persistence;
     using BuberDinner.Domain.Errors;
-    using FunctionalDDD;
 
     internal class LoginQueryHandler :
         IRequestHandler<LoginQuery, Result<AuthenticationResult>>

diff --git a/BuberDinner.Domain/src/Common/Errors/Errors.Authentication.cs b/BuberDinner.Domain/src/Common/Errors/Errors.Authentication.cs
@@ -1,7 +1,5 @@
 namespace BuberDinner.Domain.Errors;
 
-using FunctionalDDD;
-
 public partial class Errors
 {
     public static class Authentication

diff --git a/BuberDinner.Domain/src/Common/Errors/Errors.User.cs b/BuberDinner.Domain/src/Common/Errors/Errors.User.cs
@@ -1,7 +1,5 @@
 namespace BuberDinner.Domain.Errors;
 
-using FunctionalDDD;
-
 public partial class Errors
 {
     public static class User

diff --git a/BuberDinner.Domain/src/Menu/Entities/MenuItem.cs b/BuberDinner.Domain/src/Menu/Entities/MenuItem.cs
@@ -1,7 +1,6 @@
 namespace BuberDinner.Domain.Menu.Entities;
 using BuberDinner.Domain.Menu.ValueObject;
 using FluentValidation;
-using FunctionalDDD;
 
 public class MenuItem : Entity<MenuItemId>
 {

diff --git a/BuberDinner.Domain/src/Menu/Entities/MenuSection.cs b/BuberDinner.Domain/src/Menu/Entities/MenuSection.cs
@@ -1,7 +1,6 @@
 namespace BuberDinner.Domain.Menu.Entities;
 using BuberDinner.Domain.Menu.ValueObject;
 using FluentValidation;
-using FunctionalDDD;
 
 public class MenuSection : Entity<MenuSectionId>
 {

diff --git a/BuberDinner.Domain/src/Menu/Menu.cs b/BuberDinner.Domain/src/Menu/Menu.cs
@@ -4,7 +4,6 @@
     using BuberDinner.Domain.Menu.Entities;
     using BuberDinner.Domain.Menu.ValueObject;
     using FluentValidation;
-    using FunctionalDDD;
     public class Menu : AggregateRoot<MenuId>
     {
         public string Name { get; }

diff --git a/BuberDinner.Domain/src/User/ValueObjects/Password.cs b/BuberDinner.Domain/src/User/ValueObjects/Password.cs
@@ -1,7 +1,5 @@
 namespace BuberDinner.Domain.User.ValueObjects;
 
-using FunctionalDDD;
-
 public partial class Password : RequiredString<Password>
 {
 }
diff --git a/BuberDinner.Domain/tests/UserTests.cs b/BuberDinner.Domain/tests/UserTests.cs
@@ -3,9 +3,6 @@
 using BuberDinner.Domain.Menu.ValueObject;
 using BuberDinner.Domain.User.Entities;
 using BuberDinner.Domain.User.ValueObjects;
-using FluentAssertions;
-using FunctionalDDD;
-using Xunit;
 #pragma warning disable IDE0007 // Use var keyword
 
 public class UserTests

diff --git a/BuberDinner.Infrastructure/src/Persistence/UserRepository.cs b/BuberDinner.Infrastructure/src/Persistence/UserRepository.cs
@@ -2,7 +2,6 @@
 
 using BuberDinner.Application.Common.Interfaces.Persistence;
 using BuberDinner.Domain.User.Entities;
-using FunctionalDDD;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup Label="General">
-	  <Authors>Xavier John</Authors>
-	  <Company>$(Authors)</Company>
-	  <Copyright>Copyright © $(Company) 2022. All rights reserved.</Copyright>
+    <Authors>Xavier John</Authors>
+    <Company>$(Authors)</Company>
+    <Copyright>Copyright © $(Company) 2022. All rights reserved.</Copyright>
     <NeutralLanguage>en</NeutralLanguage>
     <DefaultLanguage>en-US</DefaultLanguage>
     <SolutionDir Condition=" '$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined if not building a solution or within Visual Studio*' ">$(MSBuildThisFileDirectory)</SolutionDir>
@@ -22,18 +22,15 @@
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(IsTestProject)' != 'true' ">
-    <Compile Include="$(MSBuildThisFileDirectory)Usings.cs" Link="Usings.cs" Visible="true" />
+    <Using Include="FunctionalDDD" />
   </ItemGroup>
 
   <!-- Test projects. -->
   <PropertyGroup Condition=" '$(IsTestProject)' == 'true' ">
-	  <IsPackable>false</IsPackable>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ImportGroup Condition=" '$(IsTestProject)' == 'true' ">
-    <Import Project="$(MSBuildThisFileDirectory)sharedTest/commontest.props"/>
+    <Import Project="$(MSBuildThisFileDirectory)build/test.props"/>
   </ImportGroup>
- 
+
 </Project>
diff --git a/Usings.cs b/Usings.cs
diff --git a/sharedTest/commontest.props → build/test.props b/sharedTest/commontest.props → build/test.props
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
+  <ItemGroup>
+    <Using Include="FluentAssertions" />
+    <Using Include="Xunit" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)xunit.runner.json" Link="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Visible="false" />
-    <Compile Include="$(MSBuildThisFileDirectory)Usings.cs" Link="Usings.cs" Visible="true" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit"/>
     <PackageReference Include="xunit.runner.visualstudio">

diff --git a/sharedTest/xunit.runner.json → build/xunit.runner.json b/sharedTest/xunit.runner.json → build/xunit.runner.json
diff --git a/sharedTest/Usings.cs b/sharedTest/Usings.cs