Skip to content

Commit

Permalink
Updated LIME
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrebires
andrebires committed Dec 21, 2017
1 parent 7abef2b commit 46679ab
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 64 deletions.
31 changes: 3 additions & 28 deletions src/Lime.Client.TestConsole.Setup/Lime.Client.TestConsole.Setup.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1935,11 +1935,6 @@
"AssemblyAsmDisplayName" = "8:Lime.Transport.Tcp, Version=0.7.194.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_32A5BAFDA52FC8B8B0267371442DF3ED"
{
"Name" = "8:Lime.Transport.Tcp.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Lime.Transport.Tcp.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -2513,11 +2508,6 @@
"AssemblyAsmDisplayName" = "8:Lime.Messaging, Version=0.7.194.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_6CE274FB466BE086E201C738A8BC4287"
{
"Name" = "8:Lime.Messaging.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Lime.Messaging.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -3009,11 +2999,6 @@
"AssemblyAsmDisplayName" = "8:Lime.Protocol.Serialization, Version=0.7.194.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_9B80866BDE8C255B16300AD7C9955CBA"
{
"Name" = "8:Lime.Protocol.Serialization.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Lime.Protocol.Serialization.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -3762,11 +3747,6 @@
"AssemblyAsmDisplayName" = "8:Lime.Transport.WebSocket, Version=0.7.194.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_F6EC4762C43CDFF772CBBBC7E20B0C01"
{
"Name" = "8:Lime.Transport.WebSocket.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Lime.Transport.WebSocket.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -3917,11 +3897,6 @@
"AssemblyAsmDisplayName" = "8:Lime.Protocol, Version=0.7.194.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_F88F8EE27D9F001E93D2A5C79428D155"
{
"Name" = "8:Lime.Protocol.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Lime.Protocol.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -4092,15 +4067,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:LIME Test Console"
"ProductCode" = "8:{186D14E2-2F5A-4248-AF29-9C0F58D7FDCA}"
"PackageCode" = "8:{477C1ADF-020C-4326-89C6-610F527E8823}"
"ProductCode" = "8:{1CA2389A-37A6-4658-8A6A-4B9FA2947A38}"
"PackageCode" = "8:{6B3A5951-FF67-4B3F-B317-8E71E71AF0D1}"
"UpgradeCode" = "8:{B9AD92D4-F4EB-4A05-A4FC-EF185D868EE3}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:1.0.2"
"ProductVersion" = "8:1.0.3"
"Manufacturer" = "8:LIME Protocol"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down
20 changes: 10 additions & 10 deletions src/Lime.Client.TestConsole/Lime.Client.TestConsole.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,20 @@
<HintPath>..\packages\MvvmLightLibs.4.4.32.7\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lime.Messaging, Version=0.7.194.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Messaging.0.7.194-beta\lib\net461\Lime.Messaging.dll</HintPath>
<Reference Include="Lime.Messaging, Version=0.7.252.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Messaging.0.7.252-beta\lib\net461\Lime.Messaging.dll</HintPath>
</Reference>
<Reference Include="Lime.Protocol, Version=0.7.194.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Protocol.0.7.194-beta\lib\net461\Lime.Protocol.dll</HintPath>
<Reference Include="Lime.Protocol, Version=0.7.252.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Protocol.0.7.252-beta\lib\net461\Lime.Protocol.dll</HintPath>
</Reference>
<Reference Include="Lime.Protocol.Serialization, Version=0.7.194.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Protocol.Serialization.0.7.194-beta\lib\net461\Lime.Protocol.Serialization.dll</HintPath>
<Reference Include="Lime.Protocol.Serialization, Version=0.7.252.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Protocol.Serialization.0.7.252-beta\lib\net461\Lime.Protocol.Serialization.dll</HintPath>
</Reference>
<Reference Include="Lime.Transport.Tcp, Version=0.7.194.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Transport.Tcp.0.7.194-beta\lib\net461\Lime.Transport.Tcp.dll</HintPath>
<Reference Include="Lime.Transport.Tcp, Version=0.7.252.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Transport.Tcp.0.7.252-beta\lib\net461\Lime.Transport.Tcp.dll</HintPath>
</Reference>
<Reference Include="Lime.Transport.WebSocket, Version=0.7.194.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Transport.WebSocket.0.7.194-beta\lib\net461\Lime.Transport.WebSocket.dll</HintPath>
<Reference Include="Lime.Transport.WebSocket, Version=0.7.252.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Transport.WebSocket.0.7.252-beta\lib\net461\Lime.Transport.WebSocket.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
Expand Down
3 changes: 2 additions & 1 deletion src/Lime.Client.TestConsole/Templates.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ Set group Command {"id":"%commandId","method":"set","type":"application/vnd.lime
Get group members Command {"id":"%commandId","method":"get","uri": "/groups/%groupIdentity/members"}
Set group member Command {"id":"%commandId","method":"set","type":"application/vnd.lime.groupmember+json","uri": "/groups/%groupIdentity/members","resource":{"address":"%groupMemberAddress","role":"%groupMemberRole"}}
Get contacts Command {"id":"%commandId","method":"get","uri": "/contacts"}
Set contact Command {"id":"%commandId","method":"set","type":"application/vnd.lime.contact+json","uri":"/contacts","resource":{"identity":"%contactIdentity","name":"%contactName","sharePresence":true,"shareAccountInfo":true}}
Set contact Command {"id":"%commandId","method":"set","type":"application/vnd.lime.contact+json","uri":"/contacts","resource":{"identity":"%contactIdentity","name":"%contactName","email","%contactEmail","sharePresence":true,"shareAccountInfo":true}}
Merge contact Command {"id":"%commandId","method":"merge","type":"application/vnd.lime.contact+json","uri":"/contacts","resource":{"identity":"%contactIdentity","name":"%contactName"}}
Delete contact Command {"id":"%commandId","method":"delete","uri": "/contacts/%contactIdentity"}
Set location Command {"id": "%commandId","to":"[email protected]","method":"set","type":"application/vnd.lime.location+json","uri":"/location","resource":{"latitude":10.1,"longitude":10.2}}
Get location Command {"id": "%commandId","to":"[email protected]","method":"get","type":"application/vnd.lime.location+json","uri":"/location"}
Expand Down
10 changes: 5 additions & 5 deletions src/Lime.Client.TestConsole/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<packages>
<package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
<package id="Extended.Wpf.Toolkit" version="2.2.0" targetFramework="net461" />
<package id="Lime.Messaging" version="0.7.194-beta" targetFramework="net461" />
<package id="Lime.Protocol" version="0.7.194-beta" targetFramework="net461" />
<package id="Lime.Protocol.Serialization" version="0.7.194-beta" targetFramework="net461" />
<package id="Lime.Transport.Tcp" version="0.7.194-beta" targetFramework="net461" />
<package id="Lime.Transport.WebSocket" version="0.7.194-beta" targetFramework="net461" />
<package id="Lime.Messaging" version="0.7.252-beta" targetFramework="net461" />
<package id="Lime.Protocol" version="0.7.252-beta" targetFramework="net461" />
<package id="Lime.Protocol.Serialization" version="0.7.252-beta" targetFramework="net461" />
<package id="Lime.Transport.Tcp" version="0.7.252-beta" targetFramework="net461" />
<package id="Lime.Transport.WebSocket" version="0.7.252-beta" targetFramework="net461" />
<package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net461" />
<package id="MvvmLightLibs" version="4.4.32.7" targetFramework="net461" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
Expand Down
28 changes: 13 additions & 15 deletions src/Lime.Client.Windows/Lime.Client.Windows.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,25 +92,20 @@
<HintPath>..\packages\MvvmLightLibs.4.4.32.7\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lime.Messaging, Version=0.7.90.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Messaging.0.7.90-beta\lib\net461\Lime.Messaging.dll</HintPath>
<Private>True</Private>
<Reference Include="Lime.Messaging, Version=0.7.252.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Messaging.0.7.252-beta\lib\net461\Lime.Messaging.dll</HintPath>
</Reference>
<Reference Include="Lime.Protocol, Version=0.7.90.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Protocol.0.7.90-beta\lib\net461\Lime.Protocol.dll</HintPath>
<Private>True</Private>
<Reference Include="Lime.Protocol, Version=0.7.252.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Protocol.0.7.252-beta\lib\net461\Lime.Protocol.dll</HintPath>
</Reference>
<Reference Include="Lime.Protocol.Serialization, Version=0.7.90.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Protocol.Serialization.0.7.90-beta\lib\net461\Lime.Protocol.Serialization.dll</HintPath>
<Private>True</Private>
<Reference Include="Lime.Protocol.Serialization, Version=0.7.252.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Protocol.Serialization.0.7.252-beta\lib\net461\Lime.Protocol.Serialization.dll</HintPath>
</Reference>
<Reference Include="Lime.Transport.Tcp, Version=0.7.90.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Transport.Tcp.0.7.90-beta\lib\net461\Lime.Transport.Tcp.dll</HintPath>
<Private>True</Private>
<Reference Include="Lime.Transport.Tcp, Version=0.7.252.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Transport.Tcp.0.7.252-beta\lib\net461\Lime.Transport.Tcp.dll</HintPath>
</Reference>
<Reference Include="Lime.Transport.WebSocket, Version=0.7.90.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Transport.WebSocket.0.7.90-beta\lib\net461\Lime.Transport.WebSocket.dll</HintPath>
<Private>True</Private>
<Reference Include="Lime.Transport.WebSocket, Version=0.7.252.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lime.Transport.WebSocket.0.7.252-beta\lib\net461\Lime.Transport.WebSocket.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
Expand All @@ -133,6 +128,9 @@
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.3.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net" />
Expand Down
11 changes: 6 additions & 5 deletions src/Lime.Client.Windows/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
<packages>
<package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
<package id="Extended.Wpf.Toolkit" version="2.1.0" targetFramework="net461" />
<package id="Lime.Messaging" version="0.7.90-beta" targetFramework="net461" />
<package id="Lime.Protocol" version="0.7.90-beta" targetFramework="net461" />
<package id="Lime.Protocol.Serialization" version="0.7.90-beta" targetFramework="net461" />
<package id="Lime.Transport.Tcp" version="0.7.90-beta" targetFramework="net461" />
<package id="Lime.Transport.WebSocket" version="0.7.90-beta" targetFramework="net461" />
<package id="Lime.Messaging" version="0.7.252-beta" targetFramework="net461" />
<package id="Lime.Protocol" version="0.7.252-beta" targetFramework="net461" />
<package id="Lime.Protocol.Serialization" version="0.7.252-beta" targetFramework="net461" />
<package id="Lime.Transport.Tcp" version="0.7.252-beta" targetFramework="net461" />
<package id="Lime.Transport.WebSocket" version="0.7.252-beta" targetFramework="net461" />
<package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net461" />
<package id="ModernUI.WPF.NoBackButton" version="1.0.5.1-alpha" targetFramework="net461" />
<package id="MvvmLightLibs" version="4.4.32.7" targetFramework="net461" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
<package id="SmartFormat.NET" version="2.0.0.0" targetFramework="net461" />
<package id="SslCertBinding.Net" version="1.0.2" targetFramework="net461" />
<package id="StackExchange.Redis" version="1.1.608" targetFramework="net461" />
<package id="System.Buffers" version="4.3.0" targetFramework="net461" />
</packages>

0 comments on commit 46679ab

Please sign in to comment.