haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into copy-alphavss-dlls-for-debug-build

Browse Source
This commit is contained in:
BlueBlock
2019-09-11 12:23:05 -04:00
parent bc9abf4350 3608a36555
commit cf78bbdd4b
11 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -24,3 +24,4 @@ binfiles.wxs
.idea/
.vs/
Installer/debian/*.buildinfo
Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
+2 -2
View File
@@ -69,8 +69,8 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="CoCoL, Version=1.5.0.19417, Culture=neutral, PublicKeyToken=0983de3c914beeaa, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\CoCoL.1.6.1\lib\net45\CoCoL.dll</HintPath>
<Reference Include="CoCoL, Version=1.6.2.0, Culture=neutral, PublicKeyToken=0983de3c914beeaa, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\CoCoL.1.6.2\lib\net45\CoCoL.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
Duplicati/GUI/Duplicati.GUI.TrayIcon/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Duplicati Team")]
[assembly: AssemblyProduct("Duplicati.GUI.TrayIcon")]
[assembly: AssemblyCopyright("LGPL, Copyright © Duplicati Team 2015")]
[assembly: AssemblyCopyright("LGPL, Copyright © Duplicati Team 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CoCoL" version="1.6.1" targetFramework="net462" />
<package id="CoCoL" version="1.6.2" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
</packages>
Duplicati/Library/Main/Duplicati.Library.Main.csproj
+2 -2
View File
@@ -36,8 +36,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="CoCoL, Version=1.5.0.19417, Culture=neutral, PublicKeyToken=0983de3c914beeaa, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\CoCoL.1.6.1\lib\net45\CoCoL.dll</HintPath>
<Reference Include="CoCoL, Version=1.6.2.0, Culture=neutral, PublicKeyToken=0983de3c914beeaa, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\CoCoL.1.6.2\lib\net45\CoCoL.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
Duplicati/Library/Main/packages.config
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CoCoL" version="1.6.1" targetFramework="net462" />
<package id="CoCoL" version="1.6.2" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
</packages>
Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj
+2 -2
View File
@@ -31,8 +31,8 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="CoCoL, Version=1.5.0.19417, Culture=neutral, PublicKeyToken=0983de3c914beeaa, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\CoCoL.1.6.1\lib\net45\CoCoL.dll</HintPath>
<Reference Include="CoCoL, Version=1.6.2.0, Culture=neutral, PublicKeyToken=0983de3c914beeaa, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\CoCoL.1.6.2\lib\net45\CoCoL.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
Duplicati/Library/UsageReporter/packages.config
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CoCoL" version="1.6.1" targetFramework="net462" />
<package id="CoCoL" version="1.6.2" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
</packages>
Installer/Windows/Duplicati.wxs
+2 -2
View File
@@ -84,13 +84,13 @@
<!-- Remove old versions -->
<InstallExecuteSequence>
<RemoveExistingProducts After="InstallFinalize" />
<RemoveExistingProducts After="InstallInitialize" />
</InstallExecuteSequence>
<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
<Upgrade Id="$(var.UpgradeCode)">
<UpgradeVersion Minimum="2.0.0.0" Property="PREVIOUSVERSIONSINSTALLED" Maximum="99.0.0.0" IncludeMinimum="yes" IncludeMaximum="no" />
</Upgrade>
</Product>
</Wix>
Updates/build_version.txt
+1 -1
View File
@@ -1 +1 @@
27
28
changelog.txt
+4
View File
@@ -1,3 +1,7 @@
2019-09-05 - 2.0.4.28_canary_2019-09-05
==========
* Updated CoCoL and WiX to fix rollback and upgrade errors, thanks @BlueBlock
2019-09-03 - 2.0.4.27_canary_2019-09-03
==========
* Fixed issues with the MSI packages not upgrading correctly, thanks @BlueBlock