So, it built?!

This commit is contained in:
Manuel Friedli 2023-06-17 01:56:16 +02:00
parent 63fb43601b
commit 0e00d48354
Signed by: manuel
GPG Key ID: 41D08ABA75634DA1
6 changed files with 1519 additions and 227 deletions

View File

@ -1,4 +1,7 @@
AUX dotnet-framework.patch 79633 BLAKE2B be48b86331063a681515a125914a961f4ce4d7e054d6d428dbb9e09748dec3e8cb5108c709fbdb357b195d61fab4e2fbd6cf03f37969e44c20d506c75493a228 SHA512 815e17c55b9c1a2a0586394508fdf991774f49dfcb5ab94a3f808e95ffe1996f62283b70838a6d3c3e11e8d20d13bacb730b85913f30f72006b924068dc033d2
AUX mono-path-override.props 3569 BLAKE2B 7328344ed793e6f24a4659ab0cbf667e6763a501882b38eb5cb15d6eb5eaab7d53815ea80272d58fa1dba6b36bc02f51bab06d3eea67d474bc336eb5f55ffee9 SHA512 e7bdcafe419fa9bb40f2f9cf96bbd5db827ad9b40fdf83393b8b189d7f762931eaf8e6e3ac66fdf693b373c8ba037c7b522f007079425a79e7018c6eba8022a2
AUX Makefile.patch 387 BLAKE2B c6e9a4dddda6b17e4caa525320cb2d0bb55dead31177efa7160dd2c85feceb689fc4f348ec7e88446ec47ba93dc5cec74c23240e586a8fc472968ebe04adba5c SHA512 d636fe72eb246923bc63d60da414ec4f2cfff9d5e1f1c64cd46b8db3974f7f24b6d83dcbfabfc8196aebdf01f3c281da003011098b28ebc8852793d221c38706
AUX dotnet-framework.patch 66850 BLAKE2B 222a73c9b4b06376ae745a3285fdc5277d79b8bb8595aba749196d2040b28653ef1a051bb6847abefb1ee25f9d944e1b98251ab889c530a3572f85edc4eb842e SHA512 aecca6745895f8d964ae1cfc355e1e93abdf962c0364a167f71dce3d27c8c9ae0732f0abffb6031f0bcf694094040695ede9a230984a012a0b2a37e6219b04ad
AUX dotnet-framework.patch_backup 79633 BLAKE2B be48b86331063a681515a125914a961f4ce4d7e054d6d428dbb9e09748dec3e8cb5108c709fbdb357b195d61fab4e2fbd6cf03f37969e44c20d506c75493a228 SHA512 815e17c55b9c1a2a0586394508fdf991774f49dfcb5ab94a3f808e95ffe1996f62283b70838a6d3c3e11e8d20d13bacb730b85913f30f72006b924068dc033d2
AUX mono-path-override.props 605 BLAKE2B b638932f16e0051edd85bc10b590e5e531f939fe82c6fafc94d236cab950a291df03551fd5d5b69c6a3ab1b9261f7283fe7afd8e6ec357665ed265832a285f5a SHA512 b10a79f2303645c63929e5b1f80deb79dbba722757035c0c8352f68f67e2fa11a4f9386a29749402f4e4c3a60a9c71378f0e71e1a45a82bc99d54fb8ca02299b
AUX netstandard.patch 2640 BLAKE2B 87f6c0f5ffba2139207842935780769eb746b24c25fd3466d668df10b96ed8081d278f87de680e9d3077bcb399b90971b36d0111e8721cb6be70198a2006b630 SHA512 4c7f8a7264c408d67bdb2163ec299e22684a958a1d4959c2710f55e58b665a69ff57852ef20a16088a15ba648a3fdaf6b05ec3676983a420b039d2a615b2cd6c
DIST duplicati-2.0.7.1_beta20230525.tar.gz 44134279 BLAKE2B 6bd8216457588e4441a0449a221535a64e61aec7abd0649eb0452a767ea60e81fad4e10d897c8b286fe1a4df189746294bd72244ffb62455227ea05421e61471 SHA512 047a70348806af98a3e0b8d8e644b2ec752e1bf21ae47a884491d2cbb4b4f00f26a1b9d0dca97295192534c53a0d80aede891cbef685d5f074bcb812bcfd0db8
EBUILD duplicati-2.0.7.1_beta20230525.ebuild 1086 BLAKE2B cbe7efb85b295a118d908f3e7b3489894eac2b72c075c012f05bb3caf19a8a7019dc2bd9b25217c3a48d6390f20f1556f3001bffc2a9a95bd7c52ca3eaf17019 SHA512 e4310fe3b734fc3c44a285e40b1442013b42c7696f3eee5c893dbe3792b85a83fe9a742f2554a023f876ab983c6f9aeba12c8f70e63145e9a276fd4ad9554192
EBUILD duplicati-2.0.7.1_beta20230525.ebuild 1143 BLAKE2B c21ce4db3fa394993ddf1c844b7e55adda733b5ad5b17572410df7b2d1ae41a2b3fd607628ef32c666860ec9ec6b3cce0ac57c4949495d6a56e99d3ac1e846f4 SHA512 39f9cb939bd6534f9aba716cad328825bb18ca1355ac623dd9f6d8280ec13aa55943ceef5f3981670e262147a841b3265be9fa48a38a6cd1ce5e475cc3d8e5bc

View File

@ -0,0 +1,10 @@
diff --git a/Installer/Makefile/Makefile b/Installer/Makefile/Makefile
index 550e7b9..0cb537f 100755
--- a/Installer/Makefile/Makefile
+++ b/Installer/Makefile/Makefile
@@ -1,4 +1,4 @@
-BUILD_TOOL=msbuild
+BUILD_TOOL=dotnet msbuild
BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release
BUILD_ARGS_DEBUG=/property:Platform=Any\ CPU /property:Configuration=Debug

View File

@ -1212,149 +1212,6 @@ index 170347b..bafa1b4 100644
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Installer/Makefile/Makefile b/Installer/Makefile/Makefile
index 51eaf9f..e3626d8 100755
--- a/Installer/Makefile/Makefile
+++ b/Installer/Makefile/Makefile
@@ -2,7 +2,7 @@ BUILD_TOOL=dotnet msbuild
BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release
BUILD_ARGS_DEBUG=/property:Platform=Any\ CPU /property:Configuration=Debug
-NUGET_TOOL=dotnet
+NUGET_TOOL=mono /tmp/nuget.exe
NUGET_ARGS=restore
OUTPUT_ARGS=/property:OutputPath=bin/Release
@@ -34,7 +34,7 @@ package: build
mkdir "$(PACKAGE_DIR)/usr/share/applications"
mkdir "$(PACKAGE_DIR)/usr/share/pixmaps"
mkdir "$(PACKAGE_DIR)/usr/share/doc"
- mkdir "$(PACKAGE_DIR)/usr/share/doc/duplicati"
+ mkdir "$(PACKAGE_DIR)/usr/share/doc/duplicati"
cp -R "$(SOURCE_DIR)/Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Release" "$(PACKAGE_DIR)/usr/lib/duplicati"
rm -rf "$(PKG_TARGET)/SQLite"
@@ -51,7 +51,7 @@ package: build
# If we edit files, we sometimes get backup files included
find "$(PACKAGE_DIR)" -type f -name \*\~ -exec rm -rf '{}' \;
-
+
#Set permissions
#chown -R root:root "$(PACKAGE_DIR)"
chmod -R 755 "$(PACKAGE_DIR)"
@@ -62,17 +62,17 @@ package: build
for EXT in exe py sh; do \
find "$(PACKAGE_DIR)" -type f -name \*.$(EXT) -exec chmod 755 "{}" \; ; \
done
-
+
chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati"
chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati-cli"
-
+
if [ -e "duplicati.tar" ]; then \
rm -rf "duplicati.tar"; \
fi
if [ -e "duplicati.tar.gz" ]; then \
rm -rf "duplicati.tar.gz"; \
fi
-
+
tar -C "$(PACKAGE_DIR)" -cf "duplicati.tar" .
gzip --best "duplicati.tar"
diff --git a/Installer/Makefile/Makefile~ b/Installer/Makefile/Makefile~
deleted file mode 100755
index 0ab1bde..0000000
--- a/Installer/Makefile/Makefile~
+++ /dev/null
@@ -1,85 +0,0 @@
-BUILD_TOOL=dotnet msbuild
-BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release
-BUILD_ARGS_DEBUG=/property:Platform=Any\ CPU /property:Configuration=Debug
-
-NUGET_TOOL=dotnet nuget
-NUGET_ARGS=restore
-
-OUTPUT_ARGS=/property:OutputPath=bin/Release
-SOURCE_DIR=../../.
-PACKAGE_DIR=./pkg
-PKG_TARGET=$(PACKAGE_DIR)/usr/lib/duplicati
-
-all: package
-
-build:
- $(NUGET_TOOL) $(NUGET_ARGS) "$(SOURCE_DIR)/Duplicati.sln"
- $(BUILD_TOOL) $(BUILD_ARGS) "$(SOURCE_DIR)/Duplicati.sln"
- $(BUILD_TOOL) $(BUILD_ARGS) "$(SOURCE_DIR)/BuildTools/UpdateVersionStamp/UpdateVersionStamp.sln"
-
-debug:
- $(NUGET_TOOL) $(NUGET_ARGS) "$(SOURCE_DIR)/Duplicati.sln"
- $(BUILD_TOOL) $(BUILD_ARGS_DEBUG) "$(SOURCE_DIR)/Duplicati.sln"
- $(BUILD_TOOL) $(BUILD_ARGS_DEBUG) "$(SOURCE_DIR)/BuildTools/UpdateVersionStamp/UpdateVersionStamp.sln"
-
-package: build
- if [ -e "$(PACKAGE_DIR)" ]; then \
- rm -rf "$(PACKAGE_DIR)"; \
- fi
- mkdir "$(PACKAGE_DIR)"
- mkdir "$(PACKAGE_DIR)/usr"
- mkdir "$(PACKAGE_DIR)/usr/lib"
- mkdir "$(PACKAGE_DIR)/usr/bin"
- mkdir "$(PACKAGE_DIR)/usr/share"
- mkdir "$(PACKAGE_DIR)/usr/share/applications"
- mkdir "$(PACKAGE_DIR)/usr/share/pixmaps"
- mkdir "$(PACKAGE_DIR)/usr/share/doc"
- mkdir "$(PACKAGE_DIR)/usr/share/doc/duplicati"
- cp -R "$(SOURCE_DIR)/Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Release" "$(PACKAGE_DIR)/usr/lib/duplicati"
-
- rm -rf "$(PKG_TARGET)/SQLite"
- rm -rf "$(PKG_TARGET)/win-tools"
- rm -rf "$(PKG_TARGET)/"*.mdb
-
- cp -R "$(SOURCE_DIR)/Duplicati/Server/webroot" "$(PACKAGE_DIR)/usr/lib/duplicati/"
- cp "$(SOURCE_DIR)/Installer/debian/duplicati-launcher.sh" "$(PACKAGE_DIR)/usr/bin/duplicati"
- cp "$(SOURCE_DIR)/Installer/debian/duplicati-commandline-launcher.sh" "$(PACKAGE_DIR)/usr/bin/duplicati-cli"
- cp "$(SOURCE_DIR)/Installer/debian/duplicati-server-launcher.sh" "$(PACKAGE_DIR)/usr/bin/duplicati-server"
- cp "$(SOURCE_DIR)/Installer/debian/duplicati.desktop" "$(PACKAGE_DIR)/usr/share/applications/"
- cp "$(SOURCE_DIR)/Installer/debian/duplicati.xpm" "$(PACKAGE_DIR)/usr/share/pixmaps/"
- cp "$(SOURCE_DIR)/Installer/debian/duplicati.png" "$(PACKAGE_DIR)/usr/share/pixmaps/"
-
- # If we edit files, we sometimes get backup files included
- find "$(PACKAGE_DIR)" -type f -name \*\~ -exec rm -rf '{}' \;
-
- #Set permissions
- #chown -R root:root "$(PACKAGE_DIR)"
- chmod -R 755 "$(PACKAGE_DIR)"
-
- find "$(PACKAGE_DIR)" -type d -exec chmod 755 "{}" \;
- find "$(PACKAGE_DIR)" -type f -exec chmod 644 "{}" \;
-
- for EXT in exe py sh; do \
- find "$(PACKAGE_DIR)" -type f -name \*.$(EXT) -exec chmod 755 "{}" \; ; \
- done
-
- chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati"
- chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati-cli"
-
- if [ -e "duplicati.tar" ]; then \
- rm -rf "duplicati.tar"; \
- fi
- if [ -e "duplicati.tar.gz" ]; then \
- rm -rf "duplicati.tar.gz"; \
- fi
-
- tar -C "$(PACKAGE_DIR)" -cf "duplicati.tar" .
- gzip --best "duplicati.tar"
-
-clean:
- (find "$(SOURCE_DIR)" -type d -name bin -exec rm -rf "{}" \; &> /dev/null) || echo "bin cleaned"
- (find "$(SOURCE_DIR)" -type d -name obj -exec rm -rf "{}" \; &> /dev/null) || echo "obj cleaned"
- rm -rf "$(PACKAGE_DIR)"
-
-
-.PHONY: build all clean package debug
diff --git a/Tools/SQLiteTool/SQLiteTool.csproj b/Tools/SQLiteTool/SQLiteTool.csproj
index 9457deb..4946a5f 100644
--- a/Tools/SQLiteTool/SQLiteTool.csproj
@ -1391,64 +1248,6 @@ index 408dd65..307a597 100644
-</Project>
\ No newline at end of file
+</Project>
diff --git a/mono-path-override.props b/mono-path-override.props
index d7bbdc7..abc3b75 100644
--- a/mono-path-override.props
+++ b/mono-path-override.props
@@ -1,28 +1,32 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <!-- When compiling .NET SDK 2.0 projects targeting .NET 4.x on Mono using 'dotnet build' you -->
- <!-- have to teach MSBuild where the Mono copy of the reference asssemblies is -->
- <TargetIsMono Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</TargetIsMono>
+<!-- --><!-- When compiling .NET SDK 2.0 projects targeting .NET 4.x on Mono using 'dotnet build' you -->
+<!-- --><!-- have to teach MSBuild where the Mono copy of the reference asssemblies is -->
+<!-- <TargetIsMono Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</TargetIsMono> -->
- <!-- Look in the standard install locations -->
- <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono</BaseFrameworkPathOverrideForMono>
- <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono>
- <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono>
+<!-- --><!-- Look in the standard install locations -->
+<!-- <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono</BaseFrameworkPathOverrideForMono> -->
+<!-- <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono> -->
+<!-- <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono> -->
- <!-- If we found Mono reference assemblies, then use them -->
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net45'">$(BaseFrameworkPathOverrideForMono)/4.5-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net451'">$(BaseFrameworkPathOverrideForMono)/4.5.1-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net452'">$(BaseFrameworkPathOverrideForMono)/4.5.2-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net46'">$(BaseFrameworkPathOverrideForMono)/4.6-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net461'">$(BaseFrameworkPathOverrideForMono)/4.6.1-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net462'">$(BaseFrameworkPathOverrideForMono)/4.6.2-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net471'">$(BaseFrameworkPathOverrideForMono)/4.7.1-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net472'">$(BaseFrameworkPathOverrideForMono)/4.7.2-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net48'">$(BaseFrameworkPathOverrideForMono)/4.8-api</FrameworkPathOverride>
- <EnableFrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">true</EnableFrameworkPathOverride>
+<!-- --><!-- If we found Mono reference assemblies, then use them -->
+<!-- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net45'">$(BaseFrameworkPathOverrideForMono)/4.5-api</FrameworkPathOverride> -->
+<!-- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net451'">$(BaseFrameworkPathOverrideForMono)/4.5.1-api</FrameworkPathOverride> -->
+<!-- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net452'">$(BaseFrameworkPathOverrideForMono)/4.5.2-api</FrameworkPathOverride> -->
+<!-- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net46'">$(BaseFrameworkPathOverrideForMono)/4.6-api</FrameworkPathOverride> -->
+<!-- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net461'">$(BaseFrameworkPathOverrideForMono)/4.6.1-api</FrameworkPathOverride> -->
+<!-- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net462'">$(BaseFrameworkPathOverrideForMono)/4.6.2-api</FrameworkPathOverride> -->
+<!-- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride> -->
+<!-- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net471'">$(BaseFrameworkPathOverrideForMono)/4.7.1-api</FrameworkPathOverride> -->
+<!-- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net472'">$(BaseFrameworkPathOverrideForMono)/4.7.2-api</FrameworkPathOverride> -->
+<!-- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net48'">$(BaseFrameworkPathOverrideForMono)/4.8-api</FrameworkPathOverride> -->
+<!-- <EnableFrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">true</EnableFrameworkPathOverride> -->
+
+ <FrameworkPathOverride>/usr/lib/mono/4.7.1-api</FrameworkPathOverride>
+ <EnableFrameworkPathOverride>true</EnableFrameworkPathOverride>
<!-- Add the Facades directory. Not sure how else to do this. Necessary at least for .NET 4.5 -->
- <AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
+<!-- <AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths> -->
+ <AssemblySearchPaths>$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
</PropertyGroup>
</Project>
diff --git a/thirdparty/mozroots/mozroots.csproj b/thirdparty/mozroots/mozroots.csproj
index 03ba919..fdd0a8a 100644
--- a/thirdparty/mozroots/mozroots.csproj

File diff suppressed because it is too large Load Diff

View File

@ -1,28 +1,10 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- When compiling .NET SDK 2.0 projects targeting .NET 4.x on Mono using 'dotnet build' you -->
<!-- have to teach MSBuild where the Mono copy of the reference asssemblies is -->
<TargetIsMono Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</TargetIsMono>
<!-- Look in the standard install locations -->
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono</BaseFrameworkPathOverrideForMono>
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono>
<BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono>
<!-- If we found Mono reference assemblies, then use them -->
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net45'">$(BaseFrameworkPathOverrideForMono)/4.5-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net451'">$(BaseFrameworkPathOverrideForMono)/4.5.1-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net452'">$(BaseFrameworkPathOverrideForMono)/4.5.2-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net46'">$(BaseFrameworkPathOverrideForMono)/4.6-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net461'">$(BaseFrameworkPathOverrideForMono)/4.6.1-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net462'">$(BaseFrameworkPathOverrideForMono)/4.6.2-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net471'">$(BaseFrameworkPathOverrideForMono)/4.7.1-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net472'">$(BaseFrameworkPathOverrideForMono)/4.7.2-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net48'">$(BaseFrameworkPathOverrideForMono)/4.8-api</FrameworkPathOverride>
<EnableFrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">true</EnableFrameworkPathOverride>
<FrameworkPathOverride>/usr/lib/mono/4.7.1-api</FrameworkPathOverride>
<EnableFrameworkPathOverride>true</EnableFrameworkPathOverride>
<!-- Add the Facades directory. Not sure how else to do this. Necessary at least for .NET 4.5 -->
<AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
<!-- <AssemblySearchPaths>$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths> -->
<ReferencePath>$(FrameworkPathOverride)/Facades;$(ReferencePath)</ReferencePath>
</PropertyGroup>
</Project>

View File

@ -0,0 +1,36 @@
diff --git a/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj
index c5d1d21..730371c 100644
--- a/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj
+++ b/Duplicati/Library/Backend/Storj/Duplicati.Library.Backend.Storj.csproj
@@ -66,6 +66,7 @@
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
+ <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
diff --git a/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj b/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj
index dff5c39..6cdf4f2 100644
--- a/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj
+++ b/Duplicati/Library/Backend/TencentCOS/Duplicati.Library.Backend.TencentCOS.csproj
@@ -38,6 +38,7 @@
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
+ <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
diff --git a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj
index 7c7da18..149a204 100644
--- a/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj
+++ b/Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj
@@ -35,6 +35,7 @@
<Reference Include="SharpAESCrypt, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\SharpAESCrypt.exe.1.3.3\lib\netstandard2.0\SharpAESCrypt.exe</HintPath>
</Reference>
+ <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />