Fix build

- AOT builds using NET 8 - MacOS uses v13 which is on x86
AshleighAdams · Aug 16, 2024 · a59ea53 · a59ea53
1 parent 3b56ad9
commit a59ea53
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/.github/shared.yml b/.github/shared.yml
@@ -19,6 +19,7 @@ definitions:
         5.0.x
         6.x
         7.x
+        8.x
 
   setup-nuget: &setup-nuget
     name: Setup NuGet
@@ -120,14 +121,14 @@ definitions:
             os: ubuntu-latest
             exe: verlite
           - rid: osx-x64
-            os: macos-latest
+            os: macos-13
             exe: verlite
     steps:
     - *checkout
     - *setup-dotnet
     - name: Publish
       run: |
-        dotnet publish -r "${rid}" -c Release src/Verlite.CLI/Verlite.CLI.csproj -p:PublishAot=true -o build
+        dotnet publish -r "${rid}" -c Release src/Verlite.CLI/Verlite.CLI.csproj -p:VerliteAot=true -o build
         mkdir -p artifacts
         cp "build/${exe}" "artifacts/${exe}"
         cd artifacts/

diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
@@ -38,6 +38,7 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Restore
       run: dotnet restore
@@ -82,7 +83,7 @@ jobs:
           os: ubuntu-latest
           exe: verlite
         - rid: osx-x64
-          os: macos-latest
+          os: macos-13
           exe: verlite
     steps:
     - uses: actions/checkout@v3
@@ -97,10 +98,11 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Publish
       run: |
-        dotnet publish -r "${rid}" -c Release src/Verlite.CLI/Verlite.CLI.csproj -p:PublishAot=true -o build
+        dotnet publish -r "${rid}" -c Release src/Verlite.CLI/Verlite.CLI.csproj -p:VerliteAot=true -o build
         mkdir -p artifacts
         cp "build/${exe}" "artifacts/${exe}"
         cd artifacts/
@@ -136,6 +138,7 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Mutation Test
       run: |
@@ -188,6 +191,7 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Run Integration Tests
       run: |
@@ -214,6 +218,7 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Setup NuGet
       run: |

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -38,6 +38,7 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Restore
       run: dotnet restore
@@ -82,7 +83,7 @@ jobs:
           os: ubuntu-latest
           exe: verlite
         - rid: osx-x64
-          os: macos-latest
+          os: macos-13
           exe: verlite
     steps:
     - uses: actions/checkout@v3
@@ -97,10 +98,11 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Publish
       run: |
-        dotnet publish -r "${rid}" -c Release src/Verlite.CLI/Verlite.CLI.csproj -p:PublishAot=true -o build
+        dotnet publish -r "${rid}" -c Release src/Verlite.CLI/Verlite.CLI.csproj -p:VerliteAot=true -o build
         mkdir -p artifacts
         cp "build/${exe}" "artifacts/${exe}"
         cd artifacts/
@@ -136,6 +138,7 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Mutation Test
       run: |
@@ -188,6 +191,7 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Run Integration Tests
       run: |

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -29,6 +29,7 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Setup NuGet
       run: |
@@ -83,7 +84,7 @@ jobs:
           os: ubuntu-latest
           exe: verlite
         - rid: osx-x64
-          os: macos-latest
+          os: macos-13
           exe: verlite
     steps:
     - uses: actions/checkout@v3
@@ -98,10 +99,11 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Publish
       run: |
-        dotnet publish -r "${rid}" -c Release src/Verlite.CLI/Verlite.CLI.csproj -p:PublishAot=true -o build
+        dotnet publish -r "${rid}" -c Release src/Verlite.CLI/Verlite.CLI.csproj -p:VerliteAot=true -o build
         mkdir -p artifacts
         cp "build/${exe}" "artifacts/${exe}"
         cd artifacts/
@@ -139,6 +141,7 @@ jobs:
           5.0.x
           6.x
           7.x
+          8.x
 
     - name: Setup NuGet
       run: |

diff --git a/src/Verlite.CLI/Verlite.CLI.csproj b/src/Verlite.CLI/Verlite.CLI.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup Condition="'$(VerliteAot)'=='true'">
+    <PublishAot>true</PublishAot>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(PublishAot)'!='true'">
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <TargetFrameworks>netcoreapp2.1;net5.0;</TargetFrameworks>
@@ -8,7 +12,7 @@
   <PropertyGroup Condition="'$(PublishAot)'=='true'">
     <TargetName>verlite</TargetName>
     <TargetExtension>elf</TargetExtension>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <SelfContained>true</SelfContained>
     <TrimMode>Link</TrimMode>
     <RootAllApplicationAssemblies>false</RootAllApplicationAssemblies>