Merge pull request #1 from byerlikaya/netstandart

Netstandart
byerlikaya · Sep 21, 2023 · 424a138 · 424a138
2 parents 2fedfe5 + 243c28e
commit 424a138
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 15 deletions.
diff --git a/Basic.RabbitMQ.sln b/Basic.RabbitMQ.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 17.7.34031.279
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basic.RabbitMQ", "src\Basic.RabbitMQ\Basic.RabbitMQ.csproj", "{75C7583C-6553-4E67-9A85-9BA13E01AB96}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basic.RabbitMQ.Consumer.Sample", "src\Basic.RabbitMQ.Sample\Basic.RabbitMQ.Consumer.Sample.csproj", "{3C619A19-2ACB-4C45-86BF-5A351B94DC59}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Consumer.Sample", "sample\Consumer.Sample\Consumer.Sample.csproj", "{EEC1BC95-7C28-476A-9F2C-F8593BB24C38}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basic.RabbitMQ.Producer.Sample.Api", "src\Basic.RabbitMQ.Sample.Api\Basic.RabbitMQ.Producer.Sample.Api.csproj", "{9B2A9EE6-DD3D-4348-A27F-7EEE95F43762}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Producer.Sample.Api", "sample\Producer.Sample.Api\Producer.Sample.Api.csproj", "{2E9671C9-B684-43FF-9E29-4A8469FED1AC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,12 +19,14 @@ Global
 		{75C7583C-6553-4E67-9A85-9BA13E01AB96}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75C7583C-6553-4E67-9A85-9BA13E01AB96}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75C7583C-6553-4E67-9A85-9BA13E01AB96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C619A19-2ACB-4C45-86BF-5A351B94DC59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C619A19-2ACB-4C45-86BF-5A351B94DC59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C619A19-2ACB-4C45-86BF-5A351B94DC59}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B2A9EE6-DD3D-4348-A27F-7EEE95F43762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B2A9EE6-DD3D-4348-A27F-7EEE95F43762}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B2A9EE6-DD3D-4348-A27F-7EEE95F43762}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEC1BC95-7C28-476A-9F2C-F8593BB24C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEC1BC95-7C28-476A-9F2C-F8593BB24C38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEC1BC95-7C28-476A-9F2C-F8593BB24C38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEC1BC95-7C28-476A-9F2C-F8593BB24C38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E9671C9-B684-43FF-9E29-4A8469FED1AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E9671C9-B684-43FF-9E29-4A8469FED1AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E9671C9-B684-43FF-9E29-4A8469FED1AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E9671C9-B684-43FF-9E29-4A8469FED1AC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/...ple/Basic.RabbitMQ.Consumer.Sample.csproj → ...le/Consumer.Sample/Consumer.Sample.csproj b/...ple/Basic.RabbitMQ.Consumer.Sample.csproj → ...le/Consumer.Sample/Consumer.Sample.csproj
@@ -5,14 +5,15 @@
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Basic.RabbitMQ\Basic.RabbitMQ.csproj" />
+    <ProjectReference Include="..\..\src\Basic.RabbitMQ\Basic.RabbitMQ.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Basic.RabbitMQ.Sample/Program.cs → sample/Consumer.Sample/Program.cs b/src/Basic.RabbitMQ.Sample/Program.cs → sample/Consumer.Sample/Program.cs
@@ -1,7 +1,7 @@
 // See https://aka.ms/new-console-template for more information
 
-using Basic.RabbitMQ.Consumer.Sample;
 using Basic.RabbitMQ.Interfaces;
+using Consumer.Sample;
 using Microsoft.Extensions.DependencyInjection;
 using RabbitMQ.Client.Events;
 using System.Text;

diff --git a/src/Basic.RabbitMQ.Sample/Startup.cs → sample/Consumer.Sample/Startup.cs b/src/Basic.RabbitMQ.Sample/Startup.cs → sample/Consumer.Sample/Startup.cs
@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Basic.RabbitMQ.Consumer.Sample
+namespace Consumer.Sample
 {
     public class Startup
     {

diff --git a/src/Basic.RabbitMQ.Sample/appsettings.json → sample/Consumer.Sample/appsettings.json b/src/Basic.RabbitMQ.Sample/appsettings.json → sample/Consumer.Sample/appsettings.json
diff --git a/...ple.Api/Controllers/ProducerController.cs → ...ple.Api/Controllers/ProducerController.cs b/...ple.Api/Controllers/ProducerController.cs → ...ple.Api/Controllers/ProducerController.cs
@@ -1,7 +1,7 @@
 using Basic.RabbitMQ.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Basic.RabbitMQ.Producer.Sample.Api.Controllers
+namespace Producer.Sample.Api.Controllers
 {
     [ApiController]
     public class ProducerController : ControllerBase

diff --git a/...Basic.RabbitMQ.Producer.Sample.Api.csproj → ...cer.Sample.Api/Producer.Sample.Api.csproj b/...Basic.RabbitMQ.Producer.Sample.Api.csproj → ...cer.Sample.Api/Producer.Sample.Api.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Basic.RabbitMQ\Basic.RabbitMQ.csproj" />
+    <ProjectReference Include="..\..\src\Basic.RabbitMQ\Basic.RabbitMQ.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Basic.RabbitMQ.Sample.Api/Program.cs → sample/Producer.Sample.Api/Program.cs b/src/Basic.RabbitMQ.Sample.Api/Program.cs → sample/Producer.Sample.Api/Program.cs
diff --git a/...Sample.Api/Properties/launchSettings.json → ...Sample.Api/Properties/launchSettings.json b/...Sample.Api/Properties/launchSettings.json → ...Sample.Api/Properties/launchSettings.json
diff --git a/...Q.Sample.Api/appsettings.Development.json → ...r.Sample.Api/appsettings.Development.json b/...Q.Sample.Api/appsettings.Development.json → ...r.Sample.Api/appsettings.Development.json
diff --git a/...asic.RabbitMQ.Sample.Api/appsettings.json → sample/Producer.Sample.Api/appsettings.json b/...asic.RabbitMQ.Sample.Api/appsettings.json → sample/Producer.Sample.Api/appsettings.json
diff --git a/src/Basic.RabbitMQ/Basic.RabbitMQ.csproj b/src/Basic.RabbitMQ/Basic.RabbitMQ.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <Title>Basic.RabbitMQ</Title>
     <Authors>Barış Yerlikaya</Authors>
     <Company>Barış Yerlikaya</Company>
@@ -13,6 +12,10 @@
     <PackageTags>RabbitMQ rabbitmq</PackageTags>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>.NET Core library that simplifies RabbitMQ usage and works with the Direct Exchange type.</Description>
+    <PackageId>Basic.RabbitMQ</PackageId>
+    <Version>1.0.2</Version>
+    <Product>Basic.RabbitMQ</Product>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Basic.RabbitMQ/Services/RabbitMQClientService.cs b/src/Basic.RabbitMQ/Services/RabbitMQClientService.cs
@@ -1,6 +1,7 @@
 using Basic.RabbitMQ.Options;
 using Microsoft.Extensions.Configuration;
 using RabbitMQ.Client;
+using System;
 
 namespace Basic.RabbitMQ.Services
 {