diff --git a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
index b1b6b1db6..5db2881d5 100644
--- a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
+++ b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
@@ -1,17 +1,17 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
index 1dd1ba1b6..6efbcf389 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
Mobile.Shopping.HttpAggregator
Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
..\..\..\docker-compose.dcproj
@@ -12,15 +12,14 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
index d438e4602..d71cbee45 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
Web.Shopping.HttpAggregator
Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
..\..\..\docker-compose.dcproj
@@ -12,14 +12,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj b/src/BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj
index 81a897bad..05fc111a4 100644
--- a/src/BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj
+++ b/src/BuildingBlocks/Devspaces.Support/Devspaces.Support.csproj
@@ -1,11 +1,11 @@
- netstandard2.0
+ $(NetStandardTargetVersion)
-
-
-
+
+
+
diff --git a/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj b/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
index ce65f7da8..ef1a920e9 100644
--- a/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
+++ b/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
@@ -1,13 +1,13 @@
- netstandard2.0
+ $(NetStandardTargetVersion)
-
-
-
+
+
+
diff --git a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
index 9704f6ff5..842e6d937 100644
--- a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
+++ b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
@@ -1,12 +1,12 @@
- netstandard2.0
+ $(NetStandardTargetVersion)
Microsoft.eShopOnContainers.BuildingBlocks.EventBus
-
+
\ No newline at end of file
diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj
index 62373d1b3..6830ac9d7 100644
--- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj
+++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj
@@ -1,16 +1,16 @@
- netstandard2.0
+ $(NetStandardTargetVersion)
Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
-
-
-
-
-
+
+
+
+
+
diff --git a/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj b/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj
index 3de07e329..bace8a713 100644
--- a/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj
+++ b/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj
@@ -1,15 +1,15 @@
- netstandard2.0
+ $(NetStandardTargetVersion)
Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus
-
-
-
-
+
+
+
+
diff --git a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj
index ef3463cca..c518e8e92 100644
--- a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj
+++ b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj
@@ -1,16 +1,16 @@
- netstandard2.0
+ $(NetStandardTargetVersion)
Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF
-
-
-
-
-
+
+
+
+
+
diff --git a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
index 1d4ea7a2d..14f473643 100644
--- a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
+++ b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
@@ -1,11 +1,11 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
-
+
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 000000000..b137daefc
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj
index d5fc0a301..a949b2636 100644
--- a/src/Services/Basket/Basket.API/Basket.API.csproj
+++ b/src/Services/Basket/Basket.API/Basket.API.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
..\..\..\..\docker-compose.dcproj
@@ -13,29 +13,29 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
diff --git a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj
index 4fd8cb9ec..120bfde02 100644
--- a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj
+++ b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
false
@@ -19,15 +19,15 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj
index 27a851767..95b30667e 100644
--- a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj
+++ b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
false
@@ -9,15 +9,15 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj
index 2d5e36507..d88c92f09 100644
--- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj
+++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.0
+ $(NetCoreTargetVersion)
portable
true
Catalog.API
@@ -39,30 +39,30 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/Catalog/Catalog.API/Proto/catalog.proto b/src/Services/Catalog/Catalog.API/Proto/catalog.proto
index cee230070..09d9c6e38 100644
--- a/src/Services/Catalog/Catalog.API/Proto/catalog.proto
+++ b/src/Services/Catalog/Catalog.API/Proto/catalog.proto
@@ -1,5 +1,10 @@
syntax = "proto3";
+/* >>
+import "google/api/annotations.proto";
+<< */
+
+
package CatalogApi;
message CatalogItemRequest {
@@ -32,5 +37,11 @@ message CatalogType {
}
service Catalog {
- rpc GetItemById (CatalogItemRequest) returns (CatalogItemResponse) {}
+ rpc GetItemById (CatalogItemRequest) returns (CatalogItemResponse) {
+ /* >>
+ option (google.api.http) = {
+ get: "/api/v1/catalog/items/{id}"
+ };
+<< */
+ }
}
\ No newline at end of file
diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs
index f81492c24..69580a926 100644
--- a/src/Services/Catalog/Catalog.API/Startup.cs
+++ b/src/Services/Catalog/Catalog.API/Startup.cs
@@ -95,9 +95,17 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
e.MapDefaultControllerRoute();
e.MapGet("/_proto/", async ctx =>
{
- var data = await File.ReadAllTextAsync(Path.Combine(env.ContentRootPath, "Proto", "catalog.proto"));
ctx.Response.ContentType = "text/plain";
- await ctx.Response.WriteAsync(data);
+ using var fs = new FileStream(Path.Combine(env.ContentRootPath, "Proto", "catalog.proto"), FileMode.Open, FileAccess.Read);
+ using var sr = new StreamReader(fs);
+ while (!sr.EndOfStream)
+ {
+ var line = await sr.ReadLineAsync();
+ if (line != "/* >>" || line != "<< */")
+ {
+ await ctx.Response.WriteAsync(line);
+ }
+ }
});
e.MapGrpcService();
});
diff --git a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj
index 455dfb0bc..0e0ccbe7a 100644
--- a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj
+++ b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
false
@@ -35,9 +35,9 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj
index efa9d56a4..58863148d 100644
--- a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj
+++ b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
false
@@ -9,14 +9,14 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj
index 728843f71..5fe2b3a86 100644
--- a/src/Services/Identity/Identity.API/Identity.API.csproj
+++ b/src/Services/Identity/Identity.API/Identity.API.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5
..\..\..\..\docker-compose.dcproj
@@ -13,29 +13,28 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -43,7 +42,7 @@
-
+
diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj
index 6c33656e1..cd110d9de 100644
--- a/src/Services/Location/Locations.API/Locations.API.csproj
+++ b/src/Services/Location/Locations.API/Locations.API.csproj
@@ -1,36 +1,35 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
..\..\..\..\docker-compose.dcproj
aspnet-Locations.API-20161122013619
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj b/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj
index 27898f504..645c294f8 100644
--- a/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj
+++ b/src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
false
@@ -19,9 +19,9 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Services/Marketing/Marketing.API/Marketing.API.csproj b/src/Services/Marketing/Marketing.API/Marketing.API.csproj
index c47989611..2409caf49 100644
--- a/src/Services/Marketing/Marketing.API/Marketing.API.csproj
+++ b/src/Services/Marketing/Marketing.API/Marketing.API.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
..\..\..\..\docker-compose.dcproj
Microsoft.eShopOnContainers.Services.Marketing.API
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
@@ -20,33 +20,33 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj
index eaedddbd5..2ecf7e8ea 100644
--- a/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj
+++ b/src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
false
@@ -19,9 +19,9 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj
index e2b25c2a7..b839c0ea4 100644
--- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj
+++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
aspnet-Ordering.API-20161122013547
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
..\..\..\..\docker-compose.dcproj
@@ -28,32 +28,32 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
index 63df5da80..d28d9e85f 100644
--- a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
+++ b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
..\..\..\..\docker-compose.dcproj
@@ -14,21 +14,21 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj
index f79d76c60..04a6c1770 100644
--- a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj
+++ b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj
@@ -1,7 +1,7 @@
- netstandard2.0
+ $(NetStandardTargetVersion)
diff --git a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
index 851a64895..c581d0807 100644
--- a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
+++ b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
false
@@ -19,9 +19,9 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
index 4f1a74889..6f7f59f9e 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
+++ b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
@@ -1,7 +1,7 @@
- netstandard2.0
+ $(NetStandardTargetVersion)
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
index 00d70cbe6..52cd6d24a 100644
--- a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
+++ b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
..\..\..\..\docker-compose.dcproj
@@ -10,27 +10,27 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj b/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj
index e94aae4f1..6ebbd9028 100644
--- a/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj
+++ b/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj
@@ -1,21 +1,21 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
false
-
-
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj
index efce8b8ab..6eff9b503 100644
--- a/src/Services/Payment/Payment.API/Payment.API.csproj
+++ b/src/Services/Payment/Payment.API/Payment.API.csproj
@@ -1,30 +1,30 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
..\..\..\..\docker-compose.dcproj
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj b/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj
index 4b7fe7eae..b489d32d8 100644
--- a/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj
+++ b/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
InProcess
Linux
@@ -10,16 +10,16 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj
index 878bcbe7f..09ecb1846 100644
--- a/src/Web/WebMVC/WebMVC.csproj
+++ b/src/Web/WebMVC/WebMVC.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3
..\..\..\docker-compose.dcproj
3.0
@@ -19,29 +19,29 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -49,7 +49,7 @@
-
+
diff --git a/src/Web/WebSPA/Startup.cs b/src/Web/WebSPA/Startup.cs
index 7a418c432..0c1f37b3f 100644
--- a/src/Web/WebSPA/Startup.cs
+++ b/src/Web/WebSPA/Startup.cs
@@ -64,7 +64,7 @@ namespace eShopConContainers.WebSPA
services.AddAntiforgery(options => options.HeaderName = "X-XSRF-TOKEN");
services.AddMvc()
- .SetCompatibilityVersion(CompatibilityVersion.Version_2_2)
+ .SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
.AddJsonOptions(options =>
{
options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj
index 56f94d530..858d46eb3 100644
--- a/src/Web/WebSPA/WebSPA.csproj
+++ b/src/Web/WebSPA/WebSPA.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
aspnetcorespa-c23d27a4-eb88-4b18-9b77-2a93f3b15119
..\..\..\docker-compose.dcproj
false
@@ -85,19 +85,19 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
diff --git a/src/Web/WebStatus/Startup.cs b/src/Web/WebStatus/Startup.cs
index 5b35ee84f..d36b2df90 100644
--- a/src/Web/WebStatus/Startup.cs
+++ b/src/Web/WebStatus/Startup.cs
@@ -33,7 +33,7 @@ namespace WebStatus
services.AddHealthChecksUI();
services.AddMvc()
- .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+ .SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj
index 7e83ddc7b..94559d506 100644
--- a/src/Web/WebStatus/WebStatus.csproj
+++ b/src/Web/WebStatus/WebStatus.csproj
@@ -1,28 +1,27 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
..\..\..\docker-compose.dcproj
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/Web/WebhookClient/WebhookClient.csproj b/src/Web/WebhookClient/WebhookClient.csproj
index 895cbac54..51c99f974 100644
--- a/src/Web/WebhookClient/WebhookClient.csproj
+++ b/src/Web/WebhookClient/WebhookClient.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
InProcess
Linux
36215d41-f31a-4aa6-9929-bd67d650e7b5
diff --git a/src/_build/dependencies.props b/src/_build/dependencies.props
new file mode 100644
index 000000000..33a049c2d
--- /dev/null
+++ b/src/_build/dependencies.props
@@ -0,0 +1,81 @@
+
+
+ netstandard2.1
+ netcoreapp3.0
+ 15.8.0
+ latest
+
+
+
+ 2.1.1
+ 2.1.1
+
+
+
+ 2.9.406
+
+
+
+ 0.1.22-pre1
+ 3.9.0-rc1
+ 1.22.0
+
+ 2.2.0
+ 2.2.0
+ 2.2.0
+ 2.2.0
+ 2.2.0
+ 2.2.22
+ 2.2.3
+ 2.2.2
+ 4.9.2
+ 4.2.1
+ 2.2.1
+ 2.6.1
+ 1.0.2
+ 2.2.0
+ 1.0.0
+ 2.2.0
+ 3.0.0
+ 4.5.0
+ 2.2.2
+ 2.2.2
+ 2.2.2
+ 2.2.2
+ 2.2.0
+ 2.2.0
+ 2.2.0
+ 2.2.0
+ 2.2.0
+ 2.2.0
+ 3.0.0-preview6.19304.6
+ 16.0.1
+ 2.5.0
+ 2.5.0
+ 2.5.0
+ 2.5.0
+ 4.10.1
+ 12.0.2
+ 12.0.1
+ 6.0.1
+ 5.0.1
+ 3.0.0-dev-00053
+ 2.1.3
+ 3.1.1-dev-00209
+ 3.1.1
+ 4.0.0
+ 4.2.1
+ 5.0.0-rc2
+ 4.3.0
+ 2.4.0
+ 2.4.0
+
+
+
+ https://github.com/dotnet-architecture/eShopOnContainers/blob/master/LICENSE
+ https://github.com/dotnet-architecture/eShopOnContainers
+ https://github.com/dotnet-architecture/eShopOnContainers
+ Microsoft
+
+
+
\ No newline at end of file
diff --git a/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj b/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj
index 1d7ebd5a5..cd16dfad1 100644
--- a/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj
+++ b/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ $(NetCoreTargetVersion)
true
false
false
@@ -67,9 +67,9 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers