Enable MTP mode

Author: badcel

.github/workflows/ci.yml

@@ -63,9 +63,7 @@ jobs:
 
       - name: Run unit tests windows
         if: matrix.os == 'windows-latest'
-        env:
-          RuntimeIdentifier: win
-        run: dotnet test -c ${{ env.configuration }}
+        run: dotnet test -c ${{ env.configuration }} -p:WChartTarget=win
         working-directory: './src'
 
       - name: Build solution

src/WCharT.Net.Tests/WCharT.Net.Tests.csproj

@@ -3,6 +3,11 @@
     <IsPackable>false</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RootNamespace>WCharT.Tests</RootNamespace>
+
+    <!-- Enable MTP mode -->
+    <OutputType>Exe</OutputType>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
 
   <ItemGroup>

src/WCharT.Net/WCharT.Net.csproj

@@ -21,7 +21,7 @@
         <RootNamespace>WCharT</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
-        <DefineConstants Condition="'$(RuntimeIdentifier)' == 'win'">$(DefineConstants);TARGET_WINDOWS</DefineConstants>
+        <DefineConstants Condition="'$(WChartTarget)' == 'win'">$(DefineConstants);TARGET_WINDOWS</DefineConstants>
 
         <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
         <IncludeBuildOutput>false</IncludeBuildOutput>
@@ -36,15 +36,18 @@
         <None Include="../../readme.md" Pack="true" PackagePath="/" Visible="false"/>
 
         <None Include="obj/Release/net8.0/ref/WCharT.Net.dll" Pack="true" PackagePath="ref/net8.0" Visible="false"/>
-        <None Include="bin/Release/net8.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/unix/lib/net8.0" Visible="false"/>
-        <None Include="bin/Release/net8.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win/lib/net8.0" Visible="false"/>
+        <None Include="bin/Release/net8.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/linux-x64/lib/net8.0" Visible="false"/>
+        <None Include="bin/Release/net8.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/osx-x64/lib/net8.0" Visible="false"/>
+        <None Include="bin/Release/net8.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win-x64/lib/net8.0" Visible="false"/>
 
         <None Include="obj/Release/net9.0/ref/WCharT.Net.dll" Pack="true" PackagePath="ref/net9.0" Visible="false"/>
-        <None Include="bin/Release/net9.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/unix/lib/net9.0" Visible="false"/>
-        <None Include="bin/Release/net9.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win/lib/net9.0" Visible="false"/>
+        <None Include="bin/Release/net9.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/linux-x64/lib/net9.0" Visible="false"/>
+        <None Include="bin/Release/net9.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/osx-x64/lib/net9.0" Visible="false"/>
+        <None Include="bin/Release/net9.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win-x64/lib/net9.0" Visible="false"/>
 
         <None Include="obj/Release/net10.0/ref/WCharT.Net.dll" Pack="true" PackagePath="ref/net10.0" Visible="false"/>
-        <None Include="bin/Release/net10.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/unix/lib/net10.0" Visible="false"/>
-        <None Include="bin/Release/net10.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win/lib/net10.0" Visible="false"/>
+        <None Include="bin/Release/net10.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/linux-x64/lib/net10.0" Visible="false"/>
+        <None Include="bin/Release/net10.0/unix/WCharT.Net.dll" Pack="true" PackagePath="runtimes/osx-x64/lib/net10.0" Visible="false"/>
+        <None Include="bin/Release/net10.0/win/WCharT.Net.dll" Pack="true" PackagePath="runtimes/win-x64/lib/net10.0" Visible="false"/>
     </ItemGroup>
 </Project>

src/WCharT.slnx

@@ -7,6 +7,7 @@
     <File Path="build.fsx" />
     <File Path="Directory.Build.props" />
     <File Path="Directory.Packages.props" />
+    <File Path="global.json" />
   </Folder>
   <Folder Name="/src/">
     <Project Path="WCharT.Net.Tests/WCharT.Net.Tests.csproj" />

src/build.fsx

@@ -1,26 +1,28 @@
 #r "nuget: SimpleExec, 12.0.0"
-open System
 open SimpleExec
 
 let wchartDir = System.IO.Path.Combine(System.IO.Directory.GetCurrentDirectory(), "WCharT.Net")
 
-//Create binary for Linux / Mac
-Command.Run(
-    name = "dotnet",
-    args = "build --runtime unix --configuration Release",
-    workingDirectory = wchartDir
-)
+let configuration = "Release"
+let tfms = [ "net8.0"; "net9.0"; "net10.0" ]
 
-//Create binary for Windows
-Command.Run(
-    name = "dotnet",
-    args = "build --runtime win --configuration Release",
-    workingDirectory = wchartDir
-)
+let buildVariant (tfm: string) (target: string) =
+    let outputPath = $"bin/{configuration}/{tfm}/{target}/"
+
+    Command.Run(
+        name = "dotnet",
+        args = $"build -c {configuration} -f {tfm} -p:WChartTarget={target} -p:OutputPath={outputPath}",
+        workingDirectory = wchartDir
+    )
+
+//Create platform-specific binaries
+for tfm in tfms do
+    buildVariant tfm "unix"
+    buildVariant tfm "win"
 
 //Create reference assembly for AnyCPU
 Command.Run(
     name = "dotnet",
-    args = "build --configuration Release",
+    args = $"build -c {configuration}",
     workingDirectory = wchartDir
 )

src/global.json

@@ -0,0 +1,5 @@
+{
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}