Skip to content

Commit

Permalink
Merge pull request #321 from unoplatform/dev/jela/net9
Browse files Browse the repository at this point in the history
chore: Bump to latest uno.check
  • Loading branch information
jeromelaban authored Dec 16, 2024
2 parents 0c0afec + 5526a5e commit 026bd6a
Show file tree
Hide file tree
Showing 240 changed files with 24 additions and 7,430 deletions.
69 changes: 9 additions & 60 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@ on:
push:
branches:
- main
- release/**
- legacy/**
- release/*/*

pull_request:
types: [opened, synchronize, reopened]
branches:
- main
- release/**
- legacy/**
- release/*/*

env:
UnoCheck_Version: '1.26.0-dev.28'
UnoCheck_Version: '1.27.1'

jobs:
build_tool:
Expand All @@ -27,20 +25,15 @@ jobs:
with:
fetch-depth: 0

- name: Setup .NET 5
uses: actions/setup-dotnet@v4
with:
dotnet-version: '5.0.408'

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.401'
dotnet-version: '9.0.100'

- name: Setup GitVersion
uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: '5.6.11'
versionSpec: '5.10.3'

- name: GitVersion
id: gitversion
Expand Down Expand Up @@ -81,7 +74,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-latest, windows-latest, macos-15]
config: [Debug, Release]

runs-on: ${{ matrix.os }}
Expand All @@ -100,7 +93,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.401'
dotnet-version: '9.0.100'

- run: |
ubuntu_release=`lsb_release -rs`
Expand Down Expand Up @@ -179,7 +172,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.401'
dotnet-version: '9.0.100'

- name: Download Artifact
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -210,55 +203,12 @@ jobs:
name: logs_5_2
path: .\logs

validation_5_1:
name: Validate 5.1 Samples
needs: build_tool
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Download Artifact
uses: actions/download-artifact@v4
with:
name: NuGet
path: samples/packages

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.401'

- run: |
& dotnet tool update --global uno.check --version ${{ env.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
& uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac
name: Install .NET Workloads
- name: Validate 5.1 Samples app
run: |
$msbuild = vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
& $msbuild /r /bl:.\logs\samples.binlog samples\NewTemplate\build.slnf /p:AotAssemblies=false /p:WindowsPackageType=None /p:WasmShellILLinkerEnabled=false
- name: Validate 5.1 Samples (incremental)
run: |
$msbuild = vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
& $msbuild /r /bl:.\logs\samples-incremental.binlog samples\NewTemplate\build.slnf /p:AotAssemblies=false /p:WindowsPackageType=None /p:WasmShellILLinkerEnabled=false
- name: Upload Artifacts
uses: actions/upload-artifact@v4
if: always()
with:
name: logs_5_1
path: .\logs

# This step is only used to add a required check for the PR
Validation_Check:
name: Validation Check
runs-on: windows-latest
needs:
- build_tool
- validation_5_1
- validation_5_2_win
- validation_5_2_nix

Expand All @@ -272,7 +222,6 @@ jobs:
runs-on: windows-latest
needs:
- build_tool
- validation_5_1
- validation_5_2_win
- validation_5_2_nix
steps:
Expand All @@ -288,7 +237,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: '3.1.x'
dotnet-version: '9.0.100'

- name: Setup SignClient
run: |
Expand Down
16 changes: 8 additions & 8 deletions doc/using-uno-resizetizer.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Next, some adjustments are needed on `Android`, `Windows (WinUI)`, `WebAssembly`

# [**Android**](#tab/Android)

* Open the [`Main.Android.cs` file](https://github.com/unoplatform/uno.resizetizer/blob/main/samples/NewTemplate/Resizetizer.Extensions.Sample.Mobile/Android/Main.Android.cs) (or the file that has the `Android.App.ApplicationAttribute`), and change the `Icon` property, in that attribute, to be the name of the file used in the `Include` property of `UnoIcon`, in our case will be:
* Open the [`Main.Android.cs` file](https://github.com/unoplatform/uno.resizetizer/blob/7ad1199ea1a256e171d88e694486e9a8c341c8a2/samples/NewTemplate/Resizetizer.Extensions.Sample.Mobile/Android/Main.Android.cs) (or the file that has the `Android.App.ApplicationAttribute`), and change the `Icon` property, in that attribute, to be the name of the file used in the `Include` property of `UnoIcon`, in our case will be:

```csharp
[global::Android.App.ApplicationAttribute(
Expand All @@ -181,7 +181,7 @@ Next, some adjustments are needed on `Android`, `Windows (WinUI)`, `WebAssembly`
> [!NOTE]
> Uno.Resizetizer is currently only supported on WinUI, UWP is not supported."
* Open the [`Package.appxmanifest` file](https://github.com/unoplatform/uno.resizetizer/blob/main/samples/NewTemplate/Resizetizer.Extensions.Sample.Windows/Package.appxmanifest) and look for the `Application` tag
* Open the [`Package.appxmanifest` file](https://github.com/unoplatform/uno.resizetizer/blob/7ad1199ea1a256e171d88e694486e9a8c341c8a2/samples/NewTemplate/Resizetizer.Extensions.Sample.Windows/Package.appxmanifest) and look for the `Application` tag
* Remove everything that's related to the application icon (BackgroundColor, Square and Wide property inside the `uap:DefaultTile` attribute). It should look like this:

```xml
Expand All @@ -204,7 +204,7 @@ Next, some adjustments are needed on `Android`, `Windows (WinUI)`, `WebAssembly`
> [!NOTE]
> You will only need to configure this platform if you want to deploy it as a PWA.

* Open the [`manifest.webmanifest` file](https://github.com/unoplatform/uno.resizetizer/blob/main/samples/NewTemplate/Resizetizer.Extensions.Sample.Wasm/manifest.webmanifest) and look for the `icons` tag and remove all the values inside it. You should be seeing an empty array like this:
* Open the [`manifest.webmanifest` file](https://github.com/unoplatform/uno.resizetizer/blob/7ad1199ea1a256e171d88e694486e9a8c341c8a2/samples/NewTemplate/Resizetizer.Extensions.Sample.Wasm/manifest.webmanifest) and look for the `icons` tag and remove all the values inside it. You should be seeing an empty array like this:

```json
{
Expand All @@ -223,7 +223,7 @@ Next, some adjustments are needed on `Android`, `Windows (WinUI)`, `WebAssembly`

# [**iOS**](#tab/iOS)

* For `mac-catalyst` and `iOS`, open the [`info.plist` file](https://github.com/unoplatform/uno.resizetizer/blob/main/samples/NewTemplate/Resizetizer.Extensions.Sample.Mobile/iOS/Info.plist), find the `XSAppIconAsset` key, and change its value to `Assets.xcassets/iconapp.appiconset`.
* For `mac-catalyst` and `iOS`, open the [`info.plist` file](https://github.com/unoplatform/uno.resizetizer/blob/7ad1199ea1a256e171d88e694486e9a8c341c8a2/samples/NewTemplate/Resizetizer.Extensions.Sample.Mobile/iOS/Info.plist), find the `XSAppIconAsset` key, and change its value to `Assets.xcassets/iconapp.appiconset`.

> [!NOTE]
> If your app icon has a another name than `iconapp`, use it instead.
Expand Down Expand Up @@ -304,7 +304,7 @@ Next, some adjustments are needed on `Android`, `Windows`, and `iOS`.

# [**Android**](#tab/Android)

* Open the [`style.xml` file](https://github.com/unoplatform/uno.resizetizer/blob/main/samples/NewTemplate/Resizetizer.Extensions.Sample.Mobile/Android/Resources/values/Styles.xml), look for the `Theme` that is been used by the application and add the following line:
* Open the [`style.xml` file](https://github.com/unoplatform/uno.resizetizer/blob/7ad1199ea1a256e171d88e694486e9a8c341c8a2/samples/NewTemplate/Resizetizer.Extensions.Sample.Mobile/Android/Resources/values/Styles.xml), look for the `Theme` that is been used by the application and add the following line:

```xml
<style name="AppTheme" parent="Theme.AppCompat.Light">
Expand All @@ -328,7 +328,7 @@ Next, some adjustments are needed on `Android`, `Windows`, and `iOS`.

# [**Windows (WinUI)**](#tab/Windows)

* Open the [`Package.appxmanifest` file](https://github.com/unoplatform/uno.resizetizer/blob/main/samples/NewTemplate/Resizetizer.Extensions.Sample.Windows/Package.appxmanifest) and look for the `Application` node, inside it, look for the `uap:SplashScreen` node. Delete the `Image` property and its value, the `Application` tag should be like this:
* Open the [`Package.appxmanifest` file](https://github.com/unoplatform/uno.resizetizer/blob/7ad1199ea1a256e171d88e694486e9a8c341c8a2/samples/NewTemplate/Resizetizer.Extensions.Sample.Windows/Package.appxmanifest) and look for the `Application` node, inside it, look for the `uap:SplashScreen` node. Delete the `Image` property and its value, the `Application` tag should be like this:

```xml
<Applications>
Expand All @@ -351,7 +351,7 @@ Next, some adjustments are needed on `Android`, `Windows`, and `iOS`.

# [**iOS**](#tab/iOS)

* Open the [`info.plist` file](https://github.com/unoplatform/uno.resizetizer/blob/main/samples/NewTemplate/Resizetizer.Extensions.Sample.Mobile/iOS/Info.plist) and look for the `UILaunchStoryboardName` key, delete it and its value.
* Open the [`info.plist` file](https://github.com/unoplatform/uno.resizetizer/blob/7ad1199ea1a256e171d88e694486e9a8c341c8a2/samples/NewTemplate/Resizetizer.Extensions.Sample.Mobile/iOS/Info.plist) and look for the `UILaunchStoryboardName` key, delete it and its value.

> [!TIP]
> Feel free to delete the `LaunchScreen.storyboard` file.
Expand Down Expand Up @@ -436,7 +436,7 @@ The Uno Platform allows for flexible image handling through direct SVG use or th
Choosing between direct SVG usage and PNG conversion with Uno.Resizetizer depends on your specific application needs. Consider factors such as platform target, performance requirements, and how you plan to manipulate the images within your app.
## Sample App Example

A sample app is available [here](https://github.com/unoplatform/uno.resizetizer/tree/main/samples/NewTemplate) as an example for all the previous steps detailed above.
A sample app is available [here](https://github.com/unoplatform/uno.resizetizer/tree/7ad1199ea1a256e171d88e694486e9a8c341c8a2/samples/NewTemplate) as an example for all the previous steps detailed above.

## Troubleshooting

Expand Down
7 changes: 0 additions & 7 deletions samples/5.2/Uno52ResizetizerTests/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,4 @@
-->
<NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
</PropertyGroup>

<PropertyGroup>
<UnoExtensionsVersion>4.1.11</UnoExtensionsVersion>
<UnoToolkitVersion>6.0.16</UnoToolkitVersion>
<UnoThemesVersion>5.0.11</UnoThemesVersion>
<UnoCSharpMarkupVersion>5.2.10</UnoCSharpMarkupVersion>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Uno.Sdk">
<PropertyGroup>
<TargetFrameworks>
net8.0-android;
net8.0-ios;
net8.0-maccatalyst;
net8.0-windows10.0.19041;
net8.0-desktop;
net8.0-browserwasm;
net9.0-android;
net9.0-ios;
net9.0-maccatalyst;
net9.0-windows10.0.19041;
net9.0-desktop;
net9.0-browserwasm;
</TargetFrameworks>

<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion samples/5.2/Uno52ResizetizerTests/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
// To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
"msbuild-sdks": {
"Uno.Sdk": "5.2.68"
"Uno.Sdk": "5.5.43"
}
}
94 changes: 0 additions & 94 deletions samples/Legacy/.vsconfig

This file was deleted.

6 changes: 0 additions & 6 deletions samples/Legacy/NuGet.config

This file was deleted.

Loading

0 comments on commit 026bd6a

Please sign in to comment.