Merge pull request UiPath#64 from UiPath/net_core_30

Target .Net Core 3.0 desktop
ThomasZitzler · Oct 11, 2019 · f6be52b · f6be52b
2 parents 66da71b + 644f934
commit f6be52b
Show file tree

Hide file tree

Showing 104 changed files with 137 additions and 150 deletions.
diff --git a/src/CoreWf.EtwTracking/System.Activities.EtwTracking.csproj b/src/CoreWf.EtwTracking/System.Activities.EtwTracking.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <Title>Core WF ETW Tracking Provider</Title>
     <Description>Unofficial port of the Windows Workflow Foundation (WF) ETW tracking provider to the .NET Standard</Description>
     <Authors>Dustin Metzgar,Jim Carley</Authors>

diff --git a/src/CoreWf/Activity.cs b/src/CoreWf/Activity.cs
@@ -13,7 +13,7 @@
 using System.ComponentModel;
 using System.Globalization;
 using System.Threading;
-using Portable.Xaml.Markup;
+using System.Windows.Markup;
 using System.Activities.Internals;
 
 #if NET45

diff --git a/src/CoreWf/ActivityBuilder.cs b/src/CoreWf/ActivityBuilder.cs
@@ -12,8 +12,8 @@ namespace System.Activities
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.ComponentModel;
-    using Portable.Xaml.Markup;
-    using Portable.Xaml;
+    using System.Windows.Markup;
+    using System.Xaml;
     using System;
 
     [ContentProperty("Implementation")]

diff --git a/src/CoreWf/ActivityDelegate.cs b/src/CoreWf/ActivityDelegate.cs
@@ -6,7 +6,7 @@ namespace System.Activities
     using System.Activities.Validation;
     using System.Collections.Generic;
     using System.ComponentModel;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Collections.ObjectModel;
     using System;
     using System.Activities.Runtime;

diff --git a/src/CoreWf/Argument.cs b/src/CoreWf/Argument.cs
@@ -10,7 +10,7 @@ namespace System.Activities
     using System.Collections.Generic;
     using System.ComponentModel;
     using System.Runtime.Serialization;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Activities.Internals;
 
     public abstract class Argument

diff --git a/src/CoreWf/AssemblyInfo.cs b/src/CoreWf/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 // See LICENSE file in the project root for full license information.
 using System;
 using System.Runtime.InteropServices;
-using Portable.Xaml.Markup;
+using System.Windows.Markup;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information

diff --git a/src/CoreWf/CoreWf.nuspec b/src/CoreWf/CoreWf.nuspec
@@ -15,7 +15,6 @@
     <dependencies>
       <group targetFramework=".NETStandard2.0">
         <dependency id="Microsoft.Extensions.Localization" version="2.1.1" exclude="Build,Analyzers" />
-        <dependency id="Portable.Xaml" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="System.ComponentModel.EventBasedAsync" version="4.3.0" exclude="Build,Analyzers" />
         <dependency id="System.Reflection.TypeExtensions" version="4.5.0" exclude="Build,Analyzers" />
         <dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />

diff --git a/src/CoreWf/Debugger/DebugInfo.cs b/src/CoreWf/Debugger/DebugInfo.cs
@@ -7,14 +7,13 @@ namespace System.Activities.Debugger
     using System.Activities.XamlIntegration;
     using System.Collections.Generic;
     using System.ComponentModel;
-    using System.Diagnostics;
     using System.Diagnostics.CodeAnalysis;
     using System.Globalization;
     using System.Linq;
     using System.Linq.Expressions;
     using System.Runtime;
-    using Portable.Xaml.Markup;
-    using Portable.Xaml;
+    using System.Windows.Markup;
+    using System.Xaml;
     using System.Activities.Internals;
     using System.Activities.Runtime;
 

diff --git a/src/CoreWf/Debugger/SourceLocationProvider.cs b/src/CoreWf/Debugger/SourceLocationProvider.cs
@@ -6,21 +6,21 @@ namespace System.Activities.Debugger
     using System;
     using System.Activities.Hosting;
     using System.Activities.XamlIntegration;
-    using System.Diagnostics;
     using System.Collections.Generic;
     using System.Diagnostics.CodeAnalysis;
     using System.Activities.Runtime;
     using System.Reflection;
     using System.Security;
     using System.Security.Permissions;
-    using Portable.Xaml;
+    using System.Xaml;
     using System.Xml;
     using System.IO;
     using System.Activities.Validation;
     using System.Collections.ObjectModel;
     using System.Runtime.Serialization;
     using System.Activities.Debugger.Symbol;
     using System.Globalization;
+    using Trace = System.Diagnostics.Trace;
 
     // Provide SourceLocation information for activities in given root activity.
     // This is integration point with Workflow project system (TBD).
@@ -31,7 +31,7 @@ namespace System.Activities.Debugger
     //  3.  Publish (serialize to tmp file) and deserialize it to collect SourceLocation (for loose xaml).
     // Current code cover only step 3.
 
-    [DebuggerNonUserCode]
+    [Diagnostics.DebuggerNonUserCode]
     public static class SourceLocationProvider
     {
         [Fx.Tag.Throws(typeof(Exception), "Calls Serialize/Deserialize to temporary file")]

diff --git a/src/CoreWf/Debugger/Symbol/DebugSymbol.cs b/src/CoreWf/Debugger/Symbol/DebugSymbol.cs
@@ -4,7 +4,7 @@ namespace System.Activities.Debugger.Symbol
 {
     using System;
     using System.Diagnostics.CodeAnalysis;
-    using Portable.Xaml;
+    using System.Xaml;
     using System.Activities.Runtime;
 
     [Fx.Tag.XamlVisible(false)]

diff --git a/src/CoreWf/Debugger/XamlDebuggerXmlReader.cs b/src/CoreWf/Debugger/XamlDebuggerXmlReader.cs
@@ -8,10 +8,9 @@ namespace System.Activities.Debugger
     using System.IO;
     using System.Reflection;
     using System.Runtime;
-    using Portable.Xaml;
-    using Portable.Xaml.Schema;
+    using System.Xaml;
+    using System.Xaml.Schema;
     using System.ComponentModel;
-    using Portable.Xaml.Markup;
     using System.Activities.XamlIntegration;
     using System;
     using System.Activities.Runtime;

diff --git a/src/CoreWf/Debugger/XamlMemberExtensions.cs b/src/CoreWf/Debugger/XamlMemberExtensions.cs
@@ -4,8 +4,8 @@
 namespace System.Activities.Debugger
 {
     using System.Reflection;
-    using Portable.Xaml;
-    using Portable.Xaml.Schema;
+    using System.Xaml;
+    using System.Xaml.Schema;
 
     internal static class XamlMemberExtensions
     {

diff --git a/src/CoreWf/Debugger/XamlNode.cs b/src/CoreWf/Debugger/XamlNode.cs
@@ -4,7 +4,7 @@
 namespace System.Activities.Debugger
 {
     using System.Text;
-    using Portable.Xaml;
+    using System.Xaml;
 
     internal class XamlNode
     {

diff --git a/src/CoreWf/DynamicActivity.cs b/src/CoreWf/DynamicActivity.cs
@@ -9,7 +9,7 @@ namespace System.Activities
     using System.Activities.XamlIntegration;
     using System.Collections.ObjectModel;
     using System.ComponentModel;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
 
     [ContentProperty("Implementation")]
     public sealed class DynamicActivity : Activity, ICustomTypeDescriptor, IDynamicActivity

diff --git a/src/CoreWf/Expressions/CompiledExpressionInvoker.cs b/src/CoreWf/Expressions/CompiledExpressionInvoker.cs
@@ -7,7 +7,7 @@ namespace System.Activities.Expressions
     using System.Activities.XamlIntegration;
     using System.Collections.Generic;
     using System.Linq.Expressions;
-    using Portable.Xaml;
+    using System.Xaml;
     using System.Activities.Internals;
 
     public class CompiledExpressionInvoker

diff --git a/src/CoreWf/Expressions/DelegateArgumentReference.cs b/src/CoreWf/Expressions/DelegateArgumentReference.cs
@@ -3,7 +3,7 @@
 
 namespace System.Activities.Expressions
 {
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
 
     [ContentProperty("DelegateArgument")]
     public sealed class DelegateArgumentReference<T> : EnvironmentLocationReference<T>

diff --git a/src/CoreWf/Expressions/DelegateArgumentValue.cs b/src/CoreWf/Expressions/DelegateArgumentValue.cs
@@ -4,7 +4,7 @@
 namespace System.Activities.Expressions
 {
     using System.Activities.Runtime;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
 
     [ContentProperty("DelegateArgument")]
     public sealed class DelegateArgumentValue<T> : EnvironmentLocationValue<T>

diff --git a/src/CoreWf/Expressions/IndexerReference.cs b/src/CoreWf/Expressions/IndexerReference.cs
@@ -8,7 +8,7 @@ namespace System.Activities.Expressions
     using System.Reflection;
     using System.Activities.Runtime.Collections;
     using System.Runtime.Serialization;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Threading;
     using System;
     using System.Activities.Runtime;

diff --git a/src/CoreWf/Expressions/InvokeFunc.cs b/src/CoreWf/Expressions/InvokeFunc.cs
@@ -4,7 +4,7 @@
 namespace System.Activities.Expressions
 {
     using System.ComponentModel;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
 
 #if NET45
     using System.Activities.DynamicUpdate; 

diff --git a/src/CoreWf/Expressions/InvokeMethod.cs b/src/CoreWf/Expressions/InvokeMethod.cs
@@ -6,7 +6,7 @@ namespace System.Activities.Expressions
     using System.Activities.Statements;
     using System.Collections.ObjectModel;
     using System.ComponentModel;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Reflection;
     using System.Threading;
     using System;

diff --git a/src/CoreWf/Expressions/LambdaReference.cs b/src/CoreWf/Expressions/LambdaReference.cs
@@ -7,7 +7,7 @@ namespace System.Activities.Expressions
     using System.Activities.XamlIntegration;
     using System.Diagnostics;
     using System.Linq.Expressions;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Activities.Runtime;
     using System.Activities.Internals;
 

diff --git a/src/CoreWf/Expressions/LambdaValue.cs b/src/CoreWf/Expressions/LambdaValue.cs
@@ -7,7 +7,7 @@ namespace System.Activities.Expressions
     using System.Activities.XamlIntegration;
     using System.Diagnostics;
     using System.Linq.Expressions;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Activities.Runtime;
     using System.Activities.Internals;
 

diff --git a/src/CoreWf/Expressions/Literal.cs b/src/CoreWf/Expressions/Literal.cs
@@ -8,7 +8,7 @@ namespace System.Activities.Expressions
     using System.ComponentModel;
     using System.Diagnostics;
     using System.Text.RegularExpressions;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Activities.Runtime;
 
     [DebuggerStepThrough]

diff --git a/src/CoreWf/Expressions/MultidimensionalArrayItemReference.cs b/src/CoreWf/Expressions/MultidimensionalArrayItemReference.cs
@@ -10,7 +10,7 @@ namespace System.Activities.Expressions
     using System.Activities.Internals;
     using System.Activities.Runtime;
     using System.Activities.Runtime.Collections;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
 
     [ContentProperty("Indices")]
     public sealed class MultidimensionalArrayItemReference<TItem> : CodeActivity<Location<TItem>>

diff --git a/src/CoreWf/Expressions/New.cs b/src/CoreWf/Expressions/New.cs
@@ -7,7 +7,7 @@ namespace System.Activities.Expressions
     using System.Collections.ObjectModel;
     using System.Reflection;
     using System.Activities.Runtime.Collections;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Threading;
     using System;
     using System.Activities.Runtime;

diff --git a/src/CoreWf/Expressions/NewArray.cs b/src/CoreWf/Expressions/NewArray.cs
@@ -7,7 +7,7 @@ namespace System.Activities.Expressions
     using System.Collections.ObjectModel;
     using System.Reflection;
     using System.Activities.Runtime.Collections;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System;
     using System.Activities.Internals;
 

diff --git a/src/CoreWf/Expressions/TextExpression.cs b/src/CoreWf/Expressions/TextExpression.cs
@@ -8,7 +8,7 @@ namespace System.Activities.Expressions
     using System.Collections.ObjectModel;
     using System.Reflection;
     using System.Activities.Internals;
-    using Portable.Xaml;
+    using System.Xaml;
 
     public static class TextExpression
     {

diff --git a/src/CoreWf/Expressions/ValueTypeIndexerReference.cs b/src/CoreWf/Expressions/ValueTypeIndexerReference.cs
@@ -8,7 +8,7 @@ namespace System.Activities.Expressions
     using System.Reflection;
     using System.Activities.Runtime.Collections;
     using System.Runtime.Serialization;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Threading;
     using System;
     using System.Activities.Runtime;

diff --git a/src/CoreWf/Hosting/WorkflowInstance.cs b/src/CoreWf/Hosting/WorkflowInstance.cs
@@ -9,7 +9,6 @@ namespace System.Activities.Hosting
     using System.Activities.Validation;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
-    using System.Diagnostics;
     using System.Threading;
     using System.Activities.Runtime.DurableInstancing;
     using System.Activities.Internals;
@@ -40,7 +39,7 @@ public abstract class WorkflowInstance
         private Exception abortedException;
 
 #if DEBUG
-        private readonly StackTrace abortStack;
+        private readonly Diagnostics.StackTrace abortStack;
 #endif
 
         protected WorkflowInstance(Activity workflowDefinition)

diff --git a/src/CoreWf/InArgument.cs b/src/CoreWf/InArgument.cs
@@ -9,7 +9,7 @@ namespace System.Activities
     using System.Activities.XamlIntegration;
     using System.ComponentModel;
     using System.Linq.Expressions;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Activities.Internals;
 
     public abstract class InArgument : Argument

diff --git a/src/CoreWf/InOutArgument.cs b/src/CoreWf/InOutArgument.cs
@@ -9,7 +9,7 @@ namespace System.Activities
     using System.Activities.Runtime;
     using System.ComponentModel;
     using System.Linq.Expressions;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Activities.Internals;
 
     public abstract class InOutArgument : Argument

diff --git a/src/CoreWf/Microsoft/CSharp/Activities/CSharpReference.cs b/src/CoreWf/Microsoft/CSharp/Activities/CSharpReference.cs
@@ -12,7 +12,7 @@ namespace Microsoft.CSharp.Activities
     using System.ComponentModel;
     using System.Diagnostics;
     using System.Linq.Expressions;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Activities.Internals;
 
     [DebuggerStepThrough]

diff --git a/src/CoreWf/Microsoft/CSharp/Activities/CSharpValue.cs b/src/CoreWf/Microsoft/CSharp/Activities/CSharpValue.cs
@@ -15,7 +15,7 @@ namespace Microsoft.CSharp.Activities
     using System.Linq.Expressions;
     using System.Reflection;
     using System.Activities.Runtime;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.Activities.Internals;
 
     [DebuggerStepThrough]

diff --git a/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasic.cs b/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasic.cs
@@ -8,7 +8,7 @@ namespace Microsoft.VisualBasic.Activities
     using System.Activities;
     using System.Diagnostics.CodeAnalysis;
     using System.Activities.Runtime;
-    using Portable.Xaml;
+    using System.Xaml;
 
     //[SuppressMessage(FxCop.Category.Naming, FxCop.Rule.TypeNamesShouldNotMatchNamespaces,
     //    Justification = "Approved name")]

diff --git a/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasicHelper.cs b/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasicHelper.cs
@@ -46,7 +46,7 @@ internal static string Language
                 typeof(int).Assembly, // mscorlib
                 typeof(CodeTypeDeclaration).Assembly, // System
                 typeof(Expression).Assembly,             // System.Core
-                typeof(Microsoft.VisualBasic.Strings).Assembly,  // Microsoft.VisualBasic
+                Assembly.Load("Microsoft.VisualBasic"),
                 typeof(Activity).Assembly  // System.Activities
             };
 

diff --git a/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasicImportReference.cs b/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasicImportReference.cs
@@ -8,7 +8,7 @@ namespace Microsoft.VisualBasic.Activities
     using System.Globalization;
     using System.Reflection;
     using System.Activities.Expressions;
-    using Portable.Xaml;
+    using System.Xaml;
     using System.Xml.Linq;
 
     public class VisualBasicImportReference : IEquatable<VisualBasicImportReference>

diff --git a/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasicReference.cs b/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasicReference.cs
@@ -12,7 +12,7 @@ namespace Microsoft.VisualBasic.Activities
     using System.Activities.ExpressionParser;
     using System.Activities.XamlIntegration;
     using System.Linq.Expressions;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.ComponentModel;
     using System.Activities.Runtime;
     using System.Activities.Internals;

diff --git a/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasicSettings.cs b/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasicSettings.cs
@@ -9,8 +9,8 @@ namespace Microsoft.VisualBasic.Activities
     using System.Activities;
     using System.Collections.Generic;
     using System.Activities.Runtime;
-    using Portable.Xaml.Markup;
-    using Portable.Xaml;
+    using System.Windows.Markup;
+    using System.Xaml;
     using System.ComponentModel;
     using System.Reflection;
     using System.Activities.Internals;

diff --git a/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasicValue.cs b/src/CoreWf/Microsoft/VisualBasic/Activities/VisualBasicValue.cs
@@ -12,7 +12,7 @@ namespace Microsoft.VisualBasic.Activities
     using System.Activities.ExpressionParser;
     using System.Activities.XamlIntegration;
     using System.Linq.Expressions;
-    using Portable.Xaml.Markup;
+    using System.Windows.Markup;
     using System.ComponentModel;
     using System.Activities.Runtime;
     using System.Activities.Internals;