Skip to content

Commit

Permalink
Upgrade attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
oferns committed Apr 13, 2017
1 parent fa4a4c6 commit 81ca578
Show file tree
Hide file tree
Showing 24 changed files with 209 additions and 142 deletions.
56 changes: 55 additions & 1 deletion eShopOnContainers.sln
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\common\Guard.cs" Link="Internal\Guard.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.1.1" />
<ProjectReference Include="..\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<TargetFramework>netstandard1.6</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<TargetFramework>netstandard1.6</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\common\Guard.cs" Link="Internal\Guard.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
<PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.4</TargetFramework>
<TargetFramework>netstandard1.6</TargetFramework>
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<PackageReference Include="Polly" Version="5.0.6" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="NETStandard.Library" Version="1.6.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -175,35 +175,28 @@
<ItemGroup>
<Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.Interface.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-256\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Forms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Platform.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="IdentityModel.Portable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.2-beta1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Plugin.Settings, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.dll</HintPath>
Expand Down Expand Up @@ -235,19 +228,15 @@
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Pages, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10\Xamarin.Forms.Pages.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -339,13 +328,13 @@
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
</Target>
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<package id="System.Globalization" version="4.0.11" targetFramework="monoandroid70" />
<package id="System.IO" version="4.1.0" targetFramework="monoandroid70" />
<package id="System.Linq" version="4.1.0" targetFramework="monoandroid70" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="monoandroid70" />
<package id="System.Linq.Expressions" version="4.1.1" targetFramework="monoandroid60" />
<package id="System.ObjectModel" version="4.0.12" targetFramework="monoandroid70" />
<package id="System.Reflection" version="4.1.0" targetFramework="monoandroid70" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="monoandroid70" />
Expand Down
4 changes: 2 additions & 2 deletions src/Services/Basket/Basket.API/Basket.API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
<PackageReference Include="StackExchange.Redis" Version="1.1.608" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="StackExchange.Redis" Version="1.2.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.0.1-rc3" />
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Services/Catalog/Catalog.API/Catalog.API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 81ca578

Please sign in to comment.