Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Adjust devserver exclusion compatibility #180

Merged
merged 10 commits into from
Nov 21, 2024
Merged

fix: Adjust devserver exclusion compatibility #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bf93103
ci: Move to nbgv
jeromelaban Nov 20, 2024
47cf53c
chore: Adjust for net8.0.x
jeromelaban Nov 20, 2024
0119b3e
chore: Adjust warnings, reduce logging
jeromelaban Nov 20, 2024
661cbb9
chore: Adjust uwp build
jeromelaban Nov 20, 2024
b27cfd0
chore: Adjust warnings
jeromelaban Nov 20, 2024
f306f68
chore: Adjust sdk version
jeromelaban Nov 21, 2024
16e756f
chore: Adjust reference
jeromelaban Nov 21, 2024
eb6acff
chore: Adjust base net sdk
jeromelaban Nov 21, 2024
4002585
chore: Adjust static class
jeromelaban Nov 21, 2024
b93740c
chore: Adjust analysis
jeromelaban Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ on:
branches: [ "main" ]

env:
DotNetVersion: '7.0.401'
UnoCheck_Version: '1.16.0'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/519b147a80d92e35cac4b8f97855d9302c91b340/manifests/uno.ui.manifest.json'
DotNetVersion: '8.0.403'
UnoCheck_Version: '1.26.1'

jobs:
build:
Expand All @@ -26,17 +25,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
Expand All @@ -45,18 +37,17 @@ 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

- 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: |
$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
Expand Down
62 changes: 0 additions & 62 deletions build/gitversion.yml
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<PropertyGroup>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);CS1998</NoWarn><!--Lacks await in async-->
<NoWarn>$(NoWarn);CS1998</NoWarn> <!-- Lacks await in async -->
<NoWarn>$(NoWarn);NU1903</NoWarn> <!-- System.Private.Uri is transitively updated by the runtime -->
</PropertyGroup>

<PropertyGroup Condition="'$(TF_BUILD)' == 'true' or '$(GITHUB_ACTIONS)'=='true'">
Expand Down
2 changes: 1 addition & 1 deletion src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Gtk/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Uno.UI.RuntimeTests.Engine.Skia.Gtk
{
class Program
static class Program
{
static void Main(string[] args)
{
Expand Down
2 changes: 1 addition & 1 deletion src/TestApp/uwp/Uno.UI.RuntimeTests.Engine.Skia.Linux.FrameBuffer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Uno.UI.RuntimeTests.Engine
{
class Program
static class Program
{
static void Main(string[] args)
{
Expand Down
Loading
Loading