Merge pull request #180 from unoplatform/dev/jela/devserver-compat

fix: Adjust devserver exclusion compatibility
unoplatform · Nov 21, 2024 · 463cb58 · 463cb58
2 parents 50d6e52 + b93740c
commit 463cb58
Show file tree

Hide file tree

Showing 10 changed files with 208 additions and 237 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -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:
@@ -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
@@ -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

diff --git a/build/gitversion.yml b/build/gitversion.yml
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -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'">

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
@@ -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
@@ -4,7 +4,7 @@
 
 namespace Uno.UI.RuntimeTests.Engine
 {
-	class Program
+    static class Program
 	{
 		static void Main(string[] args)
 		{