Fixed conflicts

EasyMicroservices · Feb 25, 2024 · b52bb1c · b52bb1c
2 parents 7bd365c + fdd4a2c
commit b52bb1c
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 14 deletions.
diff --git a/....IdentityMicroservice.ConsoleApp/EasyMicroservices.IdentityMicroservice.ConsoleApp.csproj b/....IdentityMicroservice.ConsoleApp/EasyMicroservices.IdentityMicroservice.ConsoleApp.csproj
@@ -1,10 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/...ices.IdentityMicroservice.Database/EasyMicroservices.IdentityMicroservice.Database.csproj b/...ices.IdentityMicroservice.Database/EasyMicroservices.IdentityMicroservice.Database.csproj
@@ -1,8 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <PropertyGroup>
     <RootNamespace>EasyMicroservices.IdentityMicroservice</RootNamespace>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>true</IsPackable>
 

diff --git a/...services.IdentityMicroservice.Domain/EasyMicroservices.IdentityMicroservice.Domain.csproj b/...services.IdentityMicroservice.Domain/EasyMicroservices.IdentityMicroservice.Domain.csproj
@@ -1,8 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <PropertyGroup>
     <RootNamespace>EasyMicroservices.IdentityMicroservice</RootNamespace>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>true</IsPackable>
 

diff --git a/...services.IdentityMicroservice.Logics/EasyMicroservices.IdentityMicroservice.Logics.csproj b/...services.IdentityMicroservice.Logics/EasyMicroservices.IdentityMicroservice.Logics.csproj
@@ -1,8 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <PropertyGroup>
     <RootNamespace>EasyMicroservices.IdentityMicroservice</RootNamespace>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>true</IsPackable>
 

diff --git a/...CSharp/EasyMicroservices.IdentityMicroservice.Tests/Fixtures/AuthenticationTestFixture.cs b/...CSharp/EasyMicroservices.IdentityMicroservice.Tests/Fixtures/AuthenticationTestFixture.cs
@@ -7,6 +7,7 @@
 using Identity.GeneratedServices;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace EasyMicroservices.IdentityMicroservice.Tests.Fixtures;
@@ -20,8 +21,11 @@ public Task DisposeAsync()
 
     public async Task InitializeAsync()
     {
+        IConfiguration config = new ConfigurationBuilder()
+            .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+            .Build();
         var app = Program.CreateBuilder(null);
-        string baseUrl = $"http://localhost:{2007}";
+        string baseUrl = config.GetSection("Urls").Get<string>().Replace("*", "localhost");
         app.Services.AddSingleton(s => new HttpClient());
         app.Services.AddTransient(s => new AuthenticationClient(baseUrl, s.GetService<HttpClient>()));
         app.Services.AddMvc().AddApplicationPart(typeof(AuthenticationController).Assembly);

diff --git a/...services.IdentityMicroservice.WebApi/EasyMicroservices.IdentityMicroservice.WebApi.csproj b/...services.IdentityMicroservice.WebApi/EasyMicroservices.IdentityMicroservice.WebApi.csproj
@@ -1,7 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
+
+  <Choose>
+    <When Condition="$(SolutionFileName.Contains('-net'))">
+      <PropertyGroup>
+        <TargetFramework>$(SolutionFileName.Split('-')[1].Replace('.sln',''))</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>true</IsPackable>
 
@@ -18,16 +30,37 @@
   <ItemGroup>
     <PackageReference Include="EasyMicroservices.Logger.DependencyInjection" Version="0.0.0.6" />
     <PackageReference Include="EasyMicroservices.Logger.Serilog" Version="0.0.0.6" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.15" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.15">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.26" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.26" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.26">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\EasyMicroservices.IdentityMicroservice.Logics\EasyMicroservices.IdentityMicroservice.Logics.csproj" />
   </ItemGroup>