From 4be7bc3fb6926cc01a5f852bf4249fef390fcd7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 19 Jul 2022 13:41:45 +0300
Subject: [PATCH] Set rootnamespaces to empty for the new dapr integration
 packages.

---
 .../src/Volo.Abp.AspNetCore.Dapr/Volo.Abp.AspNetCore.Dapr.csproj | 1 +
 .../{ => Volo/Abp/AspNetCore/Dapr}/AbpAspNetCoreDaprModule.cs    | 0
 framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj                 | 1 +
 framework/src/Volo.Abp.Dapr/{ => Volo/Abp/Dapr}/AbpDaprModule.cs | 0
 .../src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.csproj     | 1 +
 .../{ => Volo/Abp/EventBus/Dapr}/AbpEventBusDaprModule.cs        | 0
 .../Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.csproj   | 1 +
 .../{ => Volo/Abp/Http/Client/Dapr}/AbpHttpClientDaprModule.cs   | 0
 8 files changed, 4 insertions(+)
 rename framework/src/Volo.Abp.AspNetCore.Dapr/{ => Volo/Abp/AspNetCore/Dapr}/AbpAspNetCoreDaprModule.cs (100%)
 rename framework/src/Volo.Abp.Dapr/{ => Volo/Abp/Dapr}/AbpDaprModule.cs (100%)
 rename framework/src/Volo.Abp.EventBus.Dapr/{ => Volo/Abp/EventBus/Dapr}/AbpEventBusDaprModule.cs (100%)
 rename framework/src/Volo.Abp.Http.Client.Dapr/{ => Volo/Abp/Http/Client/Dapr}/AbpHttpClientDaprModule.cs (100%)

diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr/Volo.Abp.AspNetCore.Dapr.csproj b/framework/src/Volo.Abp.AspNetCore.Dapr/Volo.Abp.AspNetCore.Dapr.csproj
index 05d5de4042..43bfc66df8 100644
--- a/framework/src/Volo.Abp.AspNetCore.Dapr/Volo.Abp.AspNetCore.Dapr.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Dapr/Volo.Abp.AspNetCore.Dapr.csproj
@@ -7,6 +7,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <RootNamespace/>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr/AbpAspNetCoreDaprModule.cs b/framework/src/Volo.Abp.AspNetCore.Dapr/Volo/Abp/AspNetCore/Dapr/AbpAspNetCoreDaprModule.cs
similarity index 100%
rename from framework/src/Volo.Abp.AspNetCore.Dapr/AbpAspNetCoreDaprModule.cs
rename to framework/src/Volo.Abp.AspNetCore.Dapr/Volo/Abp/AspNetCore/Dapr/AbpAspNetCoreDaprModule.cs
diff --git a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj
index c8b3297a4a..5ba8d313e1 100644
--- a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj
+++ b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj
@@ -7,6 +7,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <RootNamespace />
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/framework/src/Volo.Abp.Dapr/AbpDaprModule.cs b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs
similarity index 100%
rename from framework/src/Volo.Abp.Dapr/AbpDaprModule.cs
rename to framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs
diff --git a/framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.csproj b/framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.csproj
index 51985afeff..2bef3f9dc9 100644
--- a/framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.csproj
+++ b/framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.csproj
@@ -7,6 +7,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <RootNamespace />
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/framework/src/Volo.Abp.EventBus.Dapr/AbpEventBusDaprModule.cs b/framework/src/Volo.Abp.EventBus.Dapr/Volo/Abp/EventBus/Dapr/AbpEventBusDaprModule.cs
similarity index 100%
rename from framework/src/Volo.Abp.EventBus.Dapr/AbpEventBusDaprModule.cs
rename to framework/src/Volo.Abp.EventBus.Dapr/Volo/Abp/EventBus/Dapr/AbpEventBusDaprModule.cs
diff --git a/framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.csproj b/framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.csproj
index a0d49df593..909fb156c8 100644
--- a/framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.csproj
+++ b/framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.csproj
@@ -7,6 +7,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <RootNamespace />
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/framework/src/Volo.Abp.Http.Client.Dapr/AbpHttpClientDaprModule.cs b/framework/src/Volo.Abp.Http.Client.Dapr/Volo/Abp/Http/Client/Dapr/AbpHttpClientDaprModule.cs
similarity index 100%
rename from framework/src/Volo.Abp.Http.Client.Dapr/AbpHttpClientDaprModule.cs
rename to framework/src/Volo.Abp.Http.Client.Dapr/Volo/Abp/Http/Client/Dapr/AbpHttpClientDaprModule.cs