Skip to content

Commit 5acc920

Browse files
authored
Update MonoAndroid to V12.1 (SDK 32) (#3431)
1 parent 16f867c commit 5acc920

File tree

10 files changed

+13
-12
lines changed

10 files changed

+13
-12
lines changed

.github/workflows/ci-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
with:
2121
configuration: Release
2222
productNamespacePrefix: "ReactiveUI"
23-
useVisualStudioPreview: true
23+
useVisualStudioPreview: false
2424
useMauiCheckDotNetTool: false
2525
solutionFile: "reactiveui.sln"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
configuration: Release
1717
productNamespacePrefix: "ReactiveUI"
18-
useVisualStudioPreview: true
18+
useVisualStudioPreview: false
1919
useMauiCheckDotNetTool: false
2020
solutionFile: "reactiveui.sln"
2121
secrets:

src/Directory.build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</PropertyGroup>
4444

4545
<ItemGroup Condition="$(IsTestProject)">
46-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
46+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
4747
<PackageReference Include="xunit" Version="2.4.2" />
4848
<PackageReference Include="xunit.runner.console" Version="2.4.2" />
4949
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
@@ -52,7 +52,7 @@
5252
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
5353
<PackageReference Include="PublicApiGenerator" Version="10.3.0" />
5454
<PackageReference Include="coverlet.msbuild" Version="3.2.0" PrivateAssets="All" />
55-
<PackageReference Include="Verify.Xunit" Version="18.3.0" />
55+
<PackageReference Include="Verify.Xunit" Version="19.1.0" />
5656
</ItemGroup>
5757

5858
<ItemGroup Condition="'$(IsTestProject)' != 'true'">

src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="MSBuild.Sdk.Extras">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>MonoAndroid11.0;MonoAndroid12.0</TargetFrameworks>
4+
<TargetFrameworks>MonoAndroid11.0;MonoAndroid12.1</TargetFrameworks>
55
<PackageDescription>Provides ReactiveUI extensions for the Android Support Library</PackageDescription>
66
<PackageId>ReactiveUI.AndroidSupport</PackageId>
77
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;</PackageTags>

src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>MonoAndroid11.0;MonoAndroid12.0</TargetFrameworks>
4+
<TargetFrameworks>MonoAndroid11.0;MonoAndroid12.1</TargetFrameworks>
55
<PackageDescription>Provides ReactiveUI extensions for the AndroidX Library</PackageDescription>
66
<PackageId>ReactiveUI.AndroidX</PackageId>
77
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;</PackageTags>

src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
3-
<TargetFrameworks>MonoAndroid11.0;MonoAndroid12.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;tizen40;netstandard2.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst</TargetFrameworks>
3+
<TargetFrameworks>MonoAndroid11.0;MonoAndroid12.1;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;tizen40;netstandard2.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst</TargetFrameworks>
44
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net472;uap10.0.16299;net6.0-windows10.0.19041</TargetFrameworks>
55
<AssemblyName>ReactiveUI.Drawing</AssemblyName>
66
<RootNamespace>ReactiveUI.Drawing</RootNamespace>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
1313
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" PrivateAssets="all" />
14-
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
14+
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
1515
</ItemGroup>
1616

1717
</Project>

src/ReactiveUI.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
Directory.build.targets = Directory.build.targets
1111
global.json = global.json
1212
stylecop.json = stylecop.json
13+
..\version.json = ..\version.json
1314
EndProjectSection
1415
EndProject
1516
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "ReactiveUI\ReactiveUI.csproj", "{464CB812-F99F-401B-BE4C-E8F0515CD19D}"

src/ReactiveUI/ReactiveUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid11.0;MonoAndroid12.0;tizen40;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid11.0;MonoAndroid12.1;tizen40;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst</TargetFrameworks>
44
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462;net472;uap10.0.16299</TargetFrameworks>
55
<AssemblyName>ReactiveUI</AssemblyName>
66
<RootNamespace>ReactiveUI</RootNamespace>

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "18.3",
3+
"version": "18.4",
44
"publicReleaseRefSpec": [
55
"^refs/heads/master$", // we release out of master
66
"^refs/heads/main$",

0 commit comments

Comments
 (0)