diff --git a/.github/workflows/dotnet-format-daily.yml b/.github/workflows/dotnet-format-daily.yml index 5ae64bcca..bbbadca17 100644 --- a/.github/workflows/dotnet-format-daily.yml +++ b/.github/workflows/dotnet-format-daily.yml @@ -39,8 +39,8 @@ jobs: committer: GitHub author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> labels: housekeeping - assignees: jfversluis - reviewers: jfversluis + assignees: brminnick + reviewers: brminnick branch: housekeeping/fix-codeformatting # Pushing won't work to forked repos diff --git a/MauiCompat.sh b/MauiCompat.sh index 73e3b4aa0..13a17362a 100755 --- a/MauiCompat.sh +++ b/MauiCompat.sh @@ -426,6 +426,10 @@ sed -i '' 's/, v/, (float)v/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.M sed -i '' 's/public SnackBarLayout Microsoft.Maui.Controls.Layout/public SnackBarLayout Layout/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/NativeSnackBar.ios.macos.cs +# NativeSnackBarButton.ios.macos.cs + +sed -i '' 's/LineBreakMode =/TitleLabel.LineBreakMode =/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/NativeSnackButton.ios.macos.cs + # VisualFeedbackEffect.shared.cs sed -i '' 's/nativeColor.Alpha/nativeColor.A/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/VisualFeedbackEffect.shared.cs @@ -500,6 +504,7 @@ 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 +sed -i '' 's/using Xamarin.Forms.Shapes;/using Microsoft.Maui.Controls.Shapes;using Rect = Microsoft.Maui.Graphics.Rectangle;/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Effects/CornerRadius/CornerRadiusEffect.shared.cs # MauiColorExtensions printf > ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/Extensions/MauiColorExtensions.android.cs " diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3b08833bd..0c93a4611 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -196,13 +196,14 @@ jobs: pool: vmImage: macos-11 steps: - - task: UseDotNet@2 - displayName: 'Install .NET SDK' + - task: CmdLine@2 + displayName: Install .NET 6.0.200-preview.22055.15 inputs: - version: $(NETCORE_VERSION) - includePreviewVersions: false + script: | + curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 6.0.200-preview.22055.15 --quality preview + dotnet --version - task: CmdLine@2 - displayName: 'Install .NET MAUI workload' + displayName: 'Install .NET MAUI Workload' inputs: script: 'dotnet workload install maui' - task: JavaToolInstaller@0 diff --git a/samples/XCT.Sample/Pages/Converters/MathExpressionConverterPage.xaml b/samples/XCT.Sample/Pages/Converters/MathExpressionConverterPage.xaml index f61671e4e..1380af9c5 100644 --- a/samples/XCT.Sample/Pages/Converters/MathExpressionConverterPage.xaml +++ b/samples/XCT.Sample/Pages/Converters/MathExpressionConverterPage.xaml @@ -8,7 +8,7 @@ x:Class="Xamarin.CommunityToolkit.Sample.Pages.Converters.MathExpressionConverterPage"> - + @@ -27,7 +27,7 @@ BackgroundColor="Bisque" Padding="10" HeightRequest="120" - CornerRadius="{Binding Source={x:Reference CalculatedFrame}, Path=HeightRequest, Converter={StaticResource MathExpressionConverter}, ConverterParameter='x/2'}"> + CornerRadius="{Binding Source={x:Reference CalculatedFrame}, Path=HeightRequest, Converter={StaticResource DivideByTwoConverter}}">