From 782726c6d3bef5960c3d2415bd39f877be24206f Mon Sep 17 00:00:00 2001 From: Bojan Rajkovic Date: Wed, 6 Dec 2017 14:40:05 -0500 Subject: [PATCH 1/3] Forms: Bump to latest stable (2.5.0). --- .../Xamarin.Interactive.Forms.Android.csproj | 2 +- .../Xamarin.Interactive.Forms.iOS.csproj | 2 +- .../Xamarin.Interactive.Forms/Xamarin.Interactive.Forms.csproj | 2 +- .../NuGet/InteractivePackageManager.cs | 2 +- .../Xamarin.Workbooks.Android/Xamarin.Workbooks.Android.csproj | 2 +- dependencies.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Agents/Xamarin.Interactive.Forms.Android/Xamarin.Interactive.Forms.Android.csproj b/Agents/Xamarin.Interactive.Forms.Android/Xamarin.Interactive.Forms.Android.csproj index 5b975a1cd..62ee38713 100644 --- 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 @@ - 2.4.0.38779 + 2.5.0.121934 diff --git a/Agents/Xamarin.Interactive.Forms.iOS/Xamarin.Interactive.Forms.iOS.csproj b/Agents/Xamarin.Interactive.Forms.iOS/Xamarin.Interactive.Forms.iOS.csproj index cbc8fcc0b..04b0b1884 100644 --- 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 @@ - 2.4.0.38779 + 2.5.0.121934 diff --git a/Agents/Xamarin.Interactive.Forms/Xamarin.Interactive.Forms.csproj b/Agents/Xamarin.Interactive.Forms/Xamarin.Interactive.Forms.csproj index c4bf5875b..1d3f9a011 100644 --- a/Agents/Xamarin.Interactive.Forms/Xamarin.Interactive.Forms.csproj +++ b/Agents/Xamarin.Interactive.Forms/Xamarin.Interactive.Forms.csproj @@ -4,7 +4,7 @@ - + diff --git a/Clients/Xamarin.Interactive.Client/NuGet/InteractivePackageManager.cs b/Clients/Xamarin.Interactive.Client/NuGet/InteractivePackageManager.cs index 34c9bdd5e..e34bd620b 100644 --- a/Clients/Xamarin.Interactive.Client/NuGet/InteractivePackageManager.cs +++ b/Clients/Xamarin.Interactive.Client/NuGet/InteractivePackageManager.cs @@ -41,7 +41,7 @@ sealed class InteractivePackageManager : INotifyPropertyChanged internal static readonly PackageIdentity FixedXamarinFormsPackageIdentity = new PackageIdentity ( "Xamarin.Forms", - new NuGetVersion (2, 4, 0, 38779)); + new NuGetVersion (2, 5, 0, 121934)); readonly NuGetPackageManager packageManager; readonly InteractivePackageProjectContext projectContext; diff --git a/WorkbookApps/Xamarin.Workbooks.Android/Xamarin.Workbooks.Android.csproj b/WorkbookApps/Xamarin.Workbooks.Android/Xamarin.Workbooks.Android.csproj index 902dba870..60d436679 100644 --- a/WorkbookApps/Xamarin.Workbooks.Android/Xamarin.Workbooks.Android.csproj +++ b/WorkbookApps/Xamarin.Workbooks.Android/Xamarin.Workbooks.Android.csproj @@ -60,7 +60,7 @@ - 2.4.0.38779 + 2.5.0.121934 diff --git a/dependencies.json b/dependencies.json index e18ab252a..5a2d32760 100644 --- a/dependencies.json +++ b/dependencies.json @@ -97,7 +97,7 @@ { "Kind": "NuGet", "Name": "Xamarin.Forms", - "Version": "2.4.0.38779", + "Version": "2.5.0.121934", "DependentProjects": [ "Xamarin.Interactive.Forms.Android", "Xamarin.Interactive.Forms.iOS", From b6bca0b749860ae422550358c869665e60fa7e3f Mon Sep 17 00:00:00 2001 From: Bojan Rajkovic Date: Wed, 6 Dec 2017 15:32:12 -0500 Subject: [PATCH 2/3] Android: Bump workbook app compilation to 7.1 following Forms bump. There was some sort of dependency snafu with Xamarin.Forms and the Android support packages. The easiest approach is to compile against 7.0/7.1, but retain our older target SDK version. --- Package/Windows/AndroidAgentAppAssemblies.wxs | 24 +++++++++++++++++++ .../Properties/AndroidManifest.xml | 6 ++--- .../Xamarin.Workbooks.Android.csproj | 4 ++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/Package/Windows/AndroidAgentAppAssemblies.wxs b/Package/Windows/AndroidAgentAppAssemblies.wxs index 212cc4028..cd47c5854 100644 --- a/Package/Windows/AndroidAgentAppAssemblies.wxs +++ b/Package/Windows/AndroidAgentAppAssemblies.wxs @@ -689,6 +689,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WorkbookApps/Xamarin.Workbooks.Android/Properties/AndroidManifest.xml b/WorkbookApps/Xamarin.Workbooks.Android/Properties/AndroidManifest.xml index 04ccf266c..b59e94d5c 100644 --- a/WorkbookApps/Xamarin.Workbooks.Android/Properties/AndroidManifest.xml +++ b/WorkbookApps/Xamarin.Workbooks.Android/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/WorkbookApps/Xamarin.Workbooks.Android/Xamarin.Workbooks.Android.csproj b/WorkbookApps/Xamarin.Workbooks.Android/Xamarin.Workbooks.Android.csproj index 60d436679..ac5de42c9 100644 --- a/WorkbookApps/Xamarin.Workbooks.Android/Xamarin.Workbooks.Android.csproj +++ b/WorkbookApps/Xamarin.Workbooks.Android/Xamarin.Workbooks.Android.csproj @@ -13,10 +13,10 @@ Resource Resources\Resource.designer.cs True - False + false Xamarin.Workbooks.Android Properties\AndroidManifest.xml - v5.0 + v7.1 x86 None False From 659f0f1ae55e00bc7e0f95ecacc1e02c683dade1 Mon Sep 17 00:00:00 2001 From: Bojan Rajkovic Date: Wed, 6 Dec 2017 16:55:03 -0500 Subject: [PATCH 3/3] Forms: Fix loading agent extension when creating workspace. When inspecting a Forms app, we load the Xamarin.Forms agent extensions while we're creating the compilation workspace. We need to pass the current session's evaluation context ID, but we can't access it via `clientSession.CompilationWorkspace`, as that's what we're building now (the compilation workspace), and the property is null. It's available to both callers of this method, so pass it in as a parameter instead of trying to get it via the client session. --- Clients/Xamarin.Interactive.Client/Client/ClientSession.cs | 1 + .../Compilation/CompilationWorkspaceFactory.cs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Clients/Xamarin.Interactive.Client/Client/ClientSession.cs b/Clients/Xamarin.Interactive.Client/Client/ClientSession.cs index 80827f887..ebbd86e8e 100644 --- a/Clients/Xamarin.Interactive.Client/Client/ClientSession.cs +++ b/Clients/Xamarin.Interactive.Client/Client/ClientSession.cs @@ -679,6 +679,7 @@ await CompilationWorkspaceFactory.LoadFormsAgentExtensions ( package.Identity.Version.Version, this, CompilationWorkspace.DependencyResolver, + CompilationWorkspace.EvaluationContextId, Agent.IncludePeImage); } diff --git a/Clients/Xamarin.Interactive.Client/Compilation/CompilationWorkspaceFactory.cs b/Clients/Xamarin.Interactive.Client/Compilation/CompilationWorkspaceFactory.cs index 42f08a63e..3882bef40 100644 --- a/Clients/Xamarin.Interactive.Client/Compilation/CompilationWorkspaceFactory.cs +++ b/Clients/Xamarin.Interactive.Client/Compilation/CompilationWorkspaceFactory.cs @@ -60,6 +60,7 @@ await LoadFormsAgentExtensions ( formsReference.Name.Version, clientSession, dependencyResolver, + configuration.EvaluationContextId, includePeImage).ConfigureAwait (false); } @@ -80,6 +81,7 @@ public static async Task LoadFormsAgentExtensions ( Version formsVersion, ClientSession clientSession, DependencyResolver dependencyResolver, + int evaluationContextId, bool includePeImage) { var formsAssembly = InteractiveInstallation.Default.LocateFormsAssembly ( @@ -124,7 +126,7 @@ public static async Task LoadFormsAgentExtensions ( }).ToArray (); var res = await clientSession.Agent.Api.LoadAssembliesAsync ( - clientSession.CompilationWorkspace.EvaluationContextId, + evaluationContextId, assembliesToLoad); var failed = res.LoadResults.Where (p => !p.Success);