Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 390a37a

Browse files
erjainerjain
authored
Merge pull request #2064 from erjain/update/eShop-refresh
Update and cleanup eShop
2 parents faeebd3 + f92e02f commit 390a37a

File tree

172 files changed

+13833
-11787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+13833
-11787
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,4 @@ pub/
281281
src/**/app.yaml
282282
src/**/inf.yaml
283283

284+
.angular/

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWe
1111

1212
COPY "ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj" "ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj"
1313
COPY "ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj" "ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj"
14-
COPY "BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj" "BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj"
1514
COPY "BuildingBlocks/EventBus/EventBus/EventBus.csproj" "BuildingBlocks/EventBus/EventBus/EventBus.csproj"
1615
COPY "BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj" "BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj"
1716
COPY "BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj" "BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj"
@@ -42,6 +41,7 @@ COPY "Web/WebStatus/WebStatus.csproj" "Web/WebStatus/WebStatus.csproj"
4241

4342
COPY "docker-compose.dcproj" "docker-compose.dcproj"
4443

44+
COPY "Directory.Packages.props" "Directory.Packages.props"
4545
COPY "NuGet.config" "NuGet.config"
4646

4747
RUN dotnet restore "eShopOnContainers-ServicesAndWebApps.sln"

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile.develop‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ EXPOSE 80
66

77
WORKDIR /src
88
COPY ["src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj", "src/ApiGateways/Mobile.Bff.Shopping/aggregator/"]
9-
COPY ["src/BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj", "src/BuildingBlocks/Devspaces.Support/"]
109
COPY ["src/NuGet.config", "src/NuGet.config"]
1110

1211
RUN dotnet restore src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj -nowarn:msb3202,nu1503

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/GlobalUsings.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
global using CatalogApi;
2-
global using Devspaces.Support;
32
global using Grpc.Core.Interceptors;
43
global using Grpc.Core;
54
global using GrpcBasket;

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,20 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="6.0.5" />
18-
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="6.0.3" />
19-
<PackageReference Include="Google.Protobuf" Version="3.21.9" />
20-
<PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" Version="2.50.0" />
21-
<PackageReference Include="Grpc.Core" Version="2.46.5" />
22-
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.50.0" />
23-
<PackageReference Include="Grpc.Tools" Version="2.51.0-pre1" PrivateAssets="All" />
24-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
25-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.0" />
26-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
27-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.0" />
28-
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0-dev-00289" />
29-
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00896" />
30-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
31-
</ItemGroup>
32-
33-
<ItemGroup>
34-
<ProjectReference Include="..\..\..\BuildingBlocks\Devspaces.Support\Devspaces.Support.csproj" />
17+
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" />
18+
<PackageReference Include="AspNetCore.HealthChecks.Uris" />
19+
<PackageReference Include="Google.Protobuf" />
20+
<PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" />
21+
<PackageReference Include="Grpc.Core" />
22+
<PackageReference Include="Grpc.Net.ClientFactory" />
23+
<PackageReference Include="Grpc.Tools" PrivateAssets="All" />
24+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
25+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
26+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
27+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
28+
<PackageReference Include="Serilog.AspNetCore" />
29+
<PackageReference Include="Serilog.Sinks.Console" />
30+
<PackageReference Include="Swashbuckle.AspNetCore" />
3531
</ItemGroup>
3632

3733
<ItemGroup>

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Properties/launchSettings.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@
2424
"ASPNETCORE_ENVIRONMENT": "Development"
2525
},
2626
"applicationUrl": "http://localhost:61632/"
27-
},
28-
"Azure Dev Spaces": {
29-
"commandName": "AzureDevSpaces",
30-
"launchBrowser": true,
31-
"resourceGroup": "eshoptestedu",
32-
"aksName": "eshoptestedu",
33-
"subscriptionId": "e3035ac1-c06c-4daf-8939-57b3c5f1f759"
3427
}
3528
}
3629
}

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using Microsoft.AspNetCore.Authentication.Cookies;
2-
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
3-
4-
namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator;
1+
namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator;
52

63
public class Startup
74
{
@@ -25,7 +22,6 @@ public void ConfigureServices(IServiceCollection services)
2522

2623
services.AddCustomMvc(Configuration)
2724
.AddCustomAuthentication(Configuration)
28-
.AddDevspaces()
2925
.AddHttpServices()
3026
.AddGrpcServices();
3127
}
@@ -175,8 +171,7 @@ public static IServiceCollection AddHttpServices(this IServiceCollection service
175171

176172
//register http services
177173

178-
services.AddHttpClient<IOrderApiClient, OrderApiClient>()
179-
.AddDevspacesSupport();
174+
services.AddHttpClient<IOrderApiClient, OrderApiClient>();
180175

181176
return services;
182177
}

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/azds.yaml‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ COPY "eShopOnContainers-ServicesAndWebApps.sln" "eShopOnContainers-ServicesAndWe
1111

1212
COPY "ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj" "ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj"
1313
COPY "ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj" "ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj"
14-
COPY "BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj" "BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj"
1514
COPY "BuildingBlocks/EventBus/EventBus/EventBus.csproj" "BuildingBlocks/EventBus/EventBus/EventBus.csproj"
1615
COPY "BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj" "BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj"
1716
COPY "BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj" "BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj"
@@ -42,6 +41,7 @@ COPY "Web/WebStatus/WebStatus.csproj" "Web/WebStatus/WebStatus.csproj"
4241

4342
COPY "docker-compose.dcproj" "docker-compose.dcproj"
4443

44+
COPY "Directory.Packages.props" "Directory.Packages.props"
4545
COPY "NuGet.config" "NuGet.config"
4646

4747
RUN dotnet restore "eShopOnContainers-ServicesAndWebApps.sln"

‎src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile.develop‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ EXPOSE 80
66

77
WORKDIR /src
88
COPY ["src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj", "src/ApiGateways/Web.Bff.Shopping/aggregator/"]
9-
COPY ["src/BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj", "src/BuildingBlocks/Devspaces.Support/"]
109
COPY ["src/NuGet.config", "src/NuGet.config"]
1110

1211
RUN dotnet restore src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj -nowarn:msb3202,nu1503

0 commit comments

Comments
 (0)