# Conflicts SOLVED:
#	.gitignore
#	src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
#	src/Services/Basket/Basket.API/Basket.API.csproj
#	src/Services/Basket/Basket.API/Program.cs
#	src/Services/Basket/Basket.API/Startup.cs
#	src/Services/Catalog/Catalog.API/Catalog.API.csproj
#	src/Services/Catalog/Catalog.API/Program.cs
#	src/Services/Catalog/Catalog.API/Startup.cs
#	src/Services/Identity/Identity.API/Identity.API.csproj
#	src/Services/Identity/Identity.API/Program.cs
#	src/Services/Identity/Identity.API/Startup.cs
#	src/Services/Location/Locations.API/Locations.API.csproj
#	src/Services/Location/Locations.API/Program.cs
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Program.cs
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Services/Ordering/Ordering.API/Ordering.API.csproj
#	src/Services/Ordering/Ordering.API/Program.cs
#	src/Services/Ordering/Ordering.API/Startup.cs
#	src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
#	src/Services/Ordering/Ordering.SignalrHub/Program.cs
#	src/Services/Ordering/Ordering.SignalrHub/Startup.cs
#	src/Services/Payment/Payment.API/Payment.API.csproj
#	src/Services/Payment/Payment.API/Program.cs
#	src/Services/Payment/Payment.API/Startup.cs
#	src/Web/WebMVC/Program.cs
#	src/Web/WebMVC/Startup.cs
#	src/Web/WebStatus/Program.cs
#	src/Web/WebStatus/Startup.cs
#	src/Web/WebStatus/WebStatus.csproj

package actualization and some obsolete api replacement

replace preview apis with production
replace EnableKubernetes with AddApplicationInsightsKubernetesEnricher
replace  loggerFactory.AddAzureWebAppDiagnostics(); with  loggerBuilder.AddAzureWebAppDiagnostics();

Include files rebuilt by bundling and minification upon opening VS

This reverts commit 21427ebc35.

Matching MinOSVersion to the same in eShopOnContainers.iOS/Info.plist. Required for successful builds given the currently set architectures.

merge origin to fork

typo