Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
--- a/mcs/class/referencesource/System.Activities/System/Activities/Hosting/WorkflowInstance.cs
+++ b/mcs/class/referencesource/System.Activities/System/Activities/Hosting/WorkflowInstance.cs
@@ -48,6 +48,20 @@ namespace System.Activities.Hosting
        StackTrace abortStack;
 #endif

+        static WorkflowInstance()
+        {
+            try
+            {
+                using (TelemetryEventSource eventSource = new TelemetryEventSource())
+                {
+                    eventSource.V2Runtime();
+                }
+            }
+            catch
+            {
+            }
+        }
+
        protected WorkflowInstance(Activity workflowDefinition)
            : this(workflowDefinition, null)
        {
--- a/mcs/class/referencesource/System.Activities/System/Activities/WorkflowApplication.cs.REMOVED.git-id
+++ b/mcs/class/referencesource/System.Activities/System/Activities/WorkflowApplication.cs.REMOVED.git-id
@@ -1 +1 @@
-2090063250746eae0b7a6eaec193aac86984b785
+ff9b74d7295d3a52cf91057ee647d184edec0c5e