Skip to content

Commit 2815e1c

Browse files
committed
Add UWP project and remove Xamarin.Forms support
Introduced a new UWP project (`Caliburn.Micro.UWP`) with modern .NET features, including nullable reference types and AOT compatibility. Added a corresponding UWP test project. Removed Xamarin.Forms projects and all associated Android, iOS, and shared files, indicating a migration away from Xamarin.Forms. Updated the solution file to reflect these changes. Updated package versions for `System.Reactive`, `Autofac`, `FSharp.Core`, and others. Improved asynchronous handling in `App.xaml.cs`. Removed `global.json` to simplify SDK version management. Refactored the codebase to remove Xamarin.Forms-specific logic and dependencies, focusing on UWP, WinUI, Avalonia, and MAUI platforms.
1 parent d67ede2 commit 2815e1c

209 files changed

Lines changed: 625 additions & 31711 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

samples/features/Features.Avalonia/Features.Avalonia.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<PackageReference Include="Avalonia.Themes.FLuent" Version="11.3.5" />
2525
<PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
26-
<PackageReference Include="System.Reactive" Version="6.0.1" />
26+
<PackageReference Include="System.Reactive" Version="6.1.0" />
2727
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.2" />
2828
<PackageReference Include="Xaml.Behaviors.Interactivity" Version="11.3.2" />
2929
<PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />

samples/features/Features.UWP/Features.UWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>Features.CrossPlatform</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
14+
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>

samples/scenarios/Scenario.Autofac/App.xaml.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using System;
22
using System.Collections.Generic;
3-
using Windows.ApplicationModel.Activation;
3+
using System.Threading.Tasks;
44
using Autofac;
55
using Scenario.Autofac.ViewModels;
6+
using Windows.ApplicationModel.Activation;
67

78
namespace Scenario.Autofac
89
{
@@ -26,7 +27,8 @@ protected override void Configure()
2627

2728
protected override void OnLaunched(LaunchActivatedEventArgs args)
2829
{
29-
DisplayRootViewForAsync<ShellViewModel>();
30+
var displayStartPage = Task.Run(async () => await DisplayRootViewForAsync<ShellViewModel>());
31+
displayStartPage.Wait();
3032
}
3133

3234
protected override object GetInstance(Type service, string key)

samples/scenarios/Scenario.Autofac/Scenario.Autofac.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>Scenario.Autofac</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
14+
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -127,7 +127,7 @@
127127
</ItemGroup>
128128
<ItemGroup>
129129
<PackageReference Include="Autofac">
130-
<Version>8.1.1</Version>
130+
<Version>9.0.0</Version>
131131
</PackageReference>
132132
<Reference Include="Caliburn.Micro.Core, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
133133
<SpecificVersion>False</SpecificVersion>

samples/scenarios/Scenario.Functional.App/Scenario.Functional.App.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
<Reference Include="Caliburn.Micro.Platform.Core">
6464
<HintPath>..\..\..\bin\Caliburn.Micro.Platform\release\net462\Caliburn.Micro.Platform.Core.dll</HintPath>
6565
</Reference>
66-
<Reference Include="FSharp.Core, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67-
<HintPath>..\packages\FSharp.Core.8.0.401\lib\netstandard2.0\FSharp.Core.dll</HintPath>
66+
<Reference Include="FSharp.Core, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67+
<HintPath>..\packages\FSharp.Core.10.0.100\lib\netstandard2.0\FSharp.Core.dll</HintPath>
6868
</Reference>
6969
<Reference Include="System" />
7070
<Reference Include="System.Data" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="FSharp.Core" version="8.0.401" targetFramework="net48" />
3+
<package id="FSharp.Core" version="10.0.100" targetFramework="net48" />
44
</packages>

samples/scenarios/Scenario.Functional/Scenario.Functional.fsproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@
1515
<HintPath>..\..\..\bin\Caliburn.Micro.Platform\release\net462\Caliburn.Micro.Core.dll</HintPath>
1616
</Reference>
1717
</ItemGroup>
18+
19+
<ItemGroup>
20+
<PackageReference Update="FSharp.Core" Version="10.0.100" />
21+
</ItemGroup>
1822
</Project>

samples/setup/Setup.Forms/Setup.Forms.Droid/Application.cs

Lines changed: 0 additions & 60 deletions
This file was deleted.

samples/setup/Setup.Forms/Setup.Forms.Droid/Assets/AboutAssets.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

samples/setup/Setup.Forms/Setup.Forms.Droid/MainActivity.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)