Merge pull request #41 from DNNCommunity/develop

Merging for 09.00.01 release
DNNCommunity · Jul 7, 2019 · 8856d40 · 8856d40
2 parents 38eb581 + 5afaaf4
commit 8856d40
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 7 deletions.
diff --git a/DNN.Survey/DNN_Survey.dnn b/DNN.Survey/DNN_Survey.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_Survey" type="Module" version="09.00.00">
+    <package name="DNN_Survey" type="Module" version="09.00.01">
       <friendlyName>Survey</friendlyName>
       <description>
         <![CDATA[
@@ -672,7 +672,7 @@
             <script type="UnInstall">
               <path>Providers\DataProviders\SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>09.00.00</version>
+              <version>09.00.01</version>
             </script>
           </scripts>
         </component>
@@ -760,7 +760,7 @@
             <attributes>
               <businessControllerClass>DNN.Modules.Survey.Components.Controllers.SurveyBusinessController</businessControllerClass>
               <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-              <upgradeVersionsList>03.01.00,03.03.00,04.00.20,04.00.60,04.00.70,04.00.85,04.01.00,04.05.00,04.06.00,04.07.00,09.00.00</upgradeVersionsList>
+              <upgradeVersionsList>03.01.00,03.03.00,04.00.20,04.00.60,04.00.70,04.00.85,04.01.00,04.05.00,04.06.00,04.07.00,09.00.00,09.00.01</upgradeVersionsList>
             </attributes>
           </eventMessage>
         </component>
@@ -770,7 +770,7 @@
             <assembly>
               <path>bin</path>
               <name>DNN.Modules.Survey.dll</name>
-              <version>9.0.0.0</version>
+              <version>9.0.1.0</version>
             </assembly>
           </assemblies>
         </component>

diff --git a/DNN.Survey/Properties/AssemblyInfo.cs b/DNN.Survey/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 //
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
-[assembly: AssemblyVersion("9.0.0.0")]
-[assembly: AssemblyFileVersion("9.0.0.0")]
+[assembly: AssemblyVersion("9.0.1.0")]
+[assembly: AssemblyFileVersion("9.0.1.0")]
 
 // Add assembly reference to allow for WebResource.axd access to JavaScript files
 // see: http://aspnet.4guysfromrolla.com/articles/080906-1.aspx

diff --git a/DNN.Survey/Settings.ascx.cs b/DNN.Survey/Settings.ascx.cs
@@ -200,7 +200,7 @@ private void UpdateBooleanSetting(string settingName, bool settingValue, bool is
             }
             else
             {
-               ModuleController.Instance.DeleteModuleSetting(TabModuleId, settingName);
+               ModuleController.Instance.DeleteModuleSetting(ModuleId, settingName);
             }
          }
       }

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -0,0 +1,38 @@
+# The DNN Community Modules Build .yml.
+# Add steps to the build, run tests, deploy and more:
+# https://aka.ms/yml
+#
+# NOTE: Whitespace is super important with yml, please respect 
+#       the necessary whitespace for different jobs/tasks/etc
+
+resources:
+  repositories:
+    # References the DNN Community Modules Build DevOps repository which contains
+    # yml files that will make running the build simple. It is not required to use
+    # the repository but it will make configuring the build easier
+    - repository: DevOps 
+      type: git
+      ref: 'refs/heads/master'
+      name: "DevOps.Templates"
+
+
+# Build triggers tell Azure DevOps when to run the build.
+# PR builds are implied unless explicitly defined
+trigger:
+  branches:
+    include:
+    - development
+    - master # The CI build will execute with every commit to the master branch of PR merge
+
+jobs:
+- template: azure-pipelines.yml@DevOps # The entry point template from the DevOps repository
+
+  # there are optional parameters you can send to the build. If
+  # you would like to use the option parameters just uncomment 
+  # 'parameters:' and then the parameters you would like to use
+
+  #parameters:
+    #version: "5.0.1.$[counter('versioncounter', 0)]" # Sets the current build version that includes a revision counter. Default: '1.0.0.0'
+    #configuration: 'Release' # The build configuration. Default: 'Release'
+    #platform: 'Any CPU' # The build platform. Default: 'Any CPU'
+    #solution: '**/*.sln' # The path to the solution file. Default: '**/*.sln'