From bae1b9e9b26ef632d2979c972ef0d805b27e5aa1 Mon Sep 17 00:00:00 2001
From: Jason Naylor <jason_naylor@sil.org>
Date: Tue, 12 Jul 2022 11:09:22 -0700
Subject: [PATCH] Update to dotnet6 on build

* Use netstandard2.0 BuildTasks for SIL.LCModel
* Gather test assemblies and pass to nunit3-console
---
 .github/workflows/ci-cd.yml                              | 9 +++++++--
 src/SIL.LCModel/GenerateModel.proj                       | 2 +-
 .../SIL.LCModel.Utils.Tests.csproj                       | 3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index aad9182d..53c5107e 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -15,6 +15,8 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
+    env:
+      DOTNET_NOLOGO: true
 
     steps:
     - name: Checkout
@@ -26,7 +28,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
 
     - name: Build
       run: dotnet build
@@ -35,4 +37,7 @@ jobs:
       run: nuget install NUnit.ConsoleRunner -Version 3.13.0 -DirectDownload -OutputDirectory .
         
     - name: Run UnitTests
-      run: ./NUnit.ConsoleRunner.3.13.0/tools/nunit3-console.exe  **/*Tests.dll
+      run: |
+       find artifacts/ -type f -name '*Tests.dll' | paste -sd ' '
+       echo "TESTASSEMBLIES=$(find artifacts/ -type f -name '*Tests.dll' | paste -sd ' ')" >> $GITHUB_ENV
+       ./NUnit.ConsoleRunner.3.13.0/tools/nunit3-console.exe  ${{ env.TESTASSEMBLIES }}
diff --git a/src/SIL.LCModel/GenerateModel.proj b/src/SIL.LCModel/GenerateModel.proj
index 5a2176c6..8617aada 100644
--- a/src/SIL.LCModel/GenerateModel.proj
+++ b/src/SIL.LCModel/GenerateModel.proj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0" DefaultTargets="GenerateModel">
-	<UsingTask TaskName="LcmGenerate" AssemblyFile="$(OutDir)SIL.LCModel.Build.Tasks.dll" />
+	<UsingTask TaskName="LcmGenerate" AssemblyFile="$(OutDir)..\netstandard2.0\SIL.LCModel.Build.Tasks.dll" />
 
 	<Target Name="GenerateModel">
 		<LcmGenerate XmlFile="MasterLCModel.xml" OutputDir="." OutputFile="DomainImpl/GeneratedClasses.cs" TemplateFile="LcmGenerate/main.vm.cs" />
diff --git a/tests/SIL.LCModel.Utils.Tests/SIL.LCModel.Utils.Tests.csproj b/tests/SIL.LCModel.Utils.Tests/SIL.LCModel.Utils.Tests.csproj
index 1866e14c..3badc924 100644
--- a/tests/SIL.LCModel.Utils.Tests/SIL.LCModel.Utils.Tests.csproj
+++ b/tests/SIL.LCModel.Utils.Tests/SIL.LCModel.Utils.Tests.csproj
@@ -18,8 +18,7 @@ This package provides unit tests for SIL.LCModel.Utils and test utility classes<
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-    <PackageReference Include="Mono.Posix" Version="5.4.0.201" PrivateAssets="All" Condition="'$(OS)' == 'Windows_NT'" />
-    <Reference Include="Mono.Posix" Condition="'$(OS)' != 'Windows_NT'" />
+    <PackageReference Include="Mono.Posix" Version="5.4.0.201" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>