Skip to content

Commit 30347e1

Browse files
gpaillergpailler
committed
Merge branch 'develop'
2 parents 98a53ba + 4211af4 commit 30347e1

27 files changed

+640
-418
lines changed

‎MegaApiClient-3.5/MegaApiClient-3.5.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<Compile Include="..\MegaApiClient\Extensions.cs">
7676
<Link>Extensions.cs</Link>
7777
</Compile>
78+
<Compile Include="..\MegaApiClient\IAccountInformation.cs">
79+
<Link>IAccountInformation.cs</Link>
80+
</Compile>
7881
<Compile Include="..\MegaApiClient\IMegaApiClient.cs">
7982
<Link>IMegaApiClient.cs</Link>
8083
</Compile>

‎MegaApiClient-4.0/MegaApiClient-4.0.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<Compile Include="..\MegaApiClient\Extensions.cs">
7676
<Link>Extensions.cs</Link>
7777
</Compile>
78+
<Compile Include="..\MegaApiClient\IAccountInformation.cs">
79+
<Link>IAccountInformation.cs</Link>
80+
</Compile>
7881
<Compile Include="..\MegaApiClient\IMegaApiClient.cs">
7982
<Link>IMegaApiClient.cs</Link>
8083
</Compile>

‎MegaApiClient-4.5/MegaApiClient-4.5.csproj‎

Lines changed: 122 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,129 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{19D28272-9DDB-4868-93E7-D98DCFAE08E9}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>CG.Web.MegaApiClient</RootNamespace>
11-
<AssemblyName>MegaApiClient</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
15-
<RestorePackages>true</RestorePackages>
16-
<TargetFrameworkProfile />
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<PlatformTarget>AnyCPU</PlatformTarget>
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>TRACE;DEBUG</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>1</WarningLevel>
27-
<DocumentationFile>bin\Debug\MegaApiClient.XML</DocumentationFile>
28-
<Prefer32Bit>false</Prefer32Bit>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31-
<PlatformTarget>AnyCPU</PlatformTarget>
32-
<DebugType>pdbonly</DebugType>
33-
<Optimize>true</Optimize>
34-
<OutputPath>bin\Release\</OutputPath>
35-
<DefineConstants>TRACE</DefineConstants>
36-
<ErrorReport>prompt</ErrorReport>
37-
<WarningLevel>4</WarningLevel>
38-
<DocumentationFile>bin\Release\MegaApiClient.xml</DocumentationFile>
39-
<NoWarn>1591</NoWarn>
40-
<Prefer32Bit>false</Prefer32Bit>
41-
</PropertyGroup>
42-
<PropertyGroup>
43-
<SignAssembly>true</SignAssembly>
44-
</PropertyGroup>
45-
<PropertyGroup>
46-
<AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
47-
</PropertyGroup>
48-
<PropertyGroup>
49-
<StartupObject />
50-
</PropertyGroup>
51-
<ItemGroup>
52-
<Reference Include="Newtonsoft.Json">
53-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
54-
</Reference>
55-
<Reference Include="System" />
56-
<Reference Include="System.Core" />
57-
<Reference Include="System.Data" />
58-
<Reference Include="System.Web" />
59-
</ItemGroup>
60-
<ItemGroup>
61-
<None Include="..\key.snk">
62-
<Link>Properties\key.snk</Link>
63-
</None>
64-
<None Include="App.config" />
65-
<None Include="packages.config" />
66-
</ItemGroup>
67-
<ItemGroup>
68-
<Compile Include="..\MegaApiClient\BigInteger.cs">
69-
<Link>BigInteger.cs</Link>
70-
</Compile>
71-
<Compile Include="..\MegaApiClient\Crypto.cs">
72-
<Link>Crypto.cs</Link>
73-
</Compile>
74-
<Compile Include="..\MegaApiClient\Exceptions.cs">
75-
<Link>Exceptions.cs</Link>
76-
</Compile>
77-
<Compile Include="..\MegaApiClient\Extensions.cs">
78-
<Link>Extensions.cs</Link>
79-
</Compile>
80-
<Compile Include="..\MegaApiClient\IMegaApiClient.cs">
81-
<Link>IMegaApiClient.cs</Link>
82-
</Compile>
83-
<Compile Include="..\MegaApiClient\IMegaApiClientAsync.cs">
84-
<Link>IMegaApiClientAsync.cs</Link>
85-
</Compile>
86-
<Compile Include="..\MegaApiClient\INode.cs">
87-
<Link>INode.cs</Link>
88-
</Compile>
89-
<Compile Include="..\MegaApiClient\IWebClient.cs">
90-
<Link>IWebClient.cs</Link>
91-
</Compile>
92-
<Compile Include="..\MegaApiClient\JsonSerialization.cs">
93-
<Link>JsonSerialization.cs</Link>
94-
</Compile>
95-
<Compile Include="..\MegaApiClient\MegaAesCtrStream.cs">
96-
<Link>MegaAesCtrStream.cs</Link>
97-
</Compile>
98-
<Compile Include="..\MegaApiClient\MegaApiClient.cs">
99-
<Link>MegaApiClient.cs</Link>
100-
</Compile>
101-
<Compile Include="..\MegaApiClient\MegaApiClientAsync.cs">
102-
<Link>MegaApiClientAsync.cs</Link>
103-
</Compile>
104-
<Compile Include="..\MegaApiClient\Node.cs">
105-
<Link>Node.cs</Link>
106-
</Compile>
107-
<Compile Include="..\MegaApiClient\ProgressionStream.cs">
108-
<Link>ProgressionStream.cs</Link>
109-
</Compile>
110-
<Compile Include="..\MegaApiClient\Properties\AssemblyInfo.cs">
111-
<Link>Properties\AssemblyInfo.cs</Link>
112-
</Compile>
113-
<Compile Include="..\MegaApiClient\WebClient.cs">
114-
<Link>WebClient.cs</Link>
115-
</Compile>
116-
</ItemGroup>
117-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
118-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{19D28272-9DDB-4868-93E7-D98DCFAE08E9}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>CG.Web.MegaApiClient</RootNamespace>
11+
<AssemblyName>MegaApiClient</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
15+
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
17+
</PropertyGroup>
18+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19+
<PlatformTarget>AnyCPU</PlatformTarget>
20+
<DebugSymbols>true</DebugSymbols>
21+
<DebugType>full</DebugType>
22+
<Optimize>false</Optimize>
23+
<OutputPath>bin\Debug\</OutputPath>
24+
<DefineConstants>TRACE;DEBUG</DefineConstants>
25+
<ErrorReport>prompt</ErrorReport>
26+
<WarningLevel>1</WarningLevel>
27+
<DocumentationFile>bin\Debug\MegaApiClient.XML</DocumentationFile>
28+
<Prefer32Bit>false</Prefer32Bit>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31+
<PlatformTarget>AnyCPU</PlatformTarget>
32+
<DebugType>pdbonly</DebugType>
33+
<Optimize>true</Optimize>
34+
<OutputPath>bin\Release\</OutputPath>
35+
<DefineConstants>TRACE</DefineConstants>
36+
<ErrorReport>prompt</ErrorReport>
37+
<WarningLevel>4</WarningLevel>
38+
<DocumentationFile>bin\Release\MegaApiClient.xml</DocumentationFile>
39+
<NoWarn>1591</NoWarn>
40+
<Prefer32Bit>false</Prefer32Bit>
41+
</PropertyGroup>
42+
<PropertyGroup>
43+
<SignAssembly>true</SignAssembly>
44+
</PropertyGroup>
45+
<PropertyGroup>
46+
<AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
47+
</PropertyGroup>
48+
<PropertyGroup>
49+
<StartupObject />
50+
</PropertyGroup>
51+
<ItemGroup>
52+
<Reference Include="Newtonsoft.Json">
53+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
54+
</Reference>
55+
<Reference Include="System" />
56+
<Reference Include="System.Core" />
57+
<Reference Include="System.Data" />
58+
<Reference Include="System.Web" />
59+
</ItemGroup>
60+
<ItemGroup>
61+
<None Include="..\key.snk">
62+
<Link>Properties\key.snk</Link>
63+
</None>
64+
<None Include="App.config" />
65+
<None Include="packages.config" />
66+
</ItemGroup>
67+
<ItemGroup>
68+
<Compile Include="..\MegaApiClient\BigInteger.cs">
69+
<Link>BigInteger.cs</Link>
70+
</Compile>
71+
<Compile Include="..\MegaApiClient\Crypto.cs">
72+
<Link>Crypto.cs</Link>
73+
</Compile>
74+
<Compile Include="..\MegaApiClient\Exceptions.cs">
75+
<Link>Exceptions.cs</Link>
76+
</Compile>
77+
<Compile Include="..\MegaApiClient\Extensions.cs">
78+
<Link>Extensions.cs</Link>
79+
</Compile>
80+
<Compile Include="..\MegaApiClient\IAccountInformation.cs">
81+
<Link>IAccountInformation.cs</Link>
82+
</Compile>
83+
<Compile Include="..\MegaApiClient\IMegaApiClient.cs">
84+
<Link>IMegaApiClient.cs</Link>
85+
</Compile>
86+
<Compile Include="..\MegaApiClient\IMegaApiClientAsync.cs">
87+
<Link>IMegaApiClientAsync.cs</Link>
88+
</Compile>
89+
<Compile Include="..\MegaApiClient\INode.cs">
90+
<Link>INode.cs</Link>
91+
</Compile>
92+
<Compile Include="..\MegaApiClient\IWebClient.cs">
93+
<Link>IWebClient.cs</Link>
94+
</Compile>
95+
<Compile Include="..\MegaApiClient\JsonSerialization.cs">
96+
<Link>JsonSerialization.cs</Link>
97+
</Compile>
98+
<Compile Include="..\MegaApiClient\MegaAesCtrStream.cs">
99+
<Link>MegaAesCtrStream.cs</Link>
100+
</Compile>
101+
<Compile Include="..\MegaApiClient\MegaApiClient.cs">
102+
<Link>MegaApiClient.cs</Link>
103+
</Compile>
104+
<Compile Include="..\MegaApiClient\MegaApiClientAsync.cs">
105+
<Link>MegaApiClientAsync.cs</Link>
106+
</Compile>
107+
<Compile Include="..\MegaApiClient\Node.cs">
108+
<Link>Node.cs</Link>
109+
</Compile>
110+
<Compile Include="..\MegaApiClient\ProgressionStream.cs">
111+
<Link>ProgressionStream.cs</Link>
112+
</Compile>
113+
<Compile Include="..\MegaApiClient\Properties\AssemblyInfo.cs">
114+
<Link>Properties\AssemblyInfo.cs</Link>
115+
</Compile>
116+
<Compile Include="..\MegaApiClient\WebClient.cs">
117+
<Link>WebClient.cs</Link>
118+
</Compile>
119+
</ItemGroup>
120+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
121+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
119122
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
120123
Other similar extension points exist, see Microsoft.Common.targets.
121124
<Target Name="BeforeBuild">
122125
</Target>
123126
<Target Name="AfterBuild">
124127
</Target>
125-
-->
128+
-->
126129
</Project>

0 commit comments

Comments
 (0)