Revert "Merge pull request #1 from chocolatey/master"

This reverts commit c8512aa, reversing changes made to 9c0a77d.
chocolatey · Jan 17, 2019 · b16089a · b16089a
1 parent c2ec501
commit b16089a
Show file tree

Hide file tree

Showing 361 changed files with 1,323 additions and 3,357 deletions.
diff --git a/.build.custom/ilmerge.replace.build b/.build.custom/ilmerge.replace.build
@@ -73,7 +73,7 @@
     <property name="args.ilmerge" value="${args.ilmerge} ${dlls.regular}" />
   </target>
 
-  <target name="run_ilmerge" if="${msbuild.configuration != 'NoResources'}">
+  <target name="run_ilmerge">
     <echo level="Warning" message="Merging the the contents of ${dirs.merge.from} into a single executable - ${dirs.merge.to}${path.separator}${file.merge.name}. This will fail if all dependencies are not resolved."/>
     <echo level="Warning" message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
     <exec program="${app.ilmerge}"

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,9 +1,4 @@
 <!--
-
-REPORTING A SECURITY FINDING?
-Stop, this is not the correct place to provide a security disclosure.
-Please go to https://chocolatey.org/security for the proper disclosure process.
-
 BEFORE YOU SUBMIT AN ISSUE:
 
 Ensure you have read over Submitting Issues -
@@ -13,7 +8,7 @@ DO NOT CREATE ISSUES FOR PACKAGES. Read over Submitting Issues.
 
 DO NOT CREATE AN ISSUE FOR A QUESTION - questions are better served as email or chat.
 - email - http://groups.google.com/group/chocolatey
-- chat - https://gitter.im/chocolatey/choco
+-  chat - https://gitter.im/chocolatey/choco
 
 DELETE EVERYTHING IN THIS COMMENT BLOCK
 

diff --git a/.github/ISSUE_TEMPLATE/AskQuestion.md b/.github/ISSUE_TEMPLATE/AskQuestion.md
diff --git a/.github/ISSUE_TEMPLATE/ReportGUIIssue.md b/.github/ISSUE_TEMPLATE/ReportGUIIssue.md
diff --git a/.github/ISSUE_TEMPLATE/ReportPackageIssue.md b/.github/ISSUE_TEMPLATE/ReportPackageIssue.md
diff --git a/.github/ISSUE_TEMPLATE/ReportWebsiteIssue.md b/.github/ISSUE_TEMPLATE/ReportWebsiteIssue.md
diff --git a/.github/ISSUE_TEMPLATE/SecurityDisclosure.md b/.github/ISSUE_TEMPLATE/SecurityDisclosure.md
diff --git a/.github/ISSUE_TEMPLATE/zChocoFeatureRequest.md b/.github/ISSUE_TEMPLATE/zChocoFeatureRequest.md
diff --git a/.github/ISSUE_TEMPLATE/zChocoReportIssue.md b/.github/ISSUE_TEMPLATE/zChocoReportIssue.md
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ code_drop
 obj
 src/packages
 /.vscode/
-.vs
 
 *.suo
 *.sln.docstates

diff --git a/.uppercut b/.uppercut
@@ -17,12 +17,12 @@
   <property name="version.use_semanticversioning" value="true" overwrite="false" />
   <property name="version.major" value="0" overwrite="false" />
   <property name="version.minor" value="10" overwrite="false" />
-  <property name="version.patch" value="12" overwrite="false" />
+  <property name="version.patch" value="9" overwrite="false" />
   <property name="version.fix" value="0" overwrite="false" />
   <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 - 2018 ${company.name} Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved." overwrite="false" />
+  <property name="assembly.copyright" value="Copyright © 2017 ${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 -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ code_drop @@
     obj
     src/packages
     /.vscode/
-    .vs
     *.suo
     *.sln.docstates
@@ Expand Down @@