Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-uwp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-uwp
Commits
3ca06c9c
Commit
3ca06c9c
authored
8 years ago
by
Nicolas Jager
Browse files
Options
Downloads
Patches
Plain Diff
packaging : add redist to client
Change-Id: I10ca330e49d1a84f4ba69030e738c7cf72f7433f Tuleap: #1222
parent
e872d0e2
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
Package.appxmanifest
+1
-1
1 addition, 1 deletion
Package.appxmanifest
ring-client-uwp.sln
+0
-20
0 additions, 20 deletions
ring-client-uwp.sln
ring-client-uwp.vcxproj
+8
-2
8 additions, 2 deletions
ring-client-uwp.vcxproj
ring-client-uwp.vcxproj.filters
+6
-0
6 additions, 0 deletions
ring-client-uwp.vcxproj.filters
with
15 additions
and
23 deletions
Package.appxmanifest
+
1
−
1
View file @
3ca06c9c
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns=
"http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp=
"http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap=
"http://schemas.microsoft.com/appx/manifest/uap/windows10"
IgnorableNamespaces=
"uap mp"
>
<Identity
Name=
"ring-client-uwp-multi-device"
Publisher=
"CN=
SFL
"
Version=
"1.0.0.0"
/>
<Identity
Name=
"ring-client-uwp-multi-device"
Publisher=
"CN=
user
"
Version=
"1.0.0.0"
/>
<mp:PhoneIdentity
PhoneProductId=
"2385953f-9019-423d-aa82-d1bbacfa258b"
PhonePublisherId=
"00000000-0000-0000-0000-000000000000"
/>
<Properties>
<DisplayName>
ring-client-uwp
</DisplayName>
...
...
This diff is collapsed.
Click to expand it.
ring-client-uwp.sln
+
0
−
20
View file @
3ca06c9c
...
...
@@ -7,36 +7,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-client-uwp", "ring-cli
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\ring-daemon\MSVC\ring-daemon.vcxproj", "{79F8DE42-595D-49D9-A66F-55244FD9DCC3}"
ProjectSection(ProjectDependencies) = postProject
{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}
{2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
{1E6C2C1C-6453-4129-AE3F-0EE8E6599C89} = {1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}
{2A3F241E-682C-47E1-9543-DC28708B406A} = {2A3F241E-682C-47E1-9543-DC28708B406A}
{4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D}
{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}
{B82CDD25-6903-430E-BD38-D8129A2015C1} = {B82CDD25-6903-430E-BD38-D8129A2015C1}
{0C4EAC26-4AAC-3525-BA45-916F44CFD660} = {0C4EAC26-4AAC-3525-BA45-916F44CFD660}
{C00D492D-9474-4F78-80BF-86F6F337E81B} = {C00D492D-9474-4F78-80BF-86F6F337E81B}
{0DC9504B-4FF5-4590-97B3-FFD4C04F2893} = {0DC9504B-4FF5-4590-97B3-FFD4C04F2893}
{4281CA5E-1D48-45D4-A991-2718A454B4BA} = {4281CA5E-1D48-45D4-A991-2718A454B4BA}
{0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99}
{FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
{6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}
{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
{23D7679C-764C-4E02-8B29-BB882CEEEFE2} = {23D7679C-764C-4E02-8B29-BB882CEEEFE2}
{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}
{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
{711397CE-E5D5-467D-9457-8716C047E50C} = {711397CE-E5D5-467D-9457-8716C047E50C}
{B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
{65B6B9E6-4D10-484B-BD8A-156FCA00DD4A} = {65B6B9E6-4D10-484B-BD8A-156FCA00DD4A}
{DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
{A1989FF3-9894-40F4-B5A6-6EA364476E45} = {A1989FF3-9894-40F4-B5A6-6EA364476E45}
{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}
{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
{E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{96846C59-E0A1-4132-B779-065C2EAE3E51}"
...
...
This diff is collapsed.
Click to expand it.
ring-client-uwp.vcxproj
+
8
−
2
View file @
3ca06c9c
...
...
@@ -102,8 +102,8 @@
<AppxSymbolPackageEnabled>
False
</AppxSymbolPackageEnabled>
<AppxBundle>
Always
</AppxBundle>
<AppxBundlePlatforms>
x64
</AppxBundlePlatforms>
<PackageCertificateThumbprint>
1
15755ECEE36DEA516C910E0534B36F7ACAC690B
</PackageCertificateThumbprint>
<AppxPackageDir>
C:\Users\
andreas.traczyk
\Desktop\
</AppxPackageDir>
<PackageCertificateThumbprint>
1
3DE1E90818B523E210522CE40C78F2AD099C412
</PackageCertificateThumbprint>
<AppxPackageDir>
C:\Users\
user
\Desktop\
</AppxPackageDir>
</PropertyGroup>
<ItemDefinitionGroup
Condition=
"'$(Configuration)|$(Platform)'=='Debug|ARM'"
>
<ClCompile>
...
...
@@ -253,6 +253,12 @@
<None
Include=
"..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swscale-4.dll"
>
<DeploymentContent
Condition=
"'$(Configuration)|$(Platform)'=='Release|x64'"
>
true
</DeploymentContent>
</None>
<None
Include=
"..\ring-daemon\contrib\redist\msvcr100.dll"
>
<DeploymentContent
Condition=
"'$(Configuration)|$(Platform)'=='Release|x64'"
>
true
</DeploymentContent>
</None>
<None
Include=
"..\ring-daemon\contrib\redist\pthreadVC2.dll"
>
<DeploymentContent
Condition=
"'$(Configuration)|$(Platform)'=='Release|x64'"
>
true
</DeploymentContent>
</None>
<None
Include=
"ring-client-uwp_TemporaryKey.pfx"
/>
</ItemGroup>
<ItemGroup>
...
...
This diff is collapsed.
Click to expand it.
ring-client-uwp.vcxproj.filters
+
6
−
0
View file @
3ca06c9c
...
...
@@ -241,6 +241,12 @@
<None
Include=
"..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin\swscale-4.dll"
>
<Filter>
Assets\Dlls
</Filter>
</None>
<None
Include=
"..\ring-daemon\contrib\redist\msvcr100.dll"
>
<Filter>
Assets\Dlls
</Filter>
</None>
<None
Include=
"..\ring-daemon\contrib\redist\pthreadVC2.dll"
>
<Filter>
Assets\Dlls
</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Page
Include=
"MainPage.xaml"
/>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment