Skip to content

Commit

Permalink
Merge branch 'main' into fix/396
Browse files Browse the repository at this point in the history
  • Loading branch information
jfversluis authored Jan 23, 2024
2 parents 77d7732 + 81df36b commit 59a254d
Show file tree
Hide file tree
Showing 429 changed files with 21,626 additions and 14 deletions.
24 changes: 15 additions & 9 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Build Changed C# Projects for PR

on:
pull_request:
paths-ignore:
- '**.md'

jobs:
build:
Expand Down Expand Up @@ -36,7 +38,7 @@ jobs:
run: |
$failedProjectCount=0
# Get the list of changed files
$changedFiles = git diff --name-only -r HEAD^1 HEAD
$changedFiles = git diff --name-only -r --diff-filter=d HEAD^1 HEAD
$excluded_projects_file="./eng/excluded_projects_" + "${{ runner.os }}".ToLower() + ".txt"
$excluded_projects=@()
Expand Down Expand Up @@ -77,13 +79,15 @@ jobs:
}
}
# Only proceed when his project has not been built yet
if (-not ($processedProjects -contains $file)) {
if ([string]::IsNullOrEmpty($projectToBuild)) {
Write-Output "::warning:: Found no csproj for file $file"
}
else {
$projectToBuild = (Resolve-Path -Path $projectToBuild -Relative).Replace("\", "/")
if (-not [string]::IsNullOrEmpty($projectToBuild)) {
$projectToBuild = (Resolve-Path -Path $projectToBuild -Relative).Replace("\", "/")
# Only proceed when this project has not been built yet
if (-not ($processedProjects -contains $projectToBuild)) {
Write-Output "::notice:: $projectToBuild is not in processed builds yet"
$processedProjects += $projectToBuild
Write-Output "::notice:: Added $projectToBuild to processed builds"
if ($excluded_projects -contains $projectToBuild) {
Write-Output "::notice:: Skipping build for excluded project: $projectToBuild"
Expand All @@ -95,7 +99,6 @@ jobs:
Write-Output "::group:: Building $projectToBuild"
dotnet build $projectToBuild
$processedProjects += $projectToBuild
if ($LASTEXITCODE -gt 0) {
Write-Output "::error:: Build failed for $projectToBuild"
Expand All @@ -116,6 +119,9 @@ jobs:
}
}
}
else {
Write-Output "::warning:: Found no csproj for file $file"
}
}
if ($failedProjectCount -gt 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
<string>Camera Photos</string>
<key>NSCalendarsUsageDescription</key>
<string>Calendar Access</string>
<key>NSCalendarsFullAccessUsageDescription</key>
<string>Full access to the Calendar is needed to sign you up for parties!</string>
<key>NSCalendarsWriteOnlyAccessUsageDescription</key>
<string>Just writing events to the Calendar, nothing to see here.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Get Location</string>
<key>NSLocationAlwaysUsageDescription</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
<string>Camera Photos</string>
<key>NSCalendarsUsageDescription</key>
<string>Calendar Access</string>
<key>NSCalendarsFullAccessUsageDescription</key>
<string>Full access to the Calendar is needed to sign you up for parties!</string>
<key>NSCalendarsWriteOnlyAccessUsageDescription</key>
<string>Just writing events to the Calendar, nothing to see here.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Get Location</string>
<key>NSLocationAlwaysUsageDescription</key>
Expand Down
26 changes: 26 additions & 0 deletions 8.0/SkiaSharp/MandelbrotAnimation/MandelbrotAnimation.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34330.188
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MandelbrotAnimation", "MandelbrotAnimation\MandelbrotAnimation.csproj", "{AADA2731-0754-4634-944E-1DCC3C1374EB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AADA2731-0754-4634-944E-1DCC3C1374EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AADA2731-0754-4634-944E-1DCC3C1374EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AADA2731-0754-4634-944E-1DCC3C1374EB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{AADA2731-0754-4634-944E-1DCC3C1374EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AADA2731-0754-4634-944E-1DCC3C1374EB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9E213343-022C-4D68-9714-5D25F8876EC7}
EndGlobalSection
EndGlobal
15 changes: 15 additions & 0 deletions 8.0/SkiaSharp/MandelbrotAnimation/MandelbrotAnimation/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version = "1.0" encoding = "UTF-8" ?>
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:MandelbrotAnimation"
x:Class="MandelbrotAnimation.App">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Resources/Styles/Colors.xaml" />
<ResourceDictionary Source="Resources/Styles/Styles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>

12 changes: 12 additions & 0 deletions 8.0/SkiaSharp/MandelbrotAnimation/MandelbrotAnimation/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace MandelbrotAnimation;

public partial class App : Application
{
public App()
{
InitializeComponent();

MainPage = new AppShell();
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Shell
x:Class="MandelbrotAnimation.AppShell"
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:MandelbrotAnimation"
Shell.FlyoutBehavior="Disabled"
Title="MandelbrotAnimation">

<ShellContent
Title="Home"
ContentTemplate="{DataTemplate local:MainPage}"
Route="MainPage" />

</Shell>

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace MandelbrotAnimation;

public partial class AppShell : Shell
{
public AppShell()
{
InitializeComponent();
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
namespace MandelbrotAnimation
{
class BitmapInfo
{
public int PixelWidth { get; private set; }

public int PixelHeight { get; private set; }

public int[] IterationCounts { get; private set; }

public BitmapInfo(int pixelWidth, int pixelHeight, int[] iterationCounts)
{
PixelWidth = pixelWidth;
PixelHeight = pixelHeight;
IterationCounts = iterationCounts;
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:skia="clr-namespace:SkiaSharp.Views.Maui.Controls;assembly=SkiaSharp.Views.Maui.Controls"
x:Class="MandelbrotAnimation.MainPage"
Title="Mandelbrot Animation">
<Grid Margin="20"
RowDefinitions="0.1*, 0.1*, 0.8*, 0.1*, 0.1*">
<Label x:Name="statusLabel"
HorizontalTextAlignment="Center" />
<ProgressBar x:Name="progressBar"
Grid.Row="1"/>
<skia:SKCanvasView x:Name="canvasView"
Grid.Row="2"
VerticalOptions="Fill"
PaintSurface="OnCanvasViewPaintSurface" />
<Label x:Name="storageLabel"
Grid.Row="3"
HorizontalTextAlignment="Center" />
<Button x:Name="deleteButton"
Grid.Row="4"
Text="Delete All"
Clicked="OnDeleteButtonClicked" />
</Grid>
</ContentPage>

Loading

0 comments on commit 59a254d

Please sign in to comment.