diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 870d26d2f3..c48be092fb 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -20,6 +20,6 @@ jobs:
with:
configuration: Release
productNamespacePrefix: "ReactiveUI"
- useVisualStudioPreview: true
+ useVisualStudioPreview: false
useMauiCheckDotNetTool: false
solutionFile: "reactiveui.sln"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 631d007dcc..6fd4bd8ac6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
with:
configuration: Release
productNamespacePrefix: "ReactiveUI"
- useVisualStudioPreview: true
+ useVisualStudioPreview: false
useMauiCheckDotNetTool: false
solutionFile: "reactiveui.sln"
secrets:
diff --git a/src/Directory.build.props b/src/Directory.build.props
index 2e8e79f68b..8c09d8397d 100644
--- a/src/Directory.build.props
+++ b/src/Directory.build.props
@@ -43,7 +43,7 @@
-
+
@@ -52,7 +52,7 @@
-
+
diff --git a/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj b/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
index f86494ca2c..fd4725c595 100644
--- a/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
+++ b/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
@@ -1,7 +1,7 @@
-
+
- MonoAndroid11.0;MonoAndroid12.0
+ MonoAndroid11.0;MonoAndroid12.1
Provides ReactiveUI extensions for the Android Support Library
ReactiveUI.AndroidSupport
mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;
diff --git a/src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj b/src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj
index 4d38c1695a..cc444dc3ba 100644
--- a/src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj
+++ b/src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj
@@ -1,7 +1,7 @@
- MonoAndroid11.0;MonoAndroid12.0
+ MonoAndroid11.0;MonoAndroid12.1
Provides ReactiveUI extensions for the AndroidX Library
ReactiveUI.AndroidX
mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;
diff --git a/src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj b/src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj
index ad0e8afe68..b8262895ca 100644
--- a/src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj
+++ b/src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj
@@ -1,6 +1,6 @@
-
+
- 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
+ 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);net472;uap10.0.16299;net6.0-windows10.0.19041
ReactiveUI.Drawing
ReactiveUI.Drawing
diff --git a/src/ReactiveUI.Fody.Analyzer/ReactiveUI.Fody.Analyzer.csproj b/src/ReactiveUI.Fody.Analyzer/ReactiveUI.Fody.Analyzer.csproj
index ef705cf91e..bffe2619d2 100644
--- a/src/ReactiveUI.Fody.Analyzer/ReactiveUI.Fody.Analyzer.csproj
+++ b/src/ReactiveUI.Fody.Analyzer/ReactiveUI.Fody.Analyzer.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/src/ReactiveUI.sln b/src/ReactiveUI.sln
index 6014745b8b..d384b6e1d1 100644
--- a/src/ReactiveUI.sln
+++ b/src/ReactiveUI.sln
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Directory.build.targets = Directory.build.targets
global.json = global.json
stylecop.json = stylecop.json
+ ..\version.json = ..\version.json
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "ReactiveUI\ReactiveUI.csproj", "{464CB812-F99F-401B-BE4C-E8F0515CD19D}"
diff --git a/src/ReactiveUI/ReactiveUI.csproj b/src/ReactiveUI/ReactiveUI.csproj
index 2f3de7b8b2..b3088dc184 100644
--- a/src/ReactiveUI/ReactiveUI.csproj
+++ b/src/ReactiveUI/ReactiveUI.csproj
@@ -1,6 +1,6 @@
- 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
+ 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);net462;net472;uap10.0.16299
ReactiveUI
ReactiveUI
diff --git a/version.json b/version.json
index b46c504358..bafb151c0b 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
- "version": "18.3",
+ "version": "18.4",
"publicReleaseRefSpec": [
"^refs/heads/master$", // we release out of master
"^refs/heads/main$",