Revert floating the Core's version in tests and fix CI. (#417)

* Revert floating the Core's version in tests. Fixes nightly builds. * Force running .NET 5 examples in x64. .NET 5 does not support macOS in Apple Silicon. * Fix typo. * Update nightlies to build packages with arm64 RID. * Target only .NET 6 for the examples.
TileDB-Inc · Apr 30, 2024 · d3ce456 · d3ce456
1 parent 8ecad0c
commit d3ce456
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -23,7 +23,7 @@ jobs:
           - os: ubuntu-latest
             platform: linux-x86_64
           - os: macos-latest
-            platform: macos-x86_64
+            platform: macos-arm64
           - os: windows-latest
             platform: windows-x86_64
           - tag: dev
@@ -142,11 +142,7 @@ jobs:
       - name: Test TileDB-CSharp
         run: dotnet test tests/TileDB.CSharp.Test/TileDB.CSharp.Test.csproj -c Release
 
-      - name: Run examples (.NET 5)
-        shell: bash
-        run: find examples/ -name *.csproj | xargs -I{} dotnet run --project {} -f net5.0
-
-      - name: Run examples (.NET 6)
+      - name: Run examples
         shell: bash
         run: find examples/ -name *.csproj | xargs -I{} dotnet run --project {} -f net6.0
 

diff --git a/.github/workflows/tiledb-csharp.yml b/.github/workflows/tiledb-csharp.yml
@@ -63,12 +63,7 @@ jobs:
         run: |
           dotnet test -c Release tests/TileDB.CSharp.Test
 
-      - name: Run examples (.NET 5)
+      - name: Run examples
         shell: bash
         run: |
-          find examples/ -name *.csproj | xargs -I{} dotnet run --project {} -f net5.0
-
-      - name: Run examples (.NET 6)
-        shell: bash
-        run: |
-          find examples/ -name *.csproj | xargs -I{} dotnet run --project {} -f net5.0
+          find examples/ -name *.csproj | xargs -I{} dotnet run --project {} -f net6.0
diff --git a/examples/TileDB.CSharp.Example/TileDB.CSharp.Example.csproj b/examples/TileDB.CSharp.Example/TileDB.CSharp.Example.csproj
@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <RollForward>Major</RollForward>
     <RootNamespace>TileDB.CSharp.Examples</RootNamespace>
-    <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
   </PropertyGroup>
 

diff --git a/tests/TileDB.CSharp.Test/TileDB.CSharp.Test.csproj b/tests/TileDB.CSharp.Test/TileDB.CSharp.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
@@ -20,6 +20,10 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\sources\TileDB.CSharp\TileDB.CSharp.csproj" />
-    <PackageVersion Include="TileDB.Native" Version="$(TileDBNativeVersionMajor).$(TileDBNativeVersionMajor).*" />
+    <!-- To run tests with a TileDB patch, uncomment the following lines: -->
+    <!-- 
+    <PackageReference Include="TileDB.Native" />
+    <PackageVersion Update="TileDB.Native" Version="<version>" />
+    -->
   </ItemGroup>
 </Project>