Merge pull request #979 from SubPointSolutions/dev

SPMeta2 1.2.120-beta3, March 2017
SubPointSolutions · Mar 16, 2017 · c68a643 · c68a643
2 parents 561e743 + 85dce4a
commit c68a643
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 35 deletions.
diff --git a/SPMeta2/Build/Build.csproj b/SPMeta2/Build/Build.csproj
@@ -47,6 +47,7 @@
     <None Include="build-v12.cake" />
     <None Include="build.json" />
     <None Include="build-v12.ps1" />
+    <None Include="github-release-notes.chtml" />
     <None Include="Pester\pester.run.ps1" />
     <None Include="Pester\regression.nuget.ps1" />
     <None Include="Pester\_install.ps1" />

diff --git a/SPMeta2/Build/build.json b/SPMeta2/Build/build.json
@@ -227,7 +227,7 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2",
             "Id": "SPMeta2.Core",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
             "ProjectUrl": "https://github.com/SubPointSolutions/spmeta2",
@@ -266,11 +266,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.Standard",
             "Id": "SPMeta2.Core.Standard",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -311,11 +311,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -348,15 +348,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -389,11 +389,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM",
             "Id": "SPMeta2.SSOM.Foundation",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -426,15 +426,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM.Standard",
             "Id": "SPMeta2.SSOM.Standard",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.SSOM.Foundation",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -468,11 +468,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation-v14",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -498,15 +498,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard-v14",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation-v14",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -532,11 +532,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM",
             "Id": "SPMeta2.SSOM.Foundation-v14",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -562,15 +562,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.SSOM.Standard",
             "Id": "SPMeta2.SSOM.Standard-v14",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.SSOM.Foundation-v14",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 }
             ],
             "LicenseUrl": "http://docs.subpointsolutions.com/spmeta2/license",
@@ -596,11 +596,11 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM",
             "Id": "SPMeta2.CSOM.Foundation-v16",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.Core",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 },
                 {
                     "Id": "Microsoft.SharePointOnline.CSOM",
@@ -637,15 +637,15 @@
         {
             "CustomProjectFolder" : "SPMeta2/SPMeta2.CSOM.Standard",
             "Id": "SPMeta2.CSOM.Standard-v16",
-            "Version": "1.2.120-beta2",
+            "Version": "1.2.120-beta3",
             "Dependencies": [ 
                 {
                     "Id": "SPMeta2.CSOM.Foundation-v16",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 },
                 {
                     "Id": "SPMeta2.Core.Standard",
-                    "Version": "1.2.120-beta2"
+                    "Version": "1.2.120-beta3"
                 },
                 {
                     "Id": "Microsoft.SharePointOnline.CSOM",

diff --git a/SPMeta2/Build/github-release-notes.chtml b/SPMeta2/Build/github-release-notes.chtml
@@ -0,0 +1,33 @@
+## What's new in @Model.ReleaseTitle @Model.ReleaseVersion, @Model.ReleaseMonthAndYear
+
+@if(!System.String.IsNullOrEmpty(Model.AssemblyFileVersion)) 
+{
+<text>
+AssemblyFileVersion: @Model.AssemblyFileVersion
+</text>
+}
+
+@foreach(var releaseGroup in Model.ReleaseIssueGroups){
+
+var items = releaseGroup.Issues;
+var label = releaseGroup.Label;
+var labelTitle = releaseGroup.LabelTitle;
+
+if (items.Count > 0) 
+{
+<text>
+### @labelTitle
+@foreach (var item in items)
+{
+<text>* <a href='@item.Url'>#@item.Number</a>, @item.Title</text>
+}
+</text>
+}
+}
+
+### Feature requests, support and contributions
+This project is a part of the [SPMeta2 ecosystem](http://subpointsolutions.com). In case you have unexpected issues, feedback or keen to see new features, please join [Yammer Community](https://www.yammer.com/spmeta2feedback), check out [documentation](http://docs.subpointsolutions.com/spmeta2/) or post your feedback or issues directly at [GitHub issue tracker](https://github.com/SubPointSolutions/spmeta2/issues). Enterprise support and SLA is [available upon request](http://subpointsolutions.com/services/).
+
+* [Yammer Community](https://www.yammer.com/spmeta2feedback)
+* [@Model.ProjectName documentation](http://docs.subpointsolutions.com/spmeta2/)
+* [GitHub issue tracker](https://github.com/SubPointSolutions/spmeta2/issues)
diff --git a/SPMeta2/Build/tools/packages.config b/SPMeta2/Build/tools/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Cake" version="0.17.0" />
-  <package id="SubPointSolutions.CakeBuildTools" version="0.1.0-beta3"  />
+  <package id="SubPointSolutions.CakeBuildTools" version="0.1.0-beta5"  />
 </packages>
diff --git a/SPMeta2/SPMeta2/Services/Impl/DefaultModelTreeTraverseService.cs b/SPMeta2/SPMeta2/Services/Impl/DefaultModelTreeTraverseService.cs
@@ -84,11 +84,11 @@ public override void Traverse(object modelHost, ModelNode modelNode)
                 TraceService.VerboseFormat((int)LogEventId.ModelProcessing,
                     "Raising OnModelProcessing for model: [{0}].", modelNode);
 
+                OnBeforeDeployModelNode(modelHost, modelNode);
+
                 if (OnModelProcessing != null)
                     OnModelProcessing(modelNode);
 
-                OnBeforeDeployModelNode(modelHost, modelNode);
-
                 //var requireselfProcessing = modelDefinition.RequireSelfProcessing || modelNode.Options.RequireSelfProcessing;
                 var requireselfProcessing = modelNode.Options.RequireSelfProcessing;
 
@@ -123,11 +123,14 @@ public override void Traverse(object modelHost, ModelNode modelNode)
                 TraceService.VerboseFormat((int)LogEventId.ModelProcessing,
                     "Raising OnModelProcessed for model: [{0}].", modelNode);
 
+                // call up before OnModelProcessed
+                // Incremental provision real time trace problems #978
+                // https://github.com/SubPointSolutions/spmeta2/issues/978
+                OnAfterDeployModelNode(modelHost, modelNode);
+
                 if (OnModelProcessed != null)
                     OnModelProcessed(modelNode);
 
-                OnAfterDeployModelNode(modelHost, modelNode);
-
                 var childModelTypes = GetSortedChildModelTypes(modelNode);
 
                 foreach (var childModelType in childModelTypes)

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,7 +3,8 @@ test: off
 clone_folder: c:\prj\m2
 
 build_script: 
-    - ps: c:\prj\m2\SPMeta2\Build\build.ps1 -Verbosity Minimal -Target "Default-CI"
+    - ps: c:\prj\m2\SPMeta2\Build\build.ps1 -Target "Default-CI"
 
 artifacts:
-    - path: '**\*.nupkg'
+    - path: '**\build-artifact-nuget-packages\*.nupkg'
+    - path: '**\build-artifact-cli-packages\*.nupkg'