Skip to content

Commit e9b9646

Browse files
authored
feature: Add ReactiveUI.Maui (#2879)
1 parent ac8b89a commit e9b9646

File tree

52 files changed

+1653
-57
lines changed

Some content is hidden

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

52 files changed

+1653
-57
lines changed

.github/workflows/build-samples.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
configuration: [Debug, Release]
1414

15-
runs-on: windows-latest
15+
runs-on: windows-latest
1616

1717
steps:
1818
- name: Checkout
@@ -21,20 +21,33 @@ jobs:
2121
fetch-depth: 0
2222
lfs: true
2323

24-
# Install the .NET Core workload
25-
- name: Install .NET Core 3.1.x
26-
uses: actions/setup-dotnet@v1
24+
- name: Install .NET Core
25+
uses: actions/[email protected]
2726
with:
2827
dotnet-version: 3.1.x
2928

30-
- name: Install .NET 5.0.x
31-
uses: actions/setup-dotnet@v1
29+
- name: Install .NET 5
30+
uses: actions/setup-dotnet@v1.8.1
3231
with:
3332
dotnet-version: 5.0.x
3433

35-
# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
36-
- name: Setup MSBuild.exe
37-
uses: microsoft/[email protected]
34+
- name: Install .NET 6
35+
uses: actions/[email protected]
36+
with:
37+
dotnet-version: 6.0.x
38+
include-prerelease: true
39+
40+
- name: Install VS2019 preview
41+
shell: bash
42+
run: |
43+
dotnet tool update -g dotnet-vs
44+
vs install preview -sku:enterprise --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools +Microsoft.VisualStudio.Workload.NetCrossPlat +Microsoft.VisualStudio.Workload.Universal
45+
echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
46+
47+
- name: Add MSBuild to PATH
48+
uses: glennawatson/[email protected]
49+
with:
50+
prerelease: true
3851

3952
- name: Restore/Build the sample
4053
run: msbuild IntegrationTests.All.sln /t:restore,build /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=$env:Configuration

.github/workflows/ci-build.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,32 @@ jobs:
2323
fetch-depth: 0
2424

2525
- name: Install .NET Core
26-
uses: actions/setup-dotnet@v1
26+
uses: actions/setup-dotnet@v1.8.1
2727
with:
2828
dotnet-version: 3.1.x
2929

3030
- name: Install .NET 5
31-
uses: actions/setup-dotnet@v1
31+
uses: actions/setup-dotnet@v1.8.1
3232
with:
3333
dotnet-version: 5.0.x
3434

35+
- name: Install .NET 6
36+
uses: actions/[email protected]
37+
with:
38+
dotnet-version: 6.0.x
39+
include-prerelease: true
40+
41+
- name: Install VS2019 preview
42+
shell: bash
43+
run: |
44+
dotnet tool update -g dotnet-vs
45+
vs install preview -sku:enterprise --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools +Microsoft.VisualStudio.Workload.NetCrossPlat +Microsoft.VisualStudio.Workload.Universal
46+
echo "##vso[task.prependpath]$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin"
47+
3548
- name: Add MSBuild to PATH
3649
uses: glennawatson/[email protected]
37-
38-
# - name: Update VS2019
39-
# shell: powershell
40-
# run: Start-Process -Wait -PassThru -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" -ArgumentList "update --passive --norestart --installpath ""C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise"""
50+
with:
51+
prerelease: true
4152

4253
- name: NBGV
4354
id: nbgv
@@ -46,7 +57,7 @@ jobs:
4657
setAllVars: true
4758

4859
- name: NuGet restore
49-
run: |
60+
run: |
5061
dotnet restore ReactiveUI.sln
5162
dotnet restore ReactiveUI.Events.sln
5263
working-directory: src
@@ -59,7 +70,7 @@ jobs:
5970
pharmacist generate-platform -t net461,net462,net47,net471,net472,net48,netcoreapp3.1,net5.0 --is-winforms -o "src/ReactiveUI.Events.Winforms/" --output-prefix "Events_"
6071
6172
- name: Build
62-
run: |
73+
run: |
6374
msbuild /t:build,pack /nowarn:MSB4011,VSX1000 /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=${{ env.configuration }} ReactiveUI.sln
6475
msbuild /t:build,pack /nowarn:MSB4011,VSX1000 /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=${{ env.configuration }} ReactiveUI.Events.sln
6576
working-directory: src

src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PackageDescription>Provides ReactiveUI extensions for the Android Support Library</PackageDescription>
66
<PackageId>ReactiveUI.AndroidSupport</PackageId>
77
<Nullable>enable</Nullable>
8-
<LangVersion>latest</LangVersion>
8+
<LangVersion>preview</LangVersion>
99
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;</PackageTags>
1010
</PropertyGroup>
1111

@@ -19,7 +19,7 @@
1919
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
2020
<Reference Include="System.Runtime.Serialization" />
2121
</ItemGroup>
22-
22+
2323
<ItemGroup>
2424
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
2525
</ItemGroup>

src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PackageDescription>Provides ReactiveUI extensions for the AndroidX Library</PackageDescription>
66
<PackageId>ReactiveUI.AndroidX</PackageId>
77
<Nullable>enable</Nullable>
8-
<LangVersion>latest</LangVersion>
8+
<LangVersion>preview</LangVersion>
99
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;</PackageTags>
1010
</PropertyGroup>
1111

@@ -17,7 +17,7 @@
1717
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.1" />
1818
<Reference Include="System.Runtime.Serialization" />
1919
</ItemGroup>
20-
20+
2121
<ItemGroup>
2222
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
2323
</ItemGroup>

src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PackageDescription>Contains the ReactiveUI platform specific extensions for Blazor</PackageDescription>
55
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;eventsnet;netstandard;blazor;web;</PackageTags>
66
<Nullable>enable</Nullable>
7-
<LangVersion>latest</LangVersion>
7+
<LangVersion>preview</LangVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>

src/ReactiveUI.Blend/ReactiveUI.Blend.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageDescription>Provides reactive extensions based xaml components based on the Blend SDK library, allowing you to fire a observable from XAML</PackageDescription>
88
<PackageId>ReactiveUI.Blend</PackageId>
99
<Nullable>enable</Nullable>
10-
<LangVersion>latest</LangVersion>
10+
<LangVersion>preview</LangVersion>
1111
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;Blend;wpf;net;</PackageTags>
1212
<UseWPF>true</UseWPF>
1313
</PropertyGroup>

src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageDescription>A extension to the ReactiveUI platform that provides Splat bitmap operation support.</PackageDescription>
88
<PackageId>ReactiveUI.Drawing</PackageId>
99
<Nullable>enable</Nullable>
10-
<LangVersion>latest</LangVersion>
10+
<LangVersion>preview</LangVersion>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

src/ReactiveUI.Fody.Analyzer.Test/ReactiveUI.Fody.Analyzer.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
44
<Nullable>enable</Nullable>
5-
<LangVersion>latest</LangVersion>
5+
<LangVersion>preview</LangVersion>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88
<ItemGroup>

src/ReactiveUI.Fody.Analyzer/ReactiveUI.Fody.Analyzer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RootNamespace>ReactiveUI.Fody.Analyzer</RootNamespace>
66
<PackageDescription>Rosyln extension that checks correct usage of the Fody extension.</PackageDescription>
77
<Nullable>enable</Nullable>
8-
<LangVersion>latest</LangVersion>
8+
<LangVersion>preview</LangVersion>
99
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;ios;mac;forms;monodroid;monotouch;xamarin.android;xamarin.ios;xamarin.forms;xamarin.mac;xamarin.tvos;wpf;net;netstandard;net472;uwp;tizen;unoplatform;fody;</PackageTags>
1010
<IsPackable>False</IsPackable>
1111
</PropertyGroup>

src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<!-- Due to fody insisting on having .net 4 classes, we can't pack on non-windows -->
1414
<IsPackable Condition=" '$(OS)' != 'Windows_NT' ">false</IsPackable>
1515
<Nullable>enable</Nullable>
16-
<LangVersion>latest</LangVersion>
16+
<LangVersion>preview</LangVersion>
1717
</PropertyGroup>
18-
18+
1919
<ItemGroup>
2020
<PackageReference Include="Fody" Version="6.5.2" PrivateAssets="None" />
2121
<PackageReference Include="FodyPackaging" Version="6.5.2" PrivateAssets="All" />
@@ -29,28 +29,28 @@
2929
</ItemGroup>
3030

3131
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS'))">
32-
<Reference Include="System.Runtime.Serialization" />
32+
<Reference Include="System.Runtime.Serialization" />
3333
</ItemGroup>
3434

3535
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.TVOS10'))">
36-
<Reference Include="System.Runtime.Serialization" />
36+
<Reference Include="System.Runtime.Serialization" />
3737
</ItemGroup>
3838

3939
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac'))">
40-
<Reference Include="System.Runtime.Serialization" />
40+
<Reference Include="System.Runtime.Serialization" />
4141
</ItemGroup>
4242

4343
<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
44-
<Reference Include="System.Runtime.Serialization" />
44+
<Reference Include="System.Runtime.Serialization" />
4545
</ItemGroup>
46-
46+
4747
<ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
4848
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
4949
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
5050
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
5151
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
5252
</ItemGroup>
53-
53+
5454
<ItemGroup>
5555
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
5656
<ProjectReference Include="..\ReactiveUI.Fody\ReactiveUI.Fody.csproj" ReferenceOutputAssembly="False" />

0 commit comments

Comments
 (0)