Convert Xamarin.Interactive.dll from PCL to .NET Standard

Additionally, the Xamarin.Interactive.Shared project that was consumed by each agent assembly is gone. All those types are now part of the actual Xamarin.Interactive.dll. Same with Xamarin.Interactive.Bootstrap. InspectorSupport is no longer a partial class, because the shared projects are gone now. But we need to keep the same API for Inspector extension compatibility, and because that API is based on static methods there's no helpful way to abstract any of it. So there is a little duplication now. Xamarin.Interactive.Facades is no longer necessary, and neither is the PCL loading code in `UnifiedInspectorSupport`. Xamarin.Forms has been bumped from 2.3.4.231 to 2.4.0.18342 for .NET Standard 2.0 support. `CompilationWorkspaceFactory` has to do some manual loading of `Xamarin.Interactive.dll` and `netstandard.dll` now, but this will go away when dotnet/roslyn#20920 gets fixed.
microsoft · Nov 10, 2017 · 95af2aa · 95af2aa
1 parent 15f6a13
commit 95af2aa
Show file tree

Hide file tree

Showing 84 changed files with 1,427 additions and 816 deletions.
diff --git a/Agents/Xamarin.Interactive.Android/AndroidAgent.cs b/Agents/Xamarin.Interactive.Android/AndroidAgent.cs
@@ -36,7 +36,6 @@ class AndroidAgent : Agent, IViewHierarchyHandler
 
         AG.Point displaySize;
         int contentId;
-        string deviceIpAddress;
 
         public IActivityTracker ActivityTracker { get; set; }
         internal int ContentId => contentId;

diff --git a/Agents/Xamarin.Interactive.Android/InspectorSupport.cs b/Agents/Xamarin.Interactive.Android/InspectorSupport.cs
@@ -5,6 +5,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using System;
+using System.Runtime.CompilerServices;
 using System.Threading;
 
 using Android.App;
@@ -14,13 +16,14 @@
 
 namespace Xamarin
 {
-    public static partial class InspectorSupport
+    public static class InspectorSupport
     {
         static readonly SynchronizationContext mainContext = Application.SynchronizationContext;
         static Timer timer;
         static readonly ActivityTrackerWrapper activityTracker = new ActivityTrackerWrapper ();
+        static Agent agent;
 
-        static partial void CreateAgent (AgentStartOptions startOptions)
+        static void CreateAgent (AgentStartOptions startOptions)
         {
             mainContext.Post (
                 s => {
@@ -44,5 +47,32 @@ internal static void StartBreakdance ()
                 1000,
                 Timeout.Infinite);
         }
+
+        static void Start ()
+        {
+            try {
+                CreateAgent (new AgentStartOptions {
+                    AgentStarted = AgentStarted,
+                });
+            } catch (Exception e) {
+                Console.Error.WriteLine (e);
+            }
+        }
+
+        internal static void Stop ()
+        {
+            agent?.Dispose ();
+            agent = null;
+        }
+
+        [MethodImpl (MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
+        static void BreakdanceStep ()
+        {
+        }
+
+        [MethodImpl (MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
+        internal static void AgentStarted (string agentConnectUri)
+        {
+        }
     }
 }
diff --git a/Agents/Xamarin.Interactive.Android/Xamarin.Interactive.Android.csproj b/Agents/Xamarin.Interactive.Android/Xamarin.Interactive.Android.csproj
@@ -69,8 +69,6 @@
       <Name>Xamarin.Interactive</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="..\Xamarin.Interactive\Xamarin.Interactive.Shared.projitems" Label="Shared" Condition="Exists('..\Xamarin.Interactive\Xamarin.Interactive.Shared.projitems')" />
-  <Import Project="..\..\Bootstrap\Xamarin.Interactive.Bootstrap\Xamarin.Interactive.Bootstrap.projitems" Label="Shared" Condition="Exists('..\..\Bootstrap\Xamarin.Interactive.Bootstrap\Xamarin.Interactive.Bootstrap.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\Build\Common.targets" />
 </Project>
diff --git a/Agents/Xamarin.Interactive.Console/Xamarin.Interactive.Console.csproj b/Agents/Xamarin.Interactive.Console/Xamarin.Interactive.Console.csproj
@@ -9,8 +9,7 @@
     <RootNamespace>Xamarin.Interactive.Console</RootNamespace>
     <AssemblyName>Xamarin.Interactive.Console</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <!-- Work around https://bugzilla.xamarin.com/show_bug.cgi?id=58866 -->
-    <ImplicitlyExpandNETStandardFacades>False</ImplicitlyExpandNETStandardFacades>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,11 +54,6 @@
       <Name>Xamarin.Interactive</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="MonoTouch.Hosting\" />
-  </ItemGroup>
-  <Import Project="..\Xamarin.Interactive\Xamarin.Interactive.Shared.projitems" Label="Shared" Condition="Exists('..\Xamarin.Interactive\Xamarin.Interactive.Shared.projitems')" />
-  <Import Project="..\..\Bootstrap\Xamarin.Interactive.Bootstrap\Xamarin.Interactive.Bootstrap.projitems" Label="Shared" Condition="Exists('..\..\Bootstrap\Xamarin.Interactive.Bootstrap\Xamarin.Interactive.Bootstrap.projitems')" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="Build.targets" />
   <Import Project="..\..\Build\Common.targets" />

diff --git a/Agents/Xamarin.Interactive.DotNetCore/Xamarin.Interactive.DotNetCore.csproj b/Agents/Xamarin.Interactive.DotNetCore/Xamarin.Interactive.DotNetCore.csproj
@@ -6,7 +6,7 @@
     <Compile Include="..\Xamarin.Interactive.Console\MacIntegration.cs" Link="MacIntegration.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Xamarin.Interactive.NetStandard\Xamarin.Interactive.NetStandard.csproj" />
+    <ProjectReference Include="..\Xamarin.Interactive\Xamarin.Interactive.csproj" />
   </ItemGroup>
   <Import Project="..\..\Build\Common.targets" />
 </Project>
diff --git a/Agents/Xamarin.Interactive.Facades/Facades.cs b/Agents/Xamarin.Interactive.Facades/Facades.cs
diff --git a/Agents/Xamarin.Interactive.Facades/Xamarin.Interactive.Facades.csproj b/Agents/Xamarin.Interactive.Facades/Xamarin.Interactive.Facades.csproj
diff --git a/Agents/Xamarin.Interactive.Forms.Android/AndroidFormsAgentIntegration.cs b/Agents/Xamarin.Interactive.Forms.Android/AndroidFormsAgentIntegration.cs
@@ -87,7 +87,7 @@ void ResetStateHandler ()
         {
             var activity = realAgent.ActivityTracker?.StartedActivities?.FirstOrDefault ();
             var formsView = Xamarin.Forms.Application.Current.MainPage;
-            var nativeViewGroup = Platform.GetRenderer (formsView).ViewGroup;
+            var nativeViewGroup = Platform.GetRenderer (formsView).View;
             var parentToRestore = (ViewGroup) nativeViewGroup.Parent;
 
             while (parentToRestore.Parent != null)

diff --git a/Agents/Xamarin.Interactive.Forms.Android/AndroidFormsInspectView.cs b/Agents/Xamarin.Interactive.Forms.Android/AndroidFormsInspectView.cs
@@ -118,7 +118,7 @@ public AndroidFormsInspectView (Page page, bool useNativeViewBounds = false, boo
             PopulateTypeInformationFromObject (page);
 
             // TODO: Pull the ClassId or some user-set property as the description?
-            var nativeView = Platform.GetRenderer (page).ViewGroup;
+            var nativeView = Platform.GetRenderer (page).View;
             if (!useNativeViewBounds) {
                 Transform = XIVR.GetViewTransform (nativeView);
                 if (Transform == null) {
@@ -169,7 +169,7 @@ public AndroidFormsInspectView (Element element, bool withSubviews = true)
 
             var velement = element as VisualElement;
             if (velement != null) {
-                var nativeView = Platform.GetRenderer (velement).ViewGroup;
+                var nativeView = Platform.GetRenderer (velement).View;
 
                 DisplayName = element.GetType ().Name;
                 try {
@@ -206,7 +206,7 @@ protected override void UpdateCapturedImage ()
                 // If the VisualElement is a view and is not a layout, snapshot its children,
                 // as we've reached the leaf of the tree. Otherwise, skip children.
                 var skipChildren = !(ve is View && !(ve is Layout));
-                var nativeView = Platform.GetRenderer (ve).ViewGroup;
+                var nativeView = Platform.GetRenderer (ve).View;
                 if (nativeView != null)
                     CapturedImage = XIVR.RenderAsPng (nativeView, skipChildren);
             }

diff --git a/Agents/Xamarin.Interactive.Forms.Android/AndroidFormsViewHierarchyHandler.cs b/Agents/Xamarin.Interactive.Forms.Android/AndroidFormsViewHierarchyHandler.cs
@@ -30,7 +30,7 @@ public AndroidFormsViewHierarchyHandler (AndroidAgent agent)
 
         Rectangle GetNativeViewBounds (VisualElement visualElement)
         {
-            var nativeView = Platform.GetRenderer (visualElement).ViewGroup;
+            var nativeView = Platform.GetRenderer (visualElement).View;
             var location = new int [2];
             nativeView.GetLocationOnScreen (location);
 
@@ -54,7 +54,7 @@ void ResetHighlightOnView ()
 
         void DrawHighlightOnView (VisualElement element)
         {
-            var view = Platform.GetRenderer (element).ViewGroup;
+            var view = Platform.GetRenderer (element).View;
 
             highlightedView = view;
             highlightedViewOriginalBackground = highlightedView.Background;

diff --git a/Agents/Xamarin.Interactive.Forms.Android/Xamarin.Interactive.Forms.Android.csproj b/Agents/Xamarin.Interactive.Forms.Android/Xamarin.Interactive.Forms.Android.csproj
@@ -49,7 +49,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms">
-      <Version>2.3.4.231</Version>
+      <Version>2.4.0.38779</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Agents/Xamarin.Interactive.Forms.iOS/Xamarin.Interactive.Forms.iOS.csproj b/Agents/Xamarin.Interactive.Forms.iOS/Xamarin.Interactive.Forms.iOS.csproj
@@ -50,7 +50,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms">
-      <Version>2.3.4.231</Version>
+      <Version>2.4.0.38779</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Agents/Xamarin.Interactive.Forms/Xamarin.Interactive.Forms.csproj b/Agents/Xamarin.Interactive.Forms/Xamarin.Interactive.Forms.csproj
@@ -1,59 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <ProjectGuid>{932D2C61-5DBE-4D82-A4D6-1EA7401F10D3}</ProjectGuid>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <UseMSBuildEngine>true</UseMSBuildEngine>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.Interactive.Forms</RootNamespace>
-    <AssemblyName>Xamarin.Interactive.Forms</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DebugType>portable</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms">
-      <Version>2.3.4.231</Version>
-    </PackageReference>
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="FormsInspectViewHelper.cs" />
-    <Compile Include="FormsRepresentationProvider.cs" />
-    <Compile Include="WorkbookApplication.cs" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0.38779" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\Xamarin.Interactive\Xamarin.Interactive.csproj">
-      <Project>{955F473A-04EC-4716-B75E-509BA892499B}</Project>
-      <Name>Xamarin.Interactive</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Interactive\Xamarin.Interactive.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+
   <Import Project="..\..\Build\Common.targets" />
 </Project>
diff --git a/Agents/Xamarin.Interactive.Mac.Desktop/Xamarin.Interactive.Mac.Desktop.csproj b/Agents/Xamarin.Interactive.Mac.Desktop/Xamarin.Interactive.Mac.Desktop.csproj
@@ -52,8 +52,6 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
   </ItemGroup>
-  <Import Project="..\Xamarin.Interactive\Xamarin.Interactive.Shared.projitems" Label="Shared" Condition="Exists('..\Xamarin.Interactive\Xamarin.Interactive.Shared.projitems')" />
-  <Import Project="..\..\Bootstrap\Xamarin.Interactive.Bootstrap\Xamarin.Interactive.Bootstrap.projitems" Label="Shared" Condition="Exists('..\..\Bootstrap\Xamarin.Interactive.Bootstrap\Xamarin.Interactive.Bootstrap.projitems')" />
   <Import Project="..\Xamarin.Interactive.Mac\Xamarin.Interactive.Mac.projitems" Label="Shared" Condition="Exists('..\Xamarin.Interactive.Mac\Xamarin.Interactive.Mac.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
   <ItemGroup>

diff --git a/Agents/Xamarin.Interactive.Mac.Mobile/Xamarin.Interactive.Mac.Mobile.csproj b/Agents/Xamarin.Interactive.Mac.Mobile/Xamarin.Interactive.Mac.Mobile.csproj
@@ -52,8 +52,6 @@
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
   </ItemGroup>
-  <Import Project="..\Xamarin.Interactive\Xamarin.Interactive.Shared.projitems" Label="Shared" Condition="Exists('..\Xamarin.Interactive\Xamarin.Interactive.Shared.projitems')" />
-  <Import Project="..\..\Bootstrap\Xamarin.Interactive.Bootstrap\Xamarin.Interactive.Bootstrap.projitems" Label="Shared" Condition="Exists('..\..\Bootstrap\Xamarin.Interactive.Bootstrap\Xamarin.Interactive.Bootstrap.projitems')" />
   <Import Project="..\Xamarin.Interactive.Mac\Xamarin.Interactive.Mac.projitems" Label="Shared" Condition="Exists('..\Xamarin.Interactive.Mac\Xamarin.Interactive.Mac.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
   <ItemGroup>

diff --git a/Agents/Xamarin.Interactive.Mac/MacAgent.cs b/Agents/Xamarin.Interactive.Mac/MacAgent.cs
@@ -23,6 +23,7 @@
 using Xamarin.Interactive.Inspection;
 using Xamarin.Interactive.Logging;
 using Xamarin.Interactive.Remote;
+using Xamarin.Interactive.Unified;
 
 namespace Xamarin.Interactive.Mac
 {
@@ -51,6 +52,7 @@ public MacAgent ()
                 NSBundle.MainBundle.InfoDictionary ["CFBundleName"] as NSString);
 
             RepresentationManager.AddProvider (new MacRepresentationProvider ());
+            new UnifiedNativeHelper ().Initialize ();
 
             ViewHierarchyHandlerManager.AddViewHierarchyHandler ("AppKit", this);
         }

diff --git a/...rin.Interactive/NativeExceptionHandler.cs → ...Interactive.Mac/NativeExceptionHandler.cs b/...rin.Interactive/NativeExceptionHandler.cs → ...Interactive.Mac/NativeExceptionHandler.cs
@@ -7,17 +7,12 @@
 // Licensed under the MIT License.
 
 using System;
-
-#if IOS || MAC
-
 using System.Runtime.InteropServices;
 
 using ObjCRuntime;
 using Foundation;
 
-#endif
-
-namespace Xamarin.Interactive
+namespace Xamarin.Interactive.Unified
 {
     static class NativeExceptionHandler
     {
@@ -28,18 +23,15 @@ struct Disposable : IDisposable
 
         public class TrappedNativeException : Exception
         {
-#if IOS || MAC
             public NSException NativeException { get; }
 
-            public TrappedNativeException (NSException realException) : 
-                base ($"A native exception was thrown: {realException.Description}") 
+            public TrappedNativeException (NSException realException) :
+                base ($"A native exception was thrown: {realException.Description}")
             {
                 NativeException = realException;
             }
-#endif
         }
 
-#if IOS || MAC
         [DllImport (Constants.ObjectiveCLibrary)]
         static extern IntPtr objc_setExceptionPreprocessor (IntPtr handler);
 
@@ -73,13 +65,5 @@ public static void Release ()
                 originalHandler = IntPtr.Zero;
             }
         }
-#else
-        public static IDisposable Trap ()
-            => new Disposable ();
-
-        public static void Release ()
-        {
-        }
-#endif
     }
 }