renames. clean up.

goncalvesj · Jul 25, 2024 · a4754d5 · a4754d5
1 parent c6582d4
commit a4754d5
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 18 deletions.
diff --git a/Azure-ContainerApps-Dapr/Azure-ContainerApps-Dapr.sln b/Azure-ContainerApps-Dapr/Azure-ContainerApps-Dapr.sln
@@ -3,30 +3,30 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.33711.374
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dapr.Sender.Api", "Dapr.Api1\Dapr.Sender.Api.csproj", "{FF4AA3C6-5EA5-441A-AD8D-FA352C58896A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dapr.Yarp", "Dapr.Yarp\Dapr.Yarp.csproj", "{AF5FDC61-8DF9-4D50-A716-4C1BB7C8062C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dapr.Consumer.Api", "Dapr.Api2\Dapr.Consumer.Api.csproj", "{9BB4C6B3-3DBE-4FAC-B4D9-8D0913842E2B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dapr.Consumer.Api", "Dapr.Consumer.Api\Dapr.Consumer.Api.csproj", "{811C5D79-267C-4109-92BC-BB75700B1C91}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dapr.Yarp", "Dapr.Yarp\Dapr.Yarp.csproj", "{AF5FDC61-8DF9-4D50-A716-4C1BB7C8062C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dapr.Sender.Api", "Dapr.Sender.Api\Dapr.Sender.Api.csproj", "{DF96A08A-C94A-4C80-9E87-760EEE310AD0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FF4AA3C6-5EA5-441A-AD8D-FA352C58896A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF4AA3C6-5EA5-441A-AD8D-FA352C58896A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF4AA3C6-5EA5-441A-AD8D-FA352C58896A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF4AA3C6-5EA5-441A-AD8D-FA352C58896A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9BB4C6B3-3DBE-4FAC-B4D9-8D0913842E2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BB4C6B3-3DBE-4FAC-B4D9-8D0913842E2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9BB4C6B3-3DBE-4FAC-B4D9-8D0913842E2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9BB4C6B3-3DBE-4FAC-B4D9-8D0913842E2B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF5FDC61-8DF9-4D50-A716-4C1BB7C8062C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF5FDC61-8DF9-4D50-A716-4C1BB7C8062C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF5FDC61-8DF9-4D50-A716-4C1BB7C8062C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF5FDC61-8DF9-4D50-A716-4C1BB7C8062C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{811C5D79-267C-4109-92BC-BB75700B1C91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{811C5D79-267C-4109-92BC-BB75700B1C91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{811C5D79-267C-4109-92BC-BB75700B1C91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{811C5D79-267C-4109-92BC-BB75700B1C91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF96A08A-C94A-4C80-9E87-760EEE310AD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF96A08A-C94A-4C80-9E87-760EEE310AD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF96A08A-C94A-4C80-9E87-760EEE310AD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF96A08A-C94A-4C80-9E87-760EEE310AD0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/...s-Dapr/Dapr.Api2/Dapr.Consumer.Api.csproj → ...apr.Consumer.Api/Dapr.Consumer.Api.csproj b/...s-Dapr/Dapr.Api2/Dapr.Consumer.Api.csproj → ...apr.Consumer.Api/Dapr.Consumer.Api.csproj
diff --git a/...e-ContainerApps-Dapr/Dapr.Api2/Dockerfile → ...nerApps-Dapr/Dapr.Consumer.Api/Dockerfile b/...e-ContainerApps-Dapr/Dapr.Api2/Dockerfile → ...nerApps-Dapr/Dapr.Consumer.Api/Dockerfile
diff --git a/...e-ContainerApps-Dapr/Dapr.Api2/Program.cs → ...nerApps-Dapr/Dapr.Consumer.Api/Program.cs b/...e-ContainerApps-Dapr/Dapr.Api2/Program.cs → ...nerApps-Dapr/Dapr.Consumer.Api/Program.cs
diff --git a/.../Dapr.Api2/Properties/launchSettings.json → ...nsumer.Api/Properties/launchSettings.json b/.../Dapr.Api2/Properties/launchSettings.json → ...nsumer.Api/Properties/launchSettings.json
diff --git a/...pr/Dapr.Api1/appsettings.Development.json → ...Consumer.Api/appsettings.Development.json b/...pr/Dapr.Api1/appsettings.Development.json → ...Consumer.Api/appsettings.Development.json
diff --git a/...ainerApps-Dapr/Dapr.Api2/appsettings.json → ...s-Dapr/Dapr.Consumer.Api/appsettings.json b/...ainerApps-Dapr/Dapr.Api2/appsettings.json → ...s-Dapr/Dapr.Consumer.Api/appsettings.json
diff --git a/...pps-Dapr/Dapr.Api1/Dapr.Sender.Api.csproj → ...pr/Dapr.Sender.Api/Dapr.Sender.Api.csproj b/...pps-Dapr/Dapr.Api1/Dapr.Sender.Api.csproj → ...pr/Dapr.Sender.Api/Dapr.Sender.Api.csproj
diff --git a/...e-ContainerApps-Dapr/Dapr.Api1/Dockerfile → ...ainerApps-Dapr/Dapr.Sender.Api/Dockerfile b/...e-ContainerApps-Dapr/Dapr.Api1/Dockerfile → ...ainerApps-Dapr/Dapr.Sender.Api/Dockerfile
diff --git a/...e-ContainerApps-Dapr/Dapr.Api1/Program.cs → ...ainerApps-Dapr/Dapr.Sender.Api/Program.cs b/...e-ContainerApps-Dapr/Dapr.Api1/Program.cs → ...ainerApps-Dapr/Dapr.Sender.Api/Program.cs
diff --git a/.../Dapr.Api1/Properties/launchSettings.json → ...Sender.Api/Properties/launchSettings.json b/.../Dapr.Api1/Properties/launchSettings.json → ...Sender.Api/Properties/launchSettings.json
diff --git a/...pr/Dapr.Api2/appsettings.Development.json → ...r.Sender.Api/appsettings.Development.json b/...pr/Dapr.Api2/appsettings.Development.json → ...r.Sender.Api/appsettings.Development.json
diff --git a/...ainerApps-Dapr/Dapr.Api1/appsettings.json → ...pps-Dapr/Dapr.Sender.Api/appsettings.json b/...ainerApps-Dapr/Dapr.Api1/appsettings.json → ...pps-Dapr/Dapr.Sender.Api/appsettings.json
diff --git a/Azure-ContainerApps-Dapr/Dapr.Yarp/Dapr.Yarp.csproj b/Azure-ContainerApps-Dapr/Dapr.Yarp/Dapr.Yarp.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>1c882364-79dc-4f83-b820-0e5150055721</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.3" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.7" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     <PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
   </ItemGroup>
 

diff --git a/Azure-ContainerApps-Dapr/docker-compose.yml b/Azure-ContainerApps-Dapr/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     - "5001:80"
     build:
       context: .
-      dockerfile: Dapr.Api1/Dockerfile
+      dockerfile: Dapr.Sender.Api/Dockerfile
 
   dapr-sender-api-dapr:
     image: "daprio/daprd:edge"
@@ -40,7 +40,7 @@ services:
     - "5002:80"
     build:
       context: .
-      dockerfile: Dapr.Api2/Dockerfile
+      dockerfile: Dapr.Consumer.Api/Dockerfile
 
   dapr-consumer-api-dapr:
     image: "daprio/daprd:edge"

diff --git a/Azure-ContainerApps-Dapr/dotnet-build.ps1 b/Azure-ContainerApps-Dapr/dotnet-build.ps1
@@ -1 +1 @@
-dotnet build .\Dapr.Api1\ && dotnet build .\Dapr.Api2\ && dotnet build .\Dapr.Yarp\
+dotnet build .\Dapr.Consumer.Api\ && dotnet build .\Dapr.Sender.Api\ && dotnet build .\Dapr.Yarp\