Various fixes.

GitOrigin-RevId: e96c9e6f8f159f91ec31288e36edfb5869603341
This commit is contained in:
levlam 2018-03-06 19:27:52 +03:00
parent bc75542960
commit 41bd7c7428
12 changed files with 25 additions and 13 deletions

10
.gitattributes vendored
View File

@ -17,7 +17,17 @@
*.java text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent *.java text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
*.py text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent *.py text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
*.swift text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent *.swift text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
*.cs text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
*.xaml text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
*.appxmanifest text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
*.json text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
*.csproj text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
*.sln text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
*.xml text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
sqlite/sqlite/* linguist-vendored sqlite/sqlite/* linguist-vendored
*.tlo binary *.tlo binary
*.pfx binary
*.png binary

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<FileList <FileList
DisplayName="TDLib for Universal Windows Platfrom" DisplayName="TDLib for Universal Windows Platform"
ProductFamilyName="TDLib.UWP" ProductFamilyName="TDLib.UWP"
MoreInfo="https://core.telegram.org/tdlib" MoreInfo="https://core.telegram.org/tdlib"
MinVSVersion="14.0" MinVSVersion="14.0"

View File

@ -4,5 +4,4 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:TdApp" xmlns:local="using:TdApp"
RequestedTheme="Light"> RequestedTheme="Light">
</Application> </Application>

View File

@ -22,7 +22,7 @@
<Button Grid.Column="1" x:Name="Send" Content="send" Click="Button_Click"/> <Button Grid.Column="1" x:Name="Send" Content="send" Click="Button_Click"/>
</Grid> </Grid>
<ListBox Grid.Row="1" x:Name="ItemsControl" ItemsSource="{Binding Items, ElementName=Self}"> <ListBox Grid.Row="1" x:Name="ItemsControl" ItemsSource="{Binding Items, ElementName=Self}">
</ListBox> </ListBox>
<!--<Button Content="Test" Click="Button_Click"/>--> <!--<Button Content="Test" Click="Button_Click"/>-->
</Grid> </Grid>

View File

@ -2,7 +2,7 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("App2")] [assembly: AssemblyTitle("App2")]
@ -10,18 +10,18 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("App2")] [assembly: AssemblyProduct("App2")]
[assembly: AssemblyCopyright("Copyright © 2015-2017")] [assembly: AssemblyCopyright("Copyright © 2015-2018")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
// Minor Version // Minor Version
// Build Number // Build Number
// Revision // Revision
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.0.0")]

View File

@ -22,8 +22,8 @@
the application package. The asterisks are not wildcards. the application package. The asterisks are not wildcards.
--> -->
<Assembly Name="*Application*" Dynamic="Required All" /> <Assembly Name="*Application*" Dynamic="Required All" />
<!-- Add your application specific runtime directives here. --> <!-- Add your application specific runtime directives here. -->

View File

@ -141,7 +141,7 @@
<VisualStudioVersion>14.0</VisualStudioVersion> <VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
</Target> </Target>

View File

@ -15,6 +15,7 @@
#include "td/telegram/telegram_api.h" #include "td/telegram/telegram_api.h"
#include "td/utils/base64.h" #include "td/utils/base64.h"
#include "td/utils/buffer.h"
#include "td/utils/format.h" #include "td/utils/format.h"
#include "td/utils/JsonBuilder.h" #include "td/utils/JsonBuilder.h"
#include "td/utils/logging.h" #include "td/utils/logging.h"

View File

@ -10,6 +10,7 @@
#include "td/utils/common.h" #include "td/utils/common.h"
#include "td/utils/filesystem.h" #include "td/utils/filesystem.h"
#include "td/utils/format.h"
#include "td/utils/logging.h" #include "td/utils/logging.h"
namespace td { namespace td {

View File

@ -129,6 +129,7 @@ set(TDUTILS_SOURCE
td/utils/common.h td/utils/common.h
td/utils/Container.h td/utils/Container.h
td/utils/crypto.h td/utils/crypto.h
td/utils/Enumerator.h
td/utils/FileLog.h td/utils/FileLog.h
td/utils/filesystem.h td/utils/filesystem.h
td/utils/find_boundary.h td/utils/find_boundary.h

View File

@ -5,10 +5,13 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
// //
#pragma once #pragma once
#include "td/utils/common.h" #include "td/utils/common.h"
#include "td/utils/logging.h"
#include "td/utils/misc.h" #include "td/utils/misc.h"
#include <set> #include <set>
#include <utility>
namespace td { namespace td {

View File

@ -5,9 +5,6 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
// //
#include "td/utils/Enumerator.h" #include "td/utils/Enumerator.h"
#include "td/utils/logging.h"
#include "td/utils/port/thread.h"
#include "td/utils/Random.h"
#include "td/utils/tests.h" #include "td/utils/tests.h"
TEST(Enumerator, simple) { TEST(Enumerator, simple) {