Merge pull request #309 from nvisionative/develop

Release 2.1.0

README.md

@@ -1,8 +1,8 @@
-[![Build status](https://nvisionative.visualstudio.com/nvQuickSite/_apis/build/status/nvQuickSite-.NET%20Desktop-CI)](https://nvisionative.visualstudio.com/nvQuickSite/_build/latest?definitionId=2)
+[![nvQuickSite Logo](https://www.nvquicksite.com/Portals/0/nvQuickSite_LOGO_final_yellow.png)](https://www.nvquicksite.com)
 
 nvQuickSite is a desktop installation app for DNN, the world's most popular ASP.NET-based CMS.  This app allows you to easily install DNN onto any environment that meets [the minimum system requirements for DNN to be installed](https://github.com/nvisionative/nvQuickSite/wiki/Minimum-System-Requirements).
 
-![Step 4: Installation Complete](http://www.nvquicksite.com/Portals/0/nvq-install-dnn-09.png)
+![Installation Complete](https://www.nvquicksite.com/Portals/0/adam/Basic%20Content/gjzknonSxESiQva1cwsOfg/Image/nvQuickSite_2.0.0_Progress_Complete.jpg)
 
 ## Why Use nvQuickSite?
 
@@ -25,4 +25,4 @@ There's been many ways to install DNN over the years, but a cult favorite of man
 * [nvQuickSite Footers](https://github.com/nvisionative/nvQuickSite/wiki/nvQuickSite-Footers)
 
 ---
-[![Brought to the DNN community by nvisionative](http://www.nvquicksite.com/Portals/0/broughtBy-nvisionative.png)](http://www.nvisionative.com)
+[![Brought to the DNN community by nvisionative](http://www.nvquicksite.com/Portals/0/broughtBy-nvisionative.png)](http://www.nvisionative.com)

nvQuickSite-AllProjects.sln

@@ -1,28 +1,40 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30523.141
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nvQuickSite", "nvQuickSite\nvQuickSite.csproj", "{3D661BAD-45EB-4524-9650-78805CD31682}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "nvQuickSiteInstaller", "nvQuickSiteInstaller\nvQuickSiteInstaller.vdproj", "{4F272EB7-D34A-4FAB-AD11-4025C75BA1A2}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "nvQuickSiteWixInstaller", "nvQuickSiteWixInstaller\nvQuickSiteWixInstaller.wixproj", "{8EFF619D-489B-4D79-911A-061F33AAD86D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3D661BAD-45EB-4524-9650-78805CD31682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D661BAD-45EB-4524-9650-78805CD31682}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D661BAD-45EB-4524-9650-78805CD31682}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3D661BAD-45EB-4524-9650-78805CD31682}.Debug|x86.Build.0 = Debug|Any CPU
 		{3D661BAD-45EB-4524-9650-78805CD31682}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D661BAD-45EB-4524-9650-78805CD31682}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F272EB7-D34A-4FAB-AD11-4025C75BA1A2}.Debug|Any CPU.ActiveCfg = Debug
-		{4F272EB7-D34A-4FAB-AD11-4025C75BA1A2}.Debug|Any CPU.Build.0 = Debug
-		{4F272EB7-D34A-4FAB-AD11-4025C75BA1A2}.Release|Any CPU.ActiveCfg = Release
-		{4F272EB7-D34A-4FAB-AD11-4025C75BA1A2}.Release|Any CPU.Build.0 = Release
+		{3D661BAD-45EB-4524-9650-78805CD31682}.Release|x86.ActiveCfg = Release|Any CPU
+		{3D661BAD-45EB-4524-9650-78805CD31682}.Release|x86.Build.0 = Release|Any CPU
+		{8EFF619D-489B-4D79-911A-061F33AAD86D}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{8EFF619D-489B-4D79-911A-061F33AAD86D}.Debug|x86.ActiveCfg = Debug|x86
+		{8EFF619D-489B-4D79-911A-061F33AAD86D}.Debug|x86.Build.0 = Debug|x86
+		{8EFF619D-489B-4D79-911A-061F33AAD86D}.Release|Any CPU.ActiveCfg = Release|x86
+		{8EFF619D-489B-4D79-911A-061F33AAD86D}.Release|Any CPU.Build.0 = Release|x86
+		{8EFF619D-489B-4D79-911A-061F33AAD86D}.Release|x86.ActiveCfg = Release|x86
+		{8EFF619D-489B-4D79-911A-061F33AAD86D}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3CF2946C-FF56-4DE4-A75C-8449DA170FDD}
+	EndGlobalSection
 EndGlobal

nvQuickSite/Properties/AssemblyInfo.cs

@@ -49,6 +49,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0")]
-[assembly: AssemblyFileVersion("2.0.0")]
+[assembly: AssemblyVersion("2.1.0")]
+[assembly: AssemblyFileVersion("2.1.0")]
 [assembly: NeutralResourcesLanguage("en")]

nvQuickSite/data/latestVersion.json

@@ -1,3 +1,3 @@
 {
-  "latestVersion": "2.0.0"
+  "latestVersion": "2.1.0"
 }

nvQuickSite/nvQuickSite.csproj

@@ -61,6 +61,7 @@
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>
     </CodeAnalysisRuleSet>
+    <DocumentationFile>bin\Release\nvQuickSite.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>0A724629BFD7DFCC40A44BF2FB61D13E16ED4A93</ManifestCertificateThumbprint>