diff --git a/.build/compile.step b/.build/compile.step
index b99a2a7209..df0452e71d 100644
--- a/.build/compile.step
+++ b/.build/compile.step
@@ -21,7 +21,7 @@
-
+
@@ -106,18 +106,18 @@
-
+
+ commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.5'}" />
+ commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:detailed /toolsversion:4.0 /property:Platform='${msbuild.platform}' /property:TargetFrameworkProfile='' /property:TargetFrameworkVersion=v${framework::get-version(microsoft.framework.specific)} /l:${msbuild.logger};'${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml'" />
@@ -125,11 +125,11 @@
-
+
+ commandline="${solution.path.windows.mono} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.5'}" />
-
+
+ commandline="${solution.path.windows.mono} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.5'}" />
-
+
+ commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.5'}" />
-
+
+ commandline="${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.5'}" />
-
+
diff --git a/.travis.yml b/.travis.yml
index 2676361602..bf92067bca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
language: csharp
mono:
- - 3.12.0
+ - 5.20.1
install:
- - sudo apt-get install mono-devel mono-gmcs
+ - sudo apt-get install mono-devel
- nuget restore src/chocolatey.sln
before_script:
- chmod +x build.sh
diff --git a/README.md b/README.md
index 7baf606053..571dc55c5e 100644
--- a/README.md
+++ b/README.md
@@ -137,17 +137,24 @@ Running the build on Windows should produce an artifact that is tested and ready
#### Other Platforms
##### Prerequisites:
- * Install and configure Mono 3.12.0 (3.8.0 should also work).
+ * Install and configure Mono 5.20.x (Other versions may work but have not been tested).
* [Debian based](http://www.mono-project.com/docs/getting-started/install/linux/#debian-ubuntu-and-derivatives)
```sh
+# install prerequisites
+sudo apt install apt-transport-https dirmngr gnupg ca-certificates
# add the key
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
# add the package repository
-echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
-# Ubuntu 12.10/12.04 - add this deb as well
-echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
+# Debian 10
+echo "deb https://download.mono-project.com/repo/debian stable-buster main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
+# Debian 9
+echo "deb https://download.mono-project.com/repo/debian stable-stretch main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
+# Ubuntu 18.04
+echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
+# Ubuntu 16.04
+echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
# update package indexes
sudo apt-get update
@@ -155,24 +162,54 @@ sudo apt-get update
sudo apt-get install mono-devel -y
```
- * [RPM Based](http://www.mono-project.com/docs/getting-started/install/linux/#centos-fedora-and-derivatives)
+ * [CentOS/RHEL](https://www.mono-project.com/download/stable/#download-lin-centos)
```sh
### NOT FULLY TESTED AND WORKING ###
-# add the EPEL
-sudo yum install epel-release -y
+# Switch to root shell
+su
+# Add the EPEL
+yum install epel-release -y
# Add the key
-sudo rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
+pmkeys --import "http://pool.sks-keyservers.net/pks/lookup?op=get&search=0x3fa7e0328081bff6a14da29aa6a19b38d3d831ef"
# Add the package repository
-sudo yum-config-manager --add-repo http://download.mono-project.com/repo/centos/
+# CentOS/RHEL 8
+su -c 'curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo'
+# CentOS/RHEL 7
+su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'
+# CentOS/RHEL 6
+rpm --import "http://pool.sks-keyservers.net/pks/lookup?op=get&search=0x3fa7e0328081bff6a14da29aa6a19b38d3d831ef"
-# update your system
-sudo yum update -y
+# Update your system
+yum update -y
# Install mono-devel
-sudo yum install mono-devel -y
+yum install mono-devel -y
+```
+
+ * [Fedora](https://www.mono-project.com/download/stable/#download-lin-fedora)
+
+```sh
+### NOT FULLY TESTED AND WORKING ###
+
+# Switch to root shell
+su
+# Add the key
+rpm --import "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
+
+# Add the package repository
+# Fedora 29
+su -c 'curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo'
+# Fedora 28
+su -c 'curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo'
+
+# Update
+dnf update
+
+# Install mono-devel
+dnf install mono-devel -y
```
diff --git a/build.sh b/build.sh
index 648b60c383..cd1b4a558a 100755
--- a/build.sh
+++ b/build.sh
@@ -25,7 +25,6 @@ displayUsage $1
export PKG_CONFIG_PATH=/opt/local/lib/pkgconfig:/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig:$PKG_CONFIG_PATH
#mono ./lib/NAnt/NAnt.exe /logger:"NAnt.Core.DefaultLogger" /nologo /quiet /f:"$(cd $(dirname "$0"); pwd)/.build/default.build" /D:build.config.settings="$(cd $(dirname "$0"); pwd)/.uppercut" /D:microsoft.framework="mono-3.5" $*
-mono --runtime=v4.0.30319 ./lib/NAnt/NAnt.exe /logger:"NAnt.Core.DefaultLogger" /nologo /quiet /f:"$(cd $(dirname "$0"); pwd)/.build/default.build" /D:build.config.settings="$(cd $(dirname "$0"); pwd)/.uppercut" /D:microsoft.framework="mono-4.0" /D:run.ilmerge="false" /D:run.nuget="false" $*
-
-#/quiet /nologo /debug /verbose /t:"mono-4.0"
+mono --runtime=v4.0.30319 ./lib/NAnt/NAnt.exe /logger:"NAnt.Core.DefaultLogger" /nologo /quiet /f:"$(cd $(dirname "$0"); pwd)/.build/default.build" /D:build.config.settings="$(cd $(dirname "$0"); pwd)/.uppercut" /D:microsoft.framework="mono-4.5" /D:run.ilmerge="false" /D:run.nuget="false" $*
+#/quiet /nologo /debug /verbose /t:"mono-4.5"
\ No newline at end of file
diff --git a/docker/Dockerfile.linux b/docker/Dockerfile.linux
index 1dea04ead9..24754056ba 100644
--- a/docker/Dockerfile.linux
+++ b/docker/Dockerfile.linux
@@ -1,4 +1,4 @@
-FROM mono:3.12.1
+FROM mono:5.20.1.19
MAINTAINER Justin Phelps
@@ -10,8 +10,10 @@ RUN chmod +x zip.sh
RUN ./build.sh
WORKDIR /usr/local/bin
-RUN ln -s /usr/local/src/choco/build_output/chocolatey
+RUN ln -s /usr/local/src/choco/code_drop/chocolatey
COPY docker/choco_wrapper /usr/local/bin/choco
+ENV ChocolateyInstall /usr/local/bin/chocolatey
+
WORKDIR /root
diff --git a/docker/choco_wrapper b/docker/choco_wrapper
index 3aa86b5e5c..745cdf43ce 100755
--- a/docker/choco_wrapper
+++ b/docker/choco_wrapper
@@ -1,3 +1,3 @@
#!/bin/bash
-mono /usr/local/bin/chocolatey/choco.exe "$@" --allow-unofficial
+mono /usr/local/bin/chocolatey/console/choco.exe "$@" --allow-unofficial
diff --git a/lib/NAnt/NAnt.exe.config b/lib/NAnt/NAnt.exe.config
index d9542dd09c..ce2b284792 100644
--- a/lib/NAnt/NAnt.exe.config
+++ b/lib/NAnt/NAnt.exe.config
@@ -2497,6 +2497,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ dmcs
+ true
+ linq
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ mjs
+ strict
+
+
+ vbnc
+ true
+
+
+ true
+ true
+
+
+ sn
+ true
+
+
+ false
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/.
+
+
+
+
+
+
+
+ true
+
+
+ dmcs
+ true
+ linq
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ mjs
+ strict
+
+
+ vbnc
+ true
+
+
+ true
+ true
+
+
+ sn
+ true
+
+
+ false
+
+
+ true
+
+
+