Merge remote-tracking branch 'upstream/master'

* upstream/master: (21 commits) (doc) Changed cla links from clahub to cla-assistant (chocolateyGH-2055) remove logs/config folder in nupkg (version) 0.10.16-beta (chocolateyGH-2023) Install git in the docker container (chocolateyGH-1859) Fix error message for missing 32-bit URL (chocolateyGH-1859) Fix error message for missing 32-bit URL (chocolateyGH-2051) Fix: workingDirectory always replaced w/cacheLocation (chocolateyGH-1983) exit-on-reboot-detected environment variable (maint) update resharper settings (maint) formatting (chocolateyGH-1843) Fix: search exact all versions returns 1 (chocolateyGH-1020) fix build (chocolateyGH-1020) Direct platform only for windows tests (chocolateyGH-1020) WindowsOnly tests by platform, not ignore (chocolateyGH-1020) Docker add ChocolateyInstall Env Var (chocolateyGH-1020) Docker use code_drop instead of build_output (doc) Update mono installation instructions in README (chocolateyGH-1020) Dockerfile and Travis to Mono 5.20.1 (chocolateyGH-1020) Add mono-4.5 configuration Add missing start of comment block ...
johnstevenson · Jun 19, 2020 · 09f44ca · 09f44ca
2 parents 564a652 + 773b185
commit 09f44ca
Show file tree

Hide file tree

Showing 25 changed files with 405 additions and 66 deletions.
diff --git a/.build.custom/nugetPrepare.post.step b/.build.custom/nugetPrepare.post.step
@@ -12,7 +12,7 @@
   <property name="build.step.path" value="${project::get-buildfile-path()}" />
   <!-- build step customizations below this -->
 
-  <target name="go" depends="prep_nuget, unpack_files, copy_legal" />
+  <target name="go" depends="prep_nuget, unpack_files, copy_legal, remove_logs_config_folders" />
 
   <target name="prep_nuget">
     <echo level="Warning" message="Moving ${dirs.drop.nuget}${path.separator}lib${path.separator}console to ${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall." />
@@ -48,4 +48,11 @@
     <copy file="${dirs.current}${path.separator}${folder.documentation}${path.separator}legal${path.separator}CREDITS.md" tofile="${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall${path.separator}CREDITS.txt" failonerror="true" />
     <copy file="${dirs.current}${path.separator}${folder.documentation}${path.separator}legal${path.separator}CREDITS.md" tofile="${dirs.drop.nuget}${path.separator}chocolatey.lib${path.separator}lib${path.separator}CREDITS.txt" failonerror="true" />
   </target>
+
+  <target name="remove_logs_config_folders">
+    <echo level="Warning" message="Removing subfolders for logs and config if they exist at ${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall" />
+    <delete dir="${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall${path.separator}logs" />
+    <delete dir="${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall${path.separator}config" />
+  </target>
+
 </project>
diff --git a/.build/compile.step b/.build/compile.step
@@ -21,7 +21,7 @@
   <property name="solution.path" value="${path::get-full-path(solution.path)}" />
   <property name="solution.path.windows.mono" value="${string::replace(dirs.current,'\','/')}/${string::replace(path_to_solution,'\','/')}/${project.name}.sln" />
   <property name="solution.path" value="${dirs.current}${path.separator}${path_to_solution}${path.separator}${project.name}.vbp" if="${microsoft.framework =='vb6'}" />
-  <property name="nant.settings.currentframework" value="mono-4.0" if="${platform::is-unix()}" overwrite="true" />
+  <property name="nant.settings.currentframework" value="mono-4.5" if="${platform::is-unix()}" overwrite="true" />
   <property name="nant.settings.currentframework" value="net-3.5" if="${microsoft.framework !='vb6' and platform::is-windows()}" overwrite="false" />
   <property name="framework.multitargeting" value="false" />
   <property name="framework.multitargeting.delimiter" value="," />
@@ -106,30 +106,30 @@
     <mkdir dir="${msbuild.outputpath}" />
     <if test="${platform::is-unix()}">
       <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
-      <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.0'}" />
+      <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.5'}" />
       <exec program="${app.xbuild}"
           basedir="/usr/bin"
           workingdir="${dirs.build}"
-          commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.0'}" />
+          commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.5'}" />
       <echo level="Warning" message="Building..." />
       <echo level="Warning" message="Working directory ${dirs.build}" />
       <echo level="Warning" message="Running ${app.xbuild} ${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:detailed /toolsversion:${framework::get-version(microsoft.framework.specific)} /property:Platform='${msbuild.platform}' /property:TargetFrameworkVersion=v${framework::get-version(microsoft.framework.specific)} /l:${msbuild.logger};'${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml'" />
       <exec program="${app.xbuild}"
           basedir="/usr/bin"
           workingdir="${dirs.build}"
-          commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:detailed /toolsversion:${framework::get-version(microsoft.framework.specific)} /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'" />
+          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'" />
     </if>
     <if test="${platform::is-windows()}">
       <!-- nant is retarded - I had to have four of these instead of throwing an if on the outputpath and targets -->
       <if test="${msbuild.override_output_path}">
         <if test="${framework.multitargeting}">
           <if test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
             <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
-            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.0'}" />
+            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.5'}" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
-                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.0'}" />
+                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'}" />
             <echo level="Warning" message='Building...by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:OutputPath="${msbuild.outputpath.windows.mono}" /property:Configuration=${msbuild.configuration} /verbosity:minimal' />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
@@ -158,11 +158,11 @@
         <if test="${not framework.multitargeting}">
           <if test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
             <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
-            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.0'}" />
+            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.5'}" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
-                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.0'}" />
+                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'}" />
             <echo level="Warning" message='Building without multitargeting by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:OutputPath="${msbuild.outputpath.windows.mono}" /property:Configuration=${msbuild.configuration} /verbosity:minimal' />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
@@ -191,11 +191,11 @@
         <if test="${framework.multitargeting}">
           <if test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
             <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
-            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.0'}" />
+            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.5'}" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build}"
                 workingdir="${dirs.build}"
-                commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.0'}" />
+                commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.5'}" />
             <echo level="Warning" message="Building..." />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build}"
@@ -222,11 +222,11 @@
         <if test="${not framework.multitargeting}">
           <if test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
             <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
-            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.0'}" />
+            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.5'}" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
-                commandline="${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.0'}" />
+                commandline="${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.5'}" />
             <echo level="Warning" message="Building...by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"

diff --git a/.build/default.build.settings b/.build/default.build.settings
@@ -94,7 +94,7 @@
   <property name="fail.build.on.error" value="true" />
 
   <!-- FRAMEWORKS -->
-  <!-- microsoft.framework: vb6, net-1.0, net-1.1, net-2.0, net-3.5, net-4.0, net-4.5, netcf-1.0, netcf-2.0, silverlight-2.0, mono-1.0, mono-2.0, mono-3.5, mono-4.0, moonlight-2.0 (Enter multiple ones with a "," to take advantage of multitargeting) -->
+  <!-- microsoft.framework: vb6, net-1.0, net-1.1, net-2.0, net-3.5, net-4.0, net-4.5, netcf-1.0, netcf-2.0, silverlight-2.0, mono-1.0, mono-2.0, mono-3.5, mono-4.0, mono-4.5, moonlight-2.0 (Enter multiple ones with a "," to take advantage of multitargeting) -->
   <property name="microsoft.framework" value="net-4.0" overwrite="false" />
   <!-- language.short: vb,cs -->
   <property name="language.short" value="cs" overwrite="false" />

diff --git a/.github/ISSUE_TEMPLATE/zChocoReportIssue.md b/.github/ISSUE_TEMPLATE/zChocoReportIssue.md
@@ -3,6 +3,7 @@ name: Choco.exe - Report Issue
 about: Did you find unexpected behavior?
 ---
 
+<!--
 Ensure you have read over Submitting Issues -
 https://github.com/chocolatey/choco#submitting-issues
 
@@ -39,4 +40,4 @@ PLACE LOG CONTENT HERE - WE NEED _ALL_ DETAILED OUTPUT BASED ON THE ABOVE TO BE
 
 </p>
 
-</details>
+</details>
diff --git 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/.uppercut b/.uppercut
@@ -22,7 +22,7 @@
   <property name="version.nuget.prerelease" value="beta" overwrite="false" />
   <property name="version.use.build_date" value="true" overwrite="false" />
   <property name="assembly.description" value="${project.name} is a product of ${company.name} - All Rights Reserved." overwrite="false" />
-  <property name="assembly.copyright" value="Copyright © 2017 - 2019 ${company.name} Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved." overwrite="false" />
+  <property name="assembly.copyright" value="Copyright © 2017 - 2020 ${company.name} Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved." overwrite="false" />
   <property name="sign.project_with_key" value="true" overwrite="false" />
 
   <!-- Build Features Overrides -->

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -62,13 +62,13 @@ The process for contributions is roughly as follows:
 ### Prerequisites
  * Submit the Enhancement ticket. You will need the issue id for your commits.
  * Ensure you have signed the Contributor License Agreement (CLA) - without this we are not able to take contributions that are not trivial.
-  * [Sign the Contributor License Agreement](https://www.clahub.com/agreements/chocolatey/choco).
+  * [Sign the Contributor License Agreement](https://cla-assistant.io/chocolatey/choco).
   * You must do this for each Chocolatey project that requires it.
   * If you are curious why we would require a CLA, we agree with Julien Ponge - take a look at his [post](https://julien.ponge.org/blog/in-defense-of-contributor-license-agreements/).
  * You agree to follow the [etiquette regarding communication](https://github.com/chocolatey/choco#etiquette-regarding-communication).
 
 #### Definition of Trivial Contributions
-It's hard to define what is a trivial contribution. Sometimes even a 1 character change can be considered significant. Unfortunately because it can be subjective, the decision on what is trivial comes from the committers of the project and not from folks contributing to the project. It is generally safe to assume that you may be subject to signing the [CLA](https://www.clahub.com/agreements/chocolatey/choco) and be prepared to do so. Ask in advance if you are not sure and for reasons are not able to sign the [CLA](https://www.clahub.com/agreements/chocolatey/choco).
+It's hard to define what is a trivial contribution. Sometimes even a 1 character change can be considered significant. Unfortunately because it can be subjective, the decision on what is trivial comes from the committers of the project and not from folks contributing to the project. It is generally safe to assume that you may be subject to signing the [CLA](https://cla-assistant.io/chocolatey/choco) and be prepared to do so. Ask in advance if you are not sure and for reasons are not able to sign the [CLA](https://cla-assistant.io/chocolatey/choco).
 
 What is generally considered trivial:
 
@@ -84,7 +84,6 @@ What is generally not considered trivial:
 
 Yes, and this aspect is not up for discussion. If you would like more resources on understanding CLAs, please see the following articles:
 
-* [What is a CLA and why do I care?](https://www.clahub.com/pages/why_cla)
 * [In defense of Contributor License Agreements](https://julien.ponge.org/blog/in-defense-of-contributor-license-agreements/)
 * [Contributor License Agreements](http://oss-watch.ac.uk/resources/cla)
 * Dissenting opinion - [Why your project doesn't need a Contributor License Agreement](https://sfconservancy.org/blog/2014/jun/09/do-not-need-cla/)