Automate MauiCompat build, Update MAUI Preview 11 (#1775)
* Automate MauiCompat build, Update MAUI Preview 11 * Run script if MauiCompat project doesn't exist
This commit is contained in:
Vladislav Antonyuk
GitHub
Родитель
0db5b19255
Коммит
9716d9422b
128
MauiCompat.sh
128
MauiCompat.sh
|
|
@ -7,8 +7,8 @@ dotnet sln ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat.sln add ./
|
|||
dotnet new sln -o ./src/Markup/ -n Xamarin.CommunityToolkit.Markup.MauiCompat
|
||||
dotnet sln ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat.sln add ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/Xamarin.CommunityToolkit.Markup.MauiCompat.csproj
|
||||
|
||||
sed -i '' 's/;net6.0-maccatalyst//g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/Xamarin.CommunityToolkit.MauiCompat.csproj
|
||||
sed -i '' 's/;net6.0-maccatalyst//g' ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/**/Xamarin.CommunityToolkit.Markup.MauiCompat.csproj
|
||||
sed -i '' 's/<ImplicitUsings>enable/<ImplicitUsings>false/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/Xamarin.CommunityToolkit.MauiCompat.csproj
|
||||
sed -i '' 's/<ImplicitUsings>enable/<ImplicitUsings>false/g' ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/**/Xamarin.CommunityToolkit.Markup.MauiCompat.csproj
|
||||
|
||||
printf > ./src/CommunityToolkit/Directory.build.props "<Project>
|
||||
<PropertyGroup>
|
||||
|
|
@ -61,8 +61,8 @@ printf > ./src/CommunityToolkit/Directory.build.props "<Project>
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=\" \$(TargetFramework.Contains('-maccatalyst')) \">
|
||||
<Compile Include=\"**\*.macos.cs\" />
|
||||
<Compile Include=\"**\*.macos.*.cs\" />
|
||||
<Compile Include=\"**\*.ios.cs\" />
|
||||
<Compile Include=\"**\*.ios.*.cs\" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=\" !\$(TargetFramework.Contains('-')) \">
|
||||
|
|
@ -276,6 +276,14 @@ sed -i '' 's/ConvertFromInvariantString(string value)/ConvertFrom(System.Compone
|
|||
|
||||
sed -i '' 's/ConvertFromInvariantString(string\? value)/ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object valueObject)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/**.cs
|
||||
|
||||
sed -i '' 's/if (value != null)/if (valueObject is not string value){throw new InvalidOperationException("Only typeof(string) allowed");}if (value != null)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Helpers/SafeAreaTypeConverter.shared.cs
|
||||
|
||||
sed -i '' 's/if (value == null)/if (valueObject is not string value){throw new InvalidOperationException("Only typeof(string) allowed");}if (value == null)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Core/MediaSourceConverter.shared.cs
|
||||
|
||||
sed -i '' 's/return/if (valueObject is not string value){throw new InvalidOperationException("Only typeof(string) allowed");}return/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Core/FileMediaSourceConverter.shared.cs
|
||||
|
||||
sed -i '' 's/return/if (valueObject is not string value){throw new InvalidOperationException("Only typeof(string) allowed");}return/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/MediaElement/UriTypeConverter.shared.cs
|
||||
|
||||
# Font
|
||||
|
||||
sed -i '' '/else if (e.PropertyName == Label.FontProperty.PropertyName)/,+1d' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/**.cs
|
||||
|
|
@ -324,9 +332,9 @@ sed -i '' 's/\tViewExtensions./\tMicrosoft.Maui.Controls.ViewExtensions./g' ./sr
|
|||
|
||||
sed -i '' 's/ContainerView/Microsoft.Maui.Controls.Compatibility.Platform.Android.ContainerView/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/*.android.cs
|
||||
|
||||
sed -i '' 's/View.Context.ToPixels(/Microsoft.Maui.ContextExtensions.ToPixels(View.Context ?? throw new NullReferenceException(), /g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/*.android.cs
|
||||
sed -i '' 's/Context.ToPixels(/Microsoft.Maui.ContextExtensions.ToPixels(Context, /g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/*.android.cs
|
||||
sed -i '' 's/context.ToPixels(/Microsoft.Maui.ContextExtensions.ToPixels(context, /g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/*.android.cs
|
||||
sed -i '' 's/View.Context.ToPixels(/Microsoft.Maui.Platform.ContextExtensions.ToPixels(View.Context ?? throw new NullReferenceException(), /g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/*.android.cs
|
||||
sed -i '' 's/Context.ToPixels(/Microsoft.Maui.Platform.ContextExtensions.ToPixels(Context, /g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/*.android.cs
|
||||
sed -i '' 's/context.ToPixels(/Microsoft.Maui.Platform.ContextExtensions.ToPixels(context, /g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/*.android.cs
|
||||
|
||||
sed -i '' 's/Resource.Id/Xamarin.CommunityToolkit.MauiCompat.Resource.Id/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/*.android.cs
|
||||
sed -i '' 's/Resource.Layout/Xamarin.CommunityToolkit.MauiCompat.Resource.Layout/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/*.android.cs
|
||||
|
|
@ -347,21 +355,21 @@ sed -i '' 's/children.ForEach(/Array.ForEach(children,/g' ./src/CommunityToolkit
|
|||
|
||||
## PlatformTouchEffect.ios.cs
|
||||
|
||||
sed -i '' 's/(isStarted ? color : control.BackgroundColor).ToCGColor()/Microsoft.Maui.ColorExtensions.ToCGColor(isStarted ? color : control.BackgroundColor)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/PlatformTouchEffect.ios.cs
|
||||
sed -i '' 's/(isStarted ? color : control.BackgroundColor).ToCGColor()/Microsoft.Maui.Platform.ColorExtensions.ToCGColor(isStarted ? color : control.BackgroundColor)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/PlatformTouchEffect.ios.cs
|
||||
|
||||
## DrawingViewRenderer.ios.cs
|
||||
|
||||
sed -i '' 's/void OnLinesCollectionChanged(object sender/void OnLinesCollectionChanged(object? sender/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/DrawingViewRenderer.ios.cs
|
||||
|
||||
sed -i '' 's/currentPoint.ToPoint()/CoreGraphicsExtensions.ToPoint(currentPoint)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/DrawingViewRenderer.ios.cs
|
||||
sed -i '' 's/currentPoint.ToPoint()/Microsoft.Maui.Platform.CoreGraphicsExtensions.ToPoint(currentPoint)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/DrawingViewRenderer.ios.cs
|
||||
|
||||
# DrawingViewService.ios.cs
|
||||
|
||||
sed -i '' 's/backgroundColor.ToCGColor()/Microsoft.Maui.ColorExtensions.ToCGColor(backgroundColor)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/DrawingViewService.ios.cs
|
||||
sed -i '' 's/backgroundColor.ToCGColor()/Microsoft.Maui.Platform.ColorExtensions.ToCGColor(backgroundColor)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/DrawingViewService.ios.cs
|
||||
|
||||
sed -i '' 's/strokeColor.ToCGColor()/Microsoft.Maui.ColorExtensions.ToCGColor(strokeColor)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/DrawingViewService.ios.cs
|
||||
sed -i '' 's/strokeColor.ToCGColor()/Microsoft.Maui.Platform.ColorExtensions.ToCGColor(strokeColor)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/DrawingViewService.ios.cs
|
||||
|
||||
sed -i '' 's/line.LineColor.ToCGColor()/Microsoft.Maui.ColorExtensions.ToCGColor(line.LineColor)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/DrawingViewService.ios.cs
|
||||
sed -i '' 's/line.LineColor.ToCGColor()/Microsoft.Maui.Platform.ColorExtensions.ToCGColor(line.LineColor)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/DrawingViewService.ios.cs
|
||||
|
||||
# SnackbarAppearance.ios.cs
|
||||
|
||||
|
|
@ -369,14 +377,13 @@ sed -i '' '1s/^/using Microsoft.Maui;using Microsoft.Maui.Controls.Compatibility
|
|||
|
||||
sed -i '' 's/Forms.Font/Microsoft.Maui.Font/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/SnackbarAppearance.ios.cs
|
||||
|
||||
sed -i '' 's/color.A /color.Alpha /g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/SnackbarAppearance.ios.cs
|
||||
|
||||
# Snackbar.android.cs
|
||||
|
||||
sed -i '' 's/await GetRendererWithRetries(sender)/(await GetRendererWithRetries(sender))?.View ?? sender.ToNative(sender.Handler.MauiContext)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/SnackBar.android.cs
|
||||
sed -i '' 's/renderer.View/renderer/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/SnackBar.android.cs
|
||||
|
||||
# VisualFeedbackEffectRouter.ios.cs
|
||||
|
||||
sed -i '' 's/color.A /color.Alpha /g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/SnackbarAppearance.ios.cs
|
||||
sed -i '' 's/namespace/using Microsoft.Maui.Platform;namespace/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/SnackBar.android.cs
|
||||
|
||||
# IconTintColorEffectRouter.android.cs
|
||||
|
||||
|
|
@ -408,7 +415,7 @@ sed -i '' 's/visualElementRenderer?.OnTouchEvent(e) is true || //g' ./src/Commun
|
|||
|
||||
sed -i '' 's/static void MeasureExactly(AView control, VisualElement? element, Context? context)/static void MeasureExactly(AView control, VisualElement? element, Context context)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/CameraViewRenderer.android.cs
|
||||
|
||||
sed -i '' 's/Context.GetFragmentManager();/Microsoft.Maui.ContextExtensions.GetFragmentManager(Context ?? throw new NullReferenceException()) ?? throw new InvalidOperationException();/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/CameraViewRenderer.android.cs
|
||||
sed -i '' 's/Context.GetFragmentManager();/Microsoft.Maui.Platform.ContextExtensions.GetFragmentManager(Context ?? throw new NullReferenceException()) ?? throw new InvalidOperationException();/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/CameraViewRenderer.android.cs
|
||||
|
||||
# VisualElementExtension.shared.cs
|
||||
|
||||
|
|
@ -429,7 +436,7 @@ sed -i '' 's/nativeColor.Alpha/nativeColor.A/g' ./src/CommunityToolkit/Xamarin.C
|
|||
|
||||
# PlatformShadowEffect.ios.macos.cs
|
||||
|
||||
sed -i '' 's/ShadowEffect.GetColor(Element).ToCGColor()/Microsoft.Maui.ColorExtensions.ToCGColor(ShadowEffect.GetColor(Element))/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/PlatformShadowEffect.ios.macos.cs
|
||||
sed -i '' 's/ShadowEffect.GetColor(Element).ToCGColor()/Microsoft.Maui.Platform.ColorExtensions.ToCGColor(ShadowEffect.GetColor(Element))/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/PlatformShadowEffect.ios.macos.cs
|
||||
|
||||
sed -i '' 's/using Xamarin.CommunityToolkit.Android.Effects;/using System;using Xamarin.CommunityToolkit.Android.Effects;/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/PlatformShadowEffect.android.cs
|
||||
|
||||
|
|
@ -493,3 +500,88 @@ sed -i '' 's/Xamarin.Forms.RelativeLayout/Microsoft.Maui.Controls.Compatibility.
|
|||
sed -i '' 's/Xamarin.Forms.View/Microsoft.Maui.Controls.View/g' ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/RelativeLayout.cs
|
||||
sed -i '' 's/Xamarin.Forms.Constraint/Microsoft.Maui.Controls.Compatibility.Constraint/g' ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/RelativeLayout.cs
|
||||
sed -i '' 's/using Microsoft.Maui.Controls.Compatibility;/using Microsoft.Maui.Controls.Compatibility;using Grid = Microsoft.Maui.Controls.Grid;/g' ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/ViewInGridExtensions.cs
|
||||
|
||||
# MauiColorExtensions
|
||||
printf > ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Extensions/MauiColorExtensions.android.cs "
|
||||
using AColor = Android.Graphics.Color;
|
||||
|
||||
namespace Xamarin.CommunityToolkit.MauiCompat
|
||||
{
|
||||
public static partial class MauiColorExtensions
|
||||
{
|
||||
public static AColor ToAndroid(this Microsoft.Maui.Graphics.Color self)
|
||||
{
|
||||
var colorToConvert = self;
|
||||
|
||||
if (colorToConvert == null)
|
||||
{
|
||||
colorToConvert = Microsoft.Maui.Graphics.Colors.Transparent;
|
||||
}
|
||||
|
||||
return Microsoft.Maui.Controls.Compatibility.Platform.Android.ColorExtensions.ToAndroid(colorToConvert);
|
||||
}
|
||||
}
|
||||
}"
|
||||
|
||||
printf > ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Extensions/MauiColorExtensions.ios.cs "
|
||||
using iColor = UIKit.UIColor;
|
||||
|
||||
namespace Xamarin.CommunityToolkit.MauiCompat
|
||||
{
|
||||
public static partial class MauiColorExtensions
|
||||
{
|
||||
public static iColor ToUIColor(this Microsoft.Maui.Graphics.Color self)
|
||||
{
|
||||
var colorToConvert = self;
|
||||
if (colorToConvert == null)
|
||||
{
|
||||
colorToConvert = Microsoft.Maui.Graphics.Colors.Transparent;
|
||||
}
|
||||
|
||||
return Microsoft.Maui.Controls.Compatibility.Platform.iOS.ColorExtensions.ToUIColor(colorToConvert);
|
||||
}
|
||||
}
|
||||
}"
|
||||
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Effects/IconTintColor/IconTintColorEffectRouter.ios.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Effects/StatusBar/PlatformStatusBarEffect.ios.cs
|
||||
sed -i '' 's/\[Foundation.Preserve(AllMembers = true)/using Xamarin.CommunityToolkit.MauiCompat; \[Foundation.Preserve(AllMembers = true)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Effects/VisualFeedback/VisualFeedbackEffectRouter.ios.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/DrawingView/Renderer/DrawingViewRenderer.ios.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/MediaElement/iOS/MediaElementRenderer.ios.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/Popup/iOS/PopupRenderer.ios.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/Snackbar/SnackBar.ios.macos.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/Snackbar/Helpers/iOS/SnackBarAppearance.ios.cs
|
||||
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Effects/IconTintColor/IconTintColorEffectRouter.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Effects/Shadow/PlatformShadowEffect.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Effects/StatusBar/PlatformStatusBarEffect.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Effects/Touch/PlatformTouchEffect.android.cs
|
||||
sed -i '' 's/\[Microsoft.Maui.Controls.Internals.Preserve(AllMembers = true)/using Xamarin.CommunityToolkit.MauiCompat; \[Microsoft.Maui.Controls.Internals.Preserve(AllMembers = true)/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Effects/VisualFeedback/VisualFeedbackEffectRouter.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/PlatformConfiguration/AndroidSpecific/NavigationBar/PlatformNavigationBarEffect.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/CameraView/Android/CameraFragment.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/DrawingView/Renderer/DrawingViewRenderer.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/DrawingView/Service/DrawingViewService.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/MediaElement/Android/MediaElementRenderer.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/Snackbar/SnackBar.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/ViewSwitcher/BackgroundManager.android.cs
|
||||
sed -i '' 's/public class/using Xamarin.CommunityToolkit.MauiCompat; public class/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Views/ViewSwitcher/TextSwitcherRenderer.android.cs
|
||||
|
||||
# StreamMediaSource
|
||||
|
||||
sed -i '' 's/readonly object synchandle = new object();/public bool IsEmpty => Stream == null; readonly object synchandle = new object();/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Core/StreamMediaSource.shared.cs
|
||||
|
||||
# nfloat
|
||||
|
||||
sed -i '' 's/nfloat/ObjCRuntime.nfloat/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/**.cs
|
||||
|
||||
# AVMediaType
|
||||
|
||||
sed -i '' 's/photoOutput.ConnectionFromMediaType(AVMediaType.Video)/photoOutput.ConnectionFromMediaType(new NSString("video"))/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/**.cs
|
||||
sed -i '' 's/AVCaptureDevice.DevicesWithMediaType(AVMediaType.Video)/AVCaptureDevice.DevicesWithMediaType("video")/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/**.cs
|
||||
sed -i '' 's/AVMediaType.Audio/AVMediaTypes.Audio/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/**.cs
|
||||
sed -i '' 's/AVMediaType.Video/AVAuthorizationMediaType.Video/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/**.cs
|
||||
|
||||
# Log
|
||||
|
||||
sed -i '' 's/using System;/using System;using Microsoft.Extensions.Logging;/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/**.cs
|
||||
sed -i '' 's/Log\./(Microsoft.Maui.Controls.Application.Current?.Handler.MauiContext?.Services.GetService(typeof(ILogger)) as ILogger)?.Log/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/**.cs
|
||||
|
|
@ -22,96 +22,13 @@ The following steps are used to create the MauiCompat libraries
|
|||
zsh ./MauiCompat.sh
|
||||
```
|
||||
|
||||
### 3. Manually Update TypeConverters
|
||||
|
||||
In .NET 6, `System.ComponentModel.TypeConverter` requires us to override `ConvertFrom` which uses `object value` as a parameter.
|
||||
|
||||
Previously, in .NET Standard we used `ConvertFromInvariantString(string value)`.
|
||||
|
||||
To create the MauiCompat library, we must update the logic in each converter to handle an object instead of a string.
|
||||
|
||||
Start by adding the following line:
|
||||
|
||||
```cs
|
||||
if (valueObject is not string value)
|
||||
throw new InvalidOperationException("Only typeof(string) allowed");
|
||||
```
|
||||
|
||||
- [ ] FileMediaSourceConverter.shared.cs
|
||||
- [ ] MediaSourceConverter.shared.cs
|
||||
- [ ] SafeAreaTypeConverter.shared.cs
|
||||
- [ ] UriTypeConverter.shared.cs
|
||||
|
||||
### 4. Manually Update `IStreamImageConverter`
|
||||
|
||||
`Microsoft.Maui.IStreamImageConverter` adds a new API, `public bool IsEmpty { get; }`.
|
||||
|
||||
Add the following code to implement the new API:
|
||||
|
||||
```cs
|
||||
public bool IsEmpty => Stream == null;
|
||||
```
|
||||
|
||||
- [ ] StreamMediaSource.shared.cs
|
||||
|
||||
### 5. Add MauiColorExtensions Classes
|
||||
### 3. Add MauiColorExtensions Classes
|
||||
|
||||
In .NET MAUI the `Color` object has been changed from a `struct` to an `object`. Because of that, we now need to be aware of passing `null` values on methods that have to do with colors. For instance, the `ToAndroid()` and `ToUIColor()` extension methods that take a .NET MAUI `Color` and convert it into a native platform color. There are multiple ways to solve this, but we chose to overload these extension methods with our own. This method checks if the incoming color is `null`, if it is, we replace the color with `Colors.Transparent` and pass it to the extension method and return its value.
|
||||
|
||||
This way we didn't need to edit all the lines with this extension method individually.
|
||||
|
||||
#### 5.1 Create `MauiColorExtensions.android.cs`
|
||||
The code looks like underneath.
|
||||
|
||||
```cs
|
||||
using AColor = Android.Graphics.Color;
|
||||
|
||||
namespace Xamarin.CommunityToolkit.MauiCompat
|
||||
{
|
||||
public static partial class MauiColorExtensions
|
||||
{
|
||||
public static AColor ToAndroid(this Microsoft.Maui.Graphics.Color self)
|
||||
{
|
||||
var colorToConvert = self;
|
||||
|
||||
if (colorToConvert == null)
|
||||
{
|
||||
colorToConvert = Microsoft.Maui.Graphics.Colors.Transparent;
|
||||
}
|
||||
|
||||
return Microsoft.Maui.Controls.Compatibility.Platform.Android.ColorExtensions.ToAndroid(colorToConvert);
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### 5.2 Create `MauiColorExtensions.ios.cs`
|
||||
The code looks like underneath.
|
||||
|
||||
```cs
|
||||
using iColor = UIKit.UIColor;
|
||||
|
||||
namespace Xamarin.CommunityToolkit.MauiCompat
|
||||
{
|
||||
public static partial class MauiColorExtensions
|
||||
{
|
||||
public static iColor ToUIColor(this Microsoft.Maui.Graphics.Color self)
|
||||
{
|
||||
var colorToConvert = self;
|
||||
|
||||
if (colorToConvert == null)
|
||||
{
|
||||
colorToConvert = Microsoft.Maui.Graphics.Colors.Transparent;
|
||||
}
|
||||
|
||||
return Microsoft.Maui.Controls.Compatibility.Platform.iOS.ColorExtensions.ToUIColor(colorToConvert);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
```
|
||||
|
||||
#### 5.3 Add `using` Statement to Files Which Reference Original Extension Methods
|
||||
#### 3.1 Add `using` Statement to Files Which Reference Original Extension Methods
|
||||
Now in each file that references the `ToAndroid()` and `ToUIColor()` methods we need to add the `using Xamarin.CommunityToolkit.MauiCompat;` line to make sure that it uses _our_ extension method. There is one catch: you have to declare this using **inside** the namespace declaration so that it will prefer _our_ extension method over the .NET MAUI one. In example:
|
||||
|
||||
```cs
|
||||
|
|
@ -130,7 +47,7 @@ namespace Xamarin.CommunityToolkit.UI.Views
|
|||
public class DrawingViewRenderer : ViewRenderer<DrawingView, View> { }
|
||||
```
|
||||
|
||||
### 6. Build projects
|
||||
### 4. Build projects
|
||||
|
||||
```zsh
|
||||
dotnet build ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat.sln -c Release
|
||||
|
|
|
|||
|
|
@ -196,32 +196,29 @@ jobs:
|
|||
pool:
|
||||
vmImage: macos-11
|
||||
steps:
|
||||
- powershell: |
|
||||
$mauiCompatExists = Test-Path -Path "$(PathToMauiCompatCommunityToolkitCsproj)"
|
||||
Write-Output "##vso[task.setvariable variable=MauiCompatExists]$mauiCompatExists"
|
||||
- task: UseDotNet@2
|
||||
condition: eq (variables['MauiCompatExists'], True)
|
||||
displayName: 'Install .NET SDK'
|
||||
inputs:
|
||||
version: $(NETCORE_VERSION)
|
||||
includePreviewVersions: false
|
||||
- task: CmdLine@2
|
||||
condition: eq (variables['MauiCompatExists'], True)
|
||||
displayName: 'Install .NET MAUI workload'
|
||||
inputs:
|
||||
script: 'dotnet workload install maui'
|
||||
- task: JavaToolInstaller@0
|
||||
condition: eq (variables['MauiCompatExists'], True)
|
||||
displayName: 'Install Java SDK 11.0'
|
||||
inputs:
|
||||
versionSpec: '11'
|
||||
jdkArchitectureOption: 'x64'
|
||||
jdkSourceOption: 'PreInstalled'
|
||||
- powershell: |
|
||||
$mauiCompatExists = Test-Path -Path "$(PathToMauiCompatCommunityToolkitCsproj)"
|
||||
Write-Output "##vso[task.setvariable variable=MauiCompatExists]$mauiCompatExists"
|
||||
- task: CmdLine@2
|
||||
condition: eq (variables['MauiCompatExists'], True)
|
||||
displayName: 'Clear Local NuGet Cache' #https://github.com/actions/virtual-environments/issues/1090#issuecomment-748452120
|
||||
displayName: 'Run MauiCompat Generator'
|
||||
condition: eq (variables['MauiCompatExists'], False)
|
||||
inputs:
|
||||
script: 'nuget locals all -clear'
|
||||
script: 'zsh ./MauiCompat.sh'
|
||||
# if this is a tagged build, then update the version number
|
||||
- powershell: |
|
||||
$buildSourceBranch = "$(Build.SourceBranch)"
|
||||
|
|
@ -229,36 +226,30 @@ jobs:
|
|||
Write-Host("Branch = $buildSourceBranch, Version = $tagVersion");
|
||||
Write-Host ("##vso[task.setvariable variable=NugetPackageVersion;]$tagVersion")
|
||||
displayName: Set NuGet Version to Tag Number
|
||||
condition: and(eq (variables['MauiCompatExists'], True), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
|
||||
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
|
||||
# restore, build and pack the packages
|
||||
- task: CmdLine@2
|
||||
condition: eq (variables['MauiCompatExists'], True)
|
||||
displayName: 'Build Xamarin.CommunityToolkit.MauiCompat.csproj'
|
||||
inputs:
|
||||
script: 'dotnet build $(PathToMauiCompatCommunityToolkitCsproj) -c Release /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
|
||||
- task: CopyFiles@2
|
||||
condition: eq (variables['MauiCompatExists'], True)
|
||||
inputs:
|
||||
Contents: 'SignList.xml'
|
||||
TargetFolder: '$(Build.ArtifactStagingDirectory)/nuget'
|
||||
- task: CmdLine@2
|
||||
condition: eq (variables['MauiCompatExists'], True)
|
||||
displayName: 'Pack Community Toolkit NuGets'
|
||||
inputs:
|
||||
script: 'dotnet pack $(PathToMauiCompatCommunityToolkitCsproj) -c Release /p:PackageVersion=$(NugetPackageVersion) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/nuget"'
|
||||
- task: CmdLine@2
|
||||
condition: eq (variables['MauiCompatExists'], True)
|
||||
displayName: 'Build Markup Project'
|
||||
inputs:
|
||||
script: 'dotnet build $(PathToMauiCompatMarkupCsproj) -c Release /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
|
||||
- task: CmdLine@2
|
||||
condition: eq (variables['MauiCompatExists'], True)
|
||||
displayName: 'Pack Markup NuGet'
|
||||
inputs:
|
||||
script: 'dotnet pack $(PathToMauiCompatMarkupCsproj) -c Release /p:PackageVersion=$(NugetPackageVersion) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/nuget"'
|
||||
# publish the packages
|
||||
- task: PublishBuildArtifacts@1
|
||||
condition: eq (variables['MauiCompatExists'], True)
|
||||
displayName: 'Publish Unsigned NuGets'
|
||||
inputs:
|
||||
artifactName: nuget
|
||||
|
|
|
|||
|
|
@ -7,9 +7,11 @@ namespace Xamarin.CommunityToolkit.Core
|
|||
[TypeConversion(typeof(FileMediaSource))]
|
||||
public sealed class FileMediaSourceConverter : TypeConverter
|
||||
{
|
||||
public override object ConvertFromInvariantString(string value) =>
|
||||
value != null
|
||||
public override object ConvertFromInvariantString(string value)
|
||||
{
|
||||
return value != null
|
||||
? (FileMediaSource)MediaSource.FromFile(value)
|
||||
: throw new InvalidOperationException($"Cannot convert \"{value}\" into {typeof(FileMediaSource)}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -7,7 +7,9 @@ namespace Xamarin.CommunityToolkit.UI.Views
|
|||
[TypeConversion(typeof(Uri))]
|
||||
public class UriTypeConverter : TypeConverter
|
||||
{
|
||||
public override object? ConvertFromInvariantString(string? value) =>
|
||||
string.IsNullOrWhiteSpace(value) ? null : new Uri(value, UriKind.RelativeOrAbsolute);
|
||||
public override object? ConvertFromInvariantString(string? value)
|
||||
{
|
||||
return string.IsNullOrWhiteSpace(value) ? null : new Uri(value, UriKind.RelativeOrAbsolute);
|
||||
}
|
||||
}
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче