diff --git a/.travis.yml b/.travis.yml
index 114f13c84..09a007fd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,7 @@ script:
# TODO: Workaround https://github.com/mono/linker/issues/286 (don't forget to remove it from docker files too)
dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" --no-restore /nologo "/p:ASFVariant=$1" "/p:LinkDuringPublish=false"
else
- dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" -r "$1" --no-restore /nologo "/p:ASFVariant=$1" "/p:CrossGenDuringPublish=false"
+ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" -r "$1" --no-restore /nologo "/p:ASFVariant=$1"
fi
# If we include any helper scripts for this variant, copy them to output directory
diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj
index 3654199e0..c8f1ba20c 100644
--- a/ArchiSteamFarm/ArchiSteamFarm.csproj
+++ b/ArchiSteamFarm/ArchiSteamFarm.csproj
@@ -6,6 +6,7 @@
JustArchi
JustArchi
true
+ false
Copyright © ArchiSteamFarm 2015-2019
$(DefaultItemExcludes);debug/**;out/**
ASF is an application that allows you to farm steam cards using multiple steam accounts simultaneously.
@@ -37,6 +38,16 @@
$(DefineConstants);ASF_VARIANT_$(ASFVariant.Replace('-', '_').ToUpperInvariant())
+
+
+
+
+
+
+
+
+
+
@@ -77,15 +88,6 @@
-
-
-
-
-
-
-
-
-
True
@@ -108,6 +110,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
diff --git a/ArchiSteamFarm/Manual.html b/ArchiSteamFarm/Manual.html
new file mode 100644
index 000000000..d3b227c62
--- /dev/null
+++ b/ArchiSteamFarm/Manual.html
@@ -0,0 +1,9 @@
+
+
+
+ ASF Manual
+
+
+
+
+
diff --git a/ArchiSteamFarm/rootDescriptor.xml b/ArchiSteamFarm/rootDescriptor.xml
index f7e7ce4c9..d47f0c9ce 100644
--- a/ArchiSteamFarm/rootDescriptor.xml
+++ b/ArchiSteamFarm/rootDescriptor.xml
@@ -4,4 +4,4 @@
-
\ No newline at end of file
+
diff --git a/appveyor.yml b/appveyor.yml
index 6bb0f4fbb..06628c41a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -167,7 +167,7 @@ after_test:
# TODO: Workaround https://github.com/mono/linker/issues/286 (don't forget to remove it from docker files too)
dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" --no-restore /nologo "/p:ASFVariant=$variant" "/p:LinkDuringPublish=false"
} else {
- dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" -r "$variant" --no-restore /nologo "/p:ASFVariant=$variant" "/p:CrossGenDuringPublish=false"
+ dotnet publish ArchiSteamFarm -c "$env:CONFIGURATION" -f "$targetFramework" -o "out\$variant" -r "$variant" --no-restore /nologo "/p:ASFVariant=$variant"
}
if ($LastExitCode -ne 0) {
diff --git a/cc.sh b/cc.sh
index e520cc28c..eb7a8b58f 100755
--- a/cc.sh
+++ b/cc.sh
@@ -1,20 +1,27 @@
#!/bin/bash
set -eu
+NET_CORE_VERSION="netcoreapp2.2"
+NET_FRAMEWORK_VERSION="net472"
+
MAIN_PROJECT="ArchiSteamFarm"
TESTS_PROJECT="${MAIN_PROJECT}.Tests"
SOLUTION="${MAIN_PROJECT}.sln"
CONFIGURATION="Release"
OUT="out/source"
-TARGET_FRAMEWORK="netcoreapp2.2"
+TARGET_FRAMEWORK="$NET_CORE_VERSION"
ASF_UI=1
CLEAN=0
-LINK_DURING_PUBLISH=1
+LINK_DURING_PUBLISH=0
PULL=1
SHARED_COMPILATION=1
TEST=1
+PRINT_USAGE() {
+ echo "Usage: $0 [--clean] [--link-during-publish] [--netf] [--no-asf-ui] [--no-pull] [--no-shared-compilation] [--no-test] [debug/release]"
+}
+
cd "$(dirname "$(readlink -f "$0")")"
for ARG in "$@"; do
@@ -27,14 +34,16 @@ for ARG in "$@"; do
--no-clean) CLEAN=0 ;;
--link-during-publish) LINK_DURING_PUBLISH=1 ;;
--no-link-during-publish) LINK_DURING_PUBLISH=0 ;;
+ --netf) TARGET_FRAMEWORK="$NET_FRAMEWORK_VERSION" ;;
+ --no-netf) TARGET_FRAMEWORK="$NET_CORE_VERSION" ;;
--pull) PULL=1 ;;
--no-pull) PULL=0 ;;
--shared-compilation) SHARED_COMPILATION=1 ;;
--no-shared-compilation) SHARED_COMPILATION=0 ;;
--test) TEST=1 ;;
--no-test) TEST=0 ;;
- --help) echo "Usage: $0 [--clean] [--no-asf-ui] [--no-link-during-publish] [--no-pull] [--no-shared-compilation] [--no-test] [debug/release]"; exit 0 ;;
- *) echo "Usage: $0 [--clean] [--no-asf-ui] [--no-link-during-publish] [--no-pull] [--no-shared-compilation] [--no-test] [debug/release]"; exit 1
+ --help) PRINT_USAGE; exit 0 ;;
+ *) PRINT_USAGE; exit 1
esac
done