GitHub/cyberduck
1
0
Fork 0
mirror of https://github.com/iterate-ch/cyberduck.git synced 2026-05-26 19:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review

Browse Source
This commit is contained in:
AliveDevil
2023-05-23 15:37:53 +02:00
parent 1f7be036aa
commit 048ad693aa
15 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bonjour/Directory.Build.props
+1 -1
View File
@@ -15,6 +15,6 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Props', $(MSBuildThisFileDirectory)../))" />
<Import Project="../Directory.Build.props" />
</Project>
bonjour/native/Directory.Build.props
+2 -2
View File
@@ -16,9 +16,9 @@
<Project>
<PropertyGroup>
<ModulePath>$(MSBuildThisFileDirectory)</ModulePath>
<ModulePath Condition="'$(ModulePath)'==''">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Props', $(MSBuildThisFileDirectory)../))" />
<Import Project="../Directory.Build.props" />
</Project>
bonjour/src/main/csharp/Directory.Build.props
+2 -2
View File
@@ -16,9 +16,9 @@
<Project>
<PropertyGroup>
<BasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</BasePath>
<_BonjourBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</_BonjourBasePath>
</PropertyGroup>
<Import Project="$(BasePath)native/Directory.Build.props" />
<Import Project="$(_BonjourBasePath)native/Directory.Build.props" />
<PropertyGroup>
<Platforms>x64</Platforms>
cli/src/main/csharp/Directory.Build.props
+2 -2
View File
@@ -16,9 +16,9 @@
<Project>
<PropertyGroup>
<BasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</BasePath>
<_CliBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</_CliBasePath>
</PropertyGroup>
<Import Project="$(BasePath)windows/Directory.Build.props" />
<Import Project="$(_CliBasePath)windows/Directory.Build.props" />
<PropertyGroup>
<Platforms>x64</Platforms>
cli/src/main/wix/Directory.Build.props
+2 -2
View File
@@ -16,9 +16,9 @@
<Project>
<PropertyGroup>
<BasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</BasePath>
<_CliBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</_CliBasePath>
</PropertyGroup>
<Import Project="$(BasePath)windows/Directory.Build.props" />
<Import Project="$(_CliBasePath)windows/Directory.Build.props" />
<PropertyGroup>
<OutputPath>$(OutputPath)$(Configuration)</OutputPath>
cli/windows/Directory.Build.props
+1 -1
View File
@@ -16,7 +16,7 @@
<Project>
<PropertyGroup>
<ModulePath>$(MSBuildThisFileDirectory)</ModulePath>
<ModulePath Condition="'$(ModulePath)'==''">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Props', $(MSBuildThisFileDirectory)../))" />
core/Directory.Build.props
+1 -1
View File
@@ -19,6 +19,6 @@
<ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Props', $(MSBuildThisFileDirectory)../))" />
<Import Project="../Directory.Build.props" />
</Project>
core/native/Directory.Build.props
+1 -1
View File
@@ -19,6 +19,6 @@
<ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Props', $(MSBuildThisFileDirectory)../))" />
<Import Project="../Directory.Build.props" />
</Project>
core/native/refresh/Directory.Build.props
+1 -1
View File
@@ -19,6 +19,6 @@
<ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', $(MSBuildThisFileDirectory)../))" />
<Import Project="../Directory.Build.props" />
</Project>
core/src/main/csharp/Directory.Build.props
+3 -2
View File
@@ -16,9 +16,10 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</BasePath>
<_CoreBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</_CoreBasePath>
</PropertyGroup>
<Import Project="$(BasePath)native/Directory.Build.props" />
<Import Project="$(_CoreBasePath)native/Directory.Build.props" />
<PropertyGroup>
<Platforms>x64</Platforms>
core/src/main/csharp/ch/cyberduck/core/CrashReporter.cs
+1 -1
View File
@@ -54,7 +54,7 @@ namespace Ch.Cyberduck.Core
ExceptionReportGenerator reportGenerator = new ExceptionReportGenerator(info);
ExceptionReport report = reportGenerator.CreateExceptionReport();
string crashDir = Path.Combine(SupportDirectoryFinderFactory.get().find().getAbsolute(),
string crashDir = Path.Combine(LocalSupportDirectoryFinderFactory.get().find().getAbsolute(),
"CrashReporter");
Directory.CreateDirectory(crashDir);
using (StreamWriter outfile = new StreamWriter(Path.Combine(crashDir, DateTime.Now.Ticks + ".txt")))
core/src/main/csharp/ch/cyberduck/core/preferences/ApplicationPreferences.cs
+7 -1
View File
@@ -50,7 +50,13 @@ namespace Ch.Cyberduck.Core.Preferences
this.locales = locales;
Runtime.Current = runtime;
userConfig = new(Path.Combine(RoamingSupportDirectoryFinder.Local.getAbsolute(), $"{runtime.ProductName}.user.config"));
// store in Packaged cache folder (to ensure clearing after uninstall)
// store in roaming app data, if not packaged
var configDirectory = runtime.Packaged
? ApplicationData.Current.LocalCacheFolder.Path
: Path.Combine(EnvironmentInfo.AppDataPath, runtime.DataFolderName);
userConfig = new(Path.Combine(configDirectory, $"{runtime.ProductName}.user.config"));
System.setProperty("jna.boot.library.path", runtime.Location);
}
core/src/main/csharp/ch/cyberduck/core/preferences/RoamingSupportDirectoryFinder.cs
+1 -4
View File
@@ -18,7 +18,6 @@
using ch.cyberduck.core.preferences;
using Ch.Cyberduck.Core.Local;
using Windows.Storage;
using Path = System.IO.Path;
namespace Ch.Cyberduck.Core.Preferences
@@ -33,9 +32,7 @@ namespace Ch.Cyberduck.Core.Preferences
{
get
{
return local ??= new(Runtime.Packaged.GetValueOrDefault()
? ApplicationData.Current.LocalFolder.Path
: Path.Combine(EnvironmentInfo.AppDataPath, Runtime.DataFolderName));
return local ??= new(Path.Combine(EnvironmentInfo.AppDataPath, Runtime.DataFolderName));
}
}
core/src/test/csharp/Directory.Build.props
+2 -2
View File
@@ -16,9 +16,9 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</BasePath>
<_CoreBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</_CoreBasePath>
</PropertyGroup>
<Import Project="$(BasePath)native/Directory.Build.props" />
<Import Project="$(_CoreBasePath)native/Directory.Build.props" />
<PropertyGroup>
<Platforms>x64</Platforms>
windows/Directory.Build.props
+2 -3
View File
@@ -16,11 +16,10 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BasePath>$(MSBuildThisFileDirectory)</BasePath>
<ModulePath>$(BasePath)</ModulePath>
<ModulePath Condition="'$(ModulePath)'==''">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Props', $(BasePath)../))" />
<Import Project="../Directory.Build.props" />
<PropertyGroup Condition=" '$(BuildVersion)'!='' And '$(Revision)'!='' ">
<Version>$(BuildVersion).$(Revision)</Version>