Skip to content

Commit

Permalink
Merge branch 'main' into feature/cupertino-text-switch
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelstonis committed Oct 19, 2023
2 parents 00e0791 + 428657a commit 7370a39
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 61 deletions.
76 changes: 44 additions & 32 deletions .github/workflows/nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,49 @@

name: .NET

on:
push:
tags:
- 'v**'
on:
push:
tags:
- "v**"

env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_NOLOGO: true
NuGetDirectory: ${{ github.workspace}}/nuget

jobs:
build:

runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.x'
source-url: https://nuget.pkg.github.com/theeightbot/index.json
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

- name: Install MAUI Workloads
run: dotnet workload install maui --ignore-failed-sources

- name: Semver Parse
id: version
uses: release-kit/[email protected]

- name: Build Aurora Controls MAUI
run: dotnet build AuroraControlsMaui/AuroraControls.csproj

- name: Create the package
run: dotnet pack --configuration Release /p:AssemblyVersion=${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }} /p:Version=${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }} AuroraControlsMaui/AuroraControls.csproj

- name: Publish the package to GPR
run: dotnet nuget push AuroraControlsMaui/bin/Release/*.nupkg
build:
runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: "7.x"
source-url: https://nuget.pkg.github.com/theeightbot/index.json
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

- name: Install MAUI Workloads
run: dotnet workload install maui --ignore-failed-sources

- name: Semver Parse
id: version
uses: release-kit/[email protected]

- name: Build Aurora Controls MAUI
run: dotnet build AuroraControlsMaui/AuroraControls.Maui.csproj

- name: Create the package
run: dotnet pack --configuration Release --output ${{ env.NuGetDirectory }} /p:AssemblyVersion=${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }} /p:Version=${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }} AuroraControlsMaui/AuroraControls.Maui.csproj

# Publish the NuGet package as an artifact, so they can be used in the following jobs
- uses: actions/upload-artifact@v3
with:
name: nuget
if-no-files-found: error
retention-days: 7
path: ${{ env.NuGetDirectory }}/*.nupkg

- name: Publish the package to GPR
run: dotnet nuget push ${{ env.NuGetDirectory }}/*.nupkg
2 changes: 1 addition & 1 deletion AuroraControlsMaui.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 25.0.1703.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuroraControls", "AuroraControlsMaui\AuroraControls.csproj", "{0D872F55-6D9B-4DF3-89A8-5031456F1E38}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuroraControls.Maui", "AuroraControlsMaui\AuroraControls.Maui.csproj", "{0D872F55-6D9B-4DF3-89A8-5031456F1E38}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuroraControls.TestApp", "AuroraControls.TestApp\AuroraControls.TestApp.csproj", "{B6A2F40F-63BB-4FCD-AEA7-EFB703F1B35B}"
EndProject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
<AssemblyName>AuroraControls</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp.Views.Maui.Controls"
Version="2.88.6" />
<PackageReference Include="Svg.Skia"
Version="1.0.0.2" />
<PackageReference Include="Topten.RichTextKit"
Version="0.4.166" />
<PackageReference Include="SkiaSharp.HarfBuzz"
Version="2.88.6" />
</ItemGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
<AssemblyName>AuroraControls</AssemblyName>
<PackageId>AuroraControls.Maui</PackageId>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp.Views.Maui.Controls"
Version="2.88.6" />
<PackageReference Include="Svg.Skia"
Version="1.0.0.2" />
<PackageReference Include="Topten.RichTextKit"
Version="0.4.166" />
<PackageReference Include="SkiaSharp.HarfBuzz"
Version="2.88.6" />
</ItemGroup>
</Project>
10 changes: 7 additions & 3 deletions Directory.build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
<RepositoryUrl>https://github.com/TheEightBot/AuroraControls.Maui</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>.NET MAUI;Custom Controls;SkiaSharp;Eight-Bot</PackageTags>
<Description>
Provides custom user controls for the .NET MAUI platform
</Description>
<Description>Custom user controls for the .NET MAUI platform</Description>
<PackageIcon>logo.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="stylecop.analyzers"
Expand All @@ -30,6 +29,11 @@
Pack="true"
PackagePath="\" />
</ItemGroup>
<ItemGroup>
<None Include="..\README.md"
Pack="true"
PackagePath="\" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json"
Link="stylecop.json" />
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# AuroraControlsMaui
# Aurora Controls for .NET MAUI
Binary file modified images/logo.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7370a39

Please sign in to comment.