Merge pull request #1215 from ykuijs/master

Quick fix for v4.1
dsccommunity · Jun 12, 2020 · cb73c34 · cb73c34
2 parents 93c9541 + 3650fb2
commit cb73c34
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- SharePointDsc
+  - Renamed custom event log to SPDsc to prevent event log naming issue.
+
 ## [4.1.0] - 2020-06-10
 
 ### Added

diff --git a/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 b/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1
@@ -21,7 +21,7 @@ function Add-SPDscEvent
         $EventID = 1
     )
 
-    $LogName = 'SharePointDsc'
+    $LogName = 'SPDsc'
 
     if ([System.Diagnostics.EventLog]::SourceExists($Source))
     {

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -42,12 +42,12 @@ stages:
               ArtifactName: 'output'
               publishLocation: 'Container'
 
-          # - task: PublishBuildArtifacts@1
-          #   displayName: 'Publish Wiki Content Artifact'
-          #   inputs:
-          #     pathToPublish: 'output/WikiContent/'
-          #     artifactName: 'WikiContent'
-          #     publishLocation: 'Container'
+          - task: PublishBuildArtifacts@1
+            displayName: 'Publish Wiki Content Artifact'
+            inputs:
+              pathToPublish: 'output/WikiContent/'
+              artifactName: 'WikiContent'
+              publishLocation: 'Container'
 
   - stage: Test
     dependsOn: Build

diff --git a/build.yaml b/build.yaml
@@ -46,7 +46,7 @@ BuildWorkflow:
     - Build_NestedModules_ModuleBuilder
     - Create_changelog_release_output
     #- Generate_Conceptual_Help
-    # - Generate_Wiki_Content
+    - Generate_Wiki_Content
 
   pack:
     - build
@@ -113,8 +113,8 @@ ModuleBuildTasks:
   # - ModuleName: 'alias to search'
   Sampler:
     - '*.build.Sampler.ib.tasks' # this means: import (dot source) all aliases ending with .ib.tasks exported by sampler module
-  # DscResource.DocGenerator:
-  #   - 'Task.*'
+  DscResource.DocGenerator:
+    - 'Task.*'
 
 # Invoke-Build Header to be used to 'decorate' the terminal output of the tasks.
 TaskHeader: |