From bf931033e731609db05f497a2bb1396a963749e9 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Wed, 20 Nov 2024 14:56:05 -0500 Subject: [PATCH 01/10] ci: Move to nbgv --- .github/workflows/dotnet.yml | 16 ++--- build/gitversion.yml | 62 ------------------- .../Uno.UI.RuntimeTests.Engine.targets | 10 ++- version.json | 21 +++++++ 4 files changed, 34 insertions(+), 75 deletions(-) delete mode 100644 build/gitversion.yml create mode 100644 version.json diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 08efb37..2c48978 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -26,17 +26,10 @@ jobs: with: dotnet-version: ${{ env.DotNetVersion }} - - name: Setup GitVersion - uses: gittools/actions/gitversion/setup@v0.9.9 + - uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2 with: - versionSpec: '5.x' - - - name: GitVersion - id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.9 - with: - useConfigFile: true - configFilePath: build/gitversion.yml + toolVersion: 3.6.139 + setAllVars: true - run: | npm install -g conventional-changelog-cli@2.2.2 @@ -55,8 +48,7 @@ jobs: - name: Build run: | - $adjustedPackageVersion="${{ steps.gitversion.outputs.semVer }}".ToLower(); - dotnet build src\Uno.UI.RuntimeTests.Engine-dotnet-build.slnf "/t:Build;Pack" /p:PackageVersion=$adjustedPackageVersion /p:Version=${{ steps.gitversion.outputs.assemblySemVer }} "/p:PackageOutputPath=$env:GITHUB_WORKSPACE\artifacts" "/p:PackageReleaseNotesFile=$env:GITHUB_WORKSPACE\build\changelog.md" + dotnet build src\Uno.UI.RuntimeTests.Engine-dotnet-build.slnf "/t:Build;Pack" /p:PackageVersion=$env:NBGV_SemVer2 /p:Version=$env:NBGV_SemVer2 "/p:PackageOutputPath=$env:GITHUB_WORKSPACE\artifacts" "/p:PackageReleaseNotesFile=$env:GITHUB_WORKSPACE\build\changelog.md" - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/build/gitversion.yml b/build/gitversion.yml deleted file mode 100644 index 40040ee..0000000 --- a/build/gitversion.yml +++ /dev/null @@ -1,62 +0,0 @@ -assembly-versioning-scheme: MajorMinorPatch -mode: Mainline - -# Don't use next-version with Mainline (changed since 5.3), otherwise the stable -# branch will not count on commits, only on tags. -# See https://github.com/GitTools/GitVersion/issues/2461#issuecomment-733658087 -# next-version: 4.0 - -branches: - main: - mode: ContinuousDeployment - regex: main - tag: dev - increment: Minor - is-source-branch-for: ['beta', 'stable'] - - pull-request: - regex: ^(pull|pull\-requests|pr)[/-] - mode: ContinuousDeployment - tag: 'PullRequest' - tag-number-pattern: '[/-](?\d+)[-/]' - increment: Inherit - - beta: - mode: ContinuousDeployment - regex: ^release/beta/.* - tag: beta - increment: none - source-branches: ['main'] - - stable: - regex: ^release/stable/.* - tag: '' - increment: Patch - source-branches: ['main','beta'] - is-mainline: true - - dev: - mode: ContinuousDeployment - regex: ^dev/.*?/(.*?) - tag: dev.{BranchName} - source-branches: ['main', 'stable', 'projects', 'feature'] - increment: none - - projects: - tag: proj-{BranchName} - regex: ^projects/(.*?) - source-branches: ['main'] - increment: none - - feature: - tag: feature.{BranchName} - regex: ^feature/(.*?) - source-branches: ['main'] - increment: none - - release: - # disable default release branch - regex: ignore - -ignore: - sha: [] diff --git a/src/Uno.UI.RuntimeTests.Engine.Package/buildTransitive/Uno.UI.RuntimeTests.Engine.targets b/src/Uno.UI.RuntimeTests.Engine.Package/buildTransitive/Uno.UI.RuntimeTests.Engine.targets index e27463e..a266869 100644 --- a/src/Uno.UI.RuntimeTests.Engine.Package/buildTransitive/Uno.UI.RuntimeTests.Engine.targets +++ b/src/Uno.UI.RuntimeTests.Engine.Package/buildTransitive/Uno.UI.RuntimeTests.Engine.targets @@ -1,6 +1,14 @@  - + + $(DefineConstants);HAS_UNO_DEVSERVER true true diff --git a/version.json b/version.json new file mode 100644 index 0000000..ce4656e --- /dev/null +++ b/version.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", + "version": "1.33-dev.{height}", + "nuGetPackageVersion": { + "semVer": 2.0 + }, + "publicReleaseRefSpec": [ + "^refs/heads/main$", + "^refs/heads/release/stable/\\d+(?:\\.\\d+)?$" + ], + "cloudBuild": { + "setAllVariables": true, + "buildNumber": { + "enabled": true + } + }, + "release": { + "branchName": "release/stable/{version}", + "firstUnstableTag": "dev" + } +} \ No newline at end of file From 47cf53cc3ea78689c62e90cdce8e95b336ef07fd Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Wed, 20 Nov 2024 15:17:11 -0500 Subject: [PATCH 02/10] chore: Adjust for net8.0.x --- src/global.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/global.json diff --git a/src/global.json b/src/global.json new file mode 100644 index 0000000..bb1fa42 --- /dev/null +++ b/src/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "8.0.100", + "allowPrerelease": false, + "rollForward": "latestMinor" + } +} \ No newline at end of file From 0119b3e547e267f6888fcac0fbd8e1ce3bfd2211 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Wed, 20 Nov 2024 15:43:29 -0500 Subject: [PATCH 03/10] chore: Adjust warnings, reduce logging --- .github/workflows/dotnet.yml | 2 +- src/Directory.Build.props | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 2c48978..d0c5f4e 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -44,7 +44,7 @@ jobs: uses: microsoft/setup-msbuild@v1.1 - name: Windows-only Build - run: msbuild -r src\Uno.UI.RuntimeTests.Engine-win-only-build.slnf + run: msbuild -r -v:m src\Uno.UI.RuntimeTests.Engine-win-only-build.slnf - name: Build run: | diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 23635bc..091f487 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -15,7 +15,8 @@ enable true - $(NoWarn);CS1998 + $(NoWarn);CS1998 + $(NoWarn);NU1903 From 661cbb96c486a3a84717576e6a675f5d42a0d4f0 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Wed, 20 Nov 2024 16:15:51 -0500 Subject: [PATCH 04/10] chore: Adjust uwp build --- .../Uno.UI.RuntimeTests.Engine.Uwp.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj index 38feeb5..36dd416 100644 --- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj +++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj @@ -20,6 +20,8 @@ true + + $(NoWarn);NU1903 Debug From b27cfd03e0ecfb871ca3d0e0160c87e9df8e4733 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Wed, 20 Nov 2024 16:32:20 -0500 Subject: [PATCH 05/10] chore: Adjust warnings --- .../Uno.UI.RuntimeTests.Engine.Uwp.csproj | 313 +++++++++--------- 1 file changed, 158 insertions(+), 155 deletions(-) diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj index 36dd416..99ac4f7 100644 --- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj +++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.UWP/Uno.UI.RuntimeTests.Engine.Uwp.csproj @@ -1,164 +1,167 @@  - - - - - 6.2.11 - - - - - - - - - - - true - - $(NoWarn);NU1903 - - - Debug - x86 - {9804C1B9-A958-4A09-B975-AAECF08CFEE1} - AppContainerExe - Properties - Uno.UI.RuntimeTests.Engine - Uno.UI.RuntimeTests.Engine - en-US - UAP - 10.0.19041.0 - 10.0.19041.0 - 14 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - true - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - - - true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM64 - false - prompt - true - true - - - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM64 - false - prompt - true - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x64 - false - prompt - true - - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x64 - false - prompt - true - true - - - - - - - - - - Designer - - - - - - - - - - - - - - - 14.0 - - - + true + + + Debug + x86 + {9804C1B9-A958-4A09-B975-AAECF08CFEE1} + AppContainerExe + Properties + Uno.UI.RuntimeTests.Engine + Uno.UI.RuntimeTests.Engine + en-US + UAP + 10.0.19041.0 + 10.0.19041.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + true + + + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + true + true + + + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM + false + prompt + true + + + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM + false + prompt + true + true + + + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + true + true + + + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + true + true + + + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x64 + false + prompt + true + + + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x64 + false + prompt + true + true + + + + $(NoWarn);NU1903 + + + + + + + + + + + Designer + + + + + + + + + + + + + + + 14.0 + + + - $(NoWarn);NU1903 + $(NoWarn);NU1903;NU1902 From eb6acff200b2d1283230aec509e9ec24798753b8 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 21 Nov 2024 07:51:46 -0500 Subject: [PATCH 08/10] chore: Adjust base net sdk --- .github/workflows/dotnet.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 506c835..26dc5e3 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -8,8 +8,7 @@ on: env: DotNetVersion: '8.0.403' - UnoCheck_Version: '1.16.0' - UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/519b147a80d92e35cac4b8f97855d9302c91b340/manifests/uno.ui.manifest.json' + UnoCheck_Version: '1.26.1' jobs: build: @@ -38,7 +37,7 @@ jobs: - 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 gtk3 --skip vswin --skip vswinworkloads --skip vsmac --manifest $env:UnoCheck_Manifest + & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vswinworkloads --skip vsmac - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 From 4002585676a0bb79692eac7d061e2d99292b5085 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 21 Nov 2024 09:29:25 -0500 Subject: [PATCH 09/10] chore: Adjust static class --- src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs | 2 +- .../Program.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs index 95a7f7a..940219a 100644 --- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs +++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs @@ -5,7 +5,7 @@ namespace Uno.UI.RuntimeTests.Engine.Skia.Gtk { - class Program + static class Program { static void Main(string[] args) { diff --git a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Program.cs b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Program.cs index 8923ca7..ed14fa4 100644 --- a/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Program.cs +++ b/src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Program.cs @@ -4,7 +4,7 @@ namespace Uno.UI.RuntimeTests.Engine { - class Program + static class Program { static void Main(string[] args) { From b93740c46697aedaad30cdb88aff73df69596885 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 21 Nov 2024 10:43:22 -0500 Subject: [PATCH 10/10] chore: Adjust analysis --- .../Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Program.cs b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Program.cs index b7fd767..3753189 100644 --- a/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Program.cs +++ b/src/TestApp/winui/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Program.cs @@ -6,7 +6,7 @@ namespace Uno.UI.RuntimeTests.Engine { - internal class Program + static class Program { static void Main(string[] args) {