Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Forms: Bump to latest stable (2.5.0). #125

Merged
merged 3 commits into from
Dec 7, 2017
Merged

Forms: Bump to latest stable (2.5.0). #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
782726c
Forms: Bump to latest stable (2.5.0).
Dec 6, 2017
b6bca0b
Android: Bump workbook app compilation to 7.1 following Forms bump.
Dec 6, 2017
659f0f1
Forms: Fix loading agent extension when creating workspace.
Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Agents/Xamarin.Interactive.Forms.Android/Xamarin.Interactive.Forms.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>2.4.0.38779</Version>
<Version>2.5.0.121934</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Agents/Xamarin.Interactive.Forms.iOS/Xamarin.Interactive.Forms.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>2.4.0.38779</Version>
<Version>2.5.0.121934</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Agents/Xamarin.Interactive.Forms/Xamarin.Interactive.Forms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="2.4.0.38779" />
<PackageReference Include="Xamarin.Forms" Version="2.5.0.121934" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions Clients/Xamarin.Interactive.Client/Client/ClientSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,7 @@ await CompilationWorkspaceFactory.LoadFormsAgentExtensions (
package.Identity.Version.Version,
this,
CompilationWorkspace.DependencyResolver,
CompilationWorkspace.EvaluationContextId,
Agent.IncludePeImage);
}

Expand Down
4 changes: 3 additions & 1 deletion Clients/Xamarin.Interactive.Client/Compilation/CompilationWorkspaceFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ await LoadFormsAgentExtensions (
formsReference.Name.Version,
clientSession,
dependencyResolver,
configuration.EvaluationContextId,
includePeImage).ConfigureAwait (false);
}

Expand All @@ -80,6 +81,7 @@ public static async Task LoadFormsAgentExtensions (
Version formsVersion,
ClientSession clientSession,
DependencyResolver dependencyResolver,
int evaluationContextId,
bool includePeImage)
{
var formsAssembly = InteractiveInstallation.Default.LocateFormsAssembly (
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Clients/Xamarin.Interactive.Client/NuGet/InteractivePackageManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
24 changes: 24 additions & 0 deletions Package/Windows/AndroidAgentAppAssemblies.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,30 @@
<Component Id="AndroidAgentApp.netstandard.dll" Guid="E470B065-2E03-4AAB-A3D8-1714483D4B13">
<File Id="AndroidAgentApp.netstandard.dll" Source="$(var.AndroidAppAssembliesDir)\netstandard.dll" />
</Component>
<Component Id="AndroidAgentApp.Xamarin.Android.Support.Annotations.dll" Guid="EE7990E2-18C4-416C-A095-914BBCA26F2D">
<File Id="AndroidAgentApp.Xamarin.Android.Support.Annotations.dll" Source="$(var.AndroidAppAssembliesDir)\Xamarin.Android.Support.Annotations.dll" />
</Component>
<Component Id="AndroidAgentApp.Xamarin.Android.Support.Compat.dll" Guid="8C4CDC44-2388-4CFA-B724-5D60B01550D2">
<File Id="AndroidAgentApp.Xamarin.Android.Support.Compat.dll" Source="$(var.AndroidAppAssembliesDir)\Xamarin.Android.Support.Compat.dll" />
</Component>
<Component Id="AndroidAgentApp.Xamarin.Android.Support.Core.UI.dll" Guid="AD27FF29-1694-4DBB-A256-7E4EE22AE609">
<File Id="AndroidAgentApp.Xamarin.Android.Support.Core.UI.dll" Source="$(var.AndroidAppAssembliesDir)\Xamarin.Android.Support.Core.UI.dll" />
</Component>
<Component Id="AndroidAgentApp.Xamarin.Android.Support.Core.Utils.dll" Guid="A36B5AA6-5F4F-4CDC-AE4F-07616772EDF0">
<File Id="AndroidAgentApp.Xamarin.Android.Support.Core.Utils.dll" Source="$(var.AndroidAppAssembliesDir)\Xamarin.Android.Support.Core.Utils.dll" />
</Component>
<Component Id="AndroidAgentApp.Xamarin.Android.Support.Fragment.dll" Guid="13AD3B0F-B1D6-4C4B-8B4F-09EAF38A6C91">
<File Id="AndroidAgentApp.Xamarin.Android.Support.Fragment.dll" Source="$(var.AndroidAppAssembliesDir)\Xamarin.Android.Support.Fragment.dll" />
</Component>
<Component Id="AndroidAgentApp.Xamarin.Android.Support.Media.Compat.dll" Guid="23D9C948-D5A1-48D0-9DD3-5B2DECD72497">
<File Id="AndroidAgentApp.Xamarin.Android.Support.Media.Compat.dll" Source="$(var.AndroidAppAssembliesDir)\Xamarin.Android.Support.Media.Compat.dll" />
</Component>
<Component Id="AndroidAgentApp.Xamarin.Android.Support.Transition.dll" Guid="3A1763BF-4841-438F-A3D1-C9656232A075">
<File Id="AndroidAgentApp.Xamarin.Android.Support.Transition.dll" Source="$(var.AndroidAppAssembliesDir)\Xamarin.Android.Support.Transition.dll" />
</Component>
<Component Id="AndroidAgentApp.Xamarin.Android.Support.v_.Palette.dll" Guid="1268FB88-26C6-4A29-82C0-1874B9B371C2">
<File Id="AndroidAgentApp.Xamarin.Android.Support.v_.Palette.dll" Source="$(var.AndroidAppAssembliesDir)\Xamarin.Android.Support.v7.Palette.dll" />
</Component>
</ComponentGroup>
<ComponentGroup Id="AndroidAgentAppClientIntegrationComponents" Directory="AndroidAgentAppClientIntegrationInstallFolder">
<Component Id="Filedf726d8904b8bd646182c5041501fc57a86eb6a4" Guid="CA9D4CC8-8400-4DC7-B9FF-4FEAABA3802A">
Expand Down
6 changes: 3 additions & 3 deletions WorkbookApps/Xamarin.Workbooks.Android/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.xamarin.workbook_app_android">
<uses-sdk android:minSdkVersion="16" />
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.xamarin.workbook_app_android" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
Expand Down
6 changes: 3 additions & 3 deletions WorkbookApps/Xamarin.Workbooks.Android/Xamarin.Workbooks.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<AndroidResgenClass>Resource</AndroidResgenClass>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidApplication>True</AndroidApplication>
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<AssemblyName>Xamarin.Workbooks.Android</AssemblyName>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<AndroidSupportedAbis>x86</AndroidSupportedAbis>
<AndroidLinkMode>None</AndroidLinkMode>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
Expand Down Expand Up @@ -60,7 +60,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>2.4.0.38779</Version>
<Version>2.5.0.121934</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down