diff --git a/eShopOnContainers.sln b/eShopOnContainers.sln index b8a28cbc3..160e32207 100644 --- a/eShopOnContainers.sln +++ b/eShopOnContainers.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.12 +VisualStudioVersion = 15.0.26403.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}" EndProject @@ -104,6 +104,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebStatus", "src\Web\WebSta EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "eShopWeb", "src\Web\WebMonolithic\eShopWeb\eShopWeb.csproj", "{7BBB3E78-6D7E-4BD2-899E-A4C44FF5C617}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resilience", "Resilience", "{2966745E-E165-4E3C-9E6F-54FA63D14394}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resilience.Http", "src\BuildingBlocks\Resilience\Resilience.Http\Resilience.Http.csproj", "{D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -1465,6 +1469,54 @@ Global {7BBB3E78-6D7E-4BD2-899E-A4C44FF5C617}.Release|x64.Build.0 = Release|Any CPU {7BBB3E78-6D7E-4BD2-899E-A4C44FF5C617}.Release|x86.ActiveCfg = Release|Any CPU {7BBB3E78-6D7E-4BD2-899E-A4C44FF5C617}.Release|x86.Build.0 = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|x64.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|ARM.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|iPhone.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|x64.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|x64.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|x86.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.AppStore|x86.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|ARM.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|ARM.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|iPhone.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|x64.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|x64.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|x86.ActiveCfg = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Debug|x86.Build.0 = Debug|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|Any CPU.Build.0 = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|ARM.ActiveCfg = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|ARM.Build.0 = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|iPhone.ActiveCfg = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|iPhone.Build.0 = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|x64.ActiveCfg = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|x64.Build.0 = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|x86.ActiveCfg = Release|Any CPU + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1512,5 +1564,7 @@ Global {682AD4BC-F015-4E0F-AD47-F1333394A1F2} = {F1F86ED5-F1FB-45BA-950B-854AC716DB74} {4060BB6B-6FE8-4F05-9007-EC961FDAAACD} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} {7BBB3E78-6D7E-4BD2-899E-A4C44FF5C617} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04} + {2966745E-E165-4E3C-9E6F-54FA63D14394} = {1EF3AC0F-F27C-46DD-AC53-D762D2C11C45} + {D2FBB797-1FE3-495E-9F73-2C2F57DB3B31} = {2966745E-E165-4E3C-9E6F-54FA63D14394} EndGlobalSection EndGlobal diff --git a/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj b/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj index 62a414c17..ab542102b 100644 --- a/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj +++ b/src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj @@ -1,7 +1,7 @@  - netcoreapp1.0 + netcoreapp1.1 @@ -9,7 +9,7 @@ - + diff --git a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/Microsoft.Extensions.HealthChecks.Data.csproj b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/Microsoft.Extensions.HealthChecks.Data.csproj index 38cb3ffe3..488df4f09 100644 --- a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/Microsoft.Extensions.HealthChecks.Data.csproj +++ b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/Microsoft.Extensions.HealthChecks.Data.csproj @@ -1,7 +1,7 @@  - netstandard1.3 + netstandard1.6 diff --git a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj index 75eef991e..f6373556f 100644 --- a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj +++ b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj @@ -1,7 +1,7 @@  - netstandard1.3 + netstandard1.6 @@ -9,8 +9,8 @@ - - + + diff --git a/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj b/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj index 8f60105fc..cc632edc8 100644 --- a/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj +++ b/src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj @@ -1,14 +1,18 @@  - netstandard1.4 + netstandard1.6 Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http - - + + + + + + \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj index 68a795fe8..fe3f26e4a 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj @@ -175,27 +175,21 @@ ..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.dll - True ..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.Interface.dll - True ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.dll - True ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-256\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Forms.dll - True ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Platform.dll - True ..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll - True ..\..\..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll @@ -203,7 +197,6 @@ ..\..\..\..\packages\Newtonsoft.Json.9.0.2-beta1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - True ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.dll @@ -235,19 +228,15 @@ ..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll - True ..\..\..\..\packages\Xamarin.Forms.Pages.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10\Xamarin.Forms.Pages.dll - True ..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll - True ..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll - True @@ -339,13 +328,13 @@ + - Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. -