Revert "Multi-platform build process (#1928)" (#1938)

This reverts commit d358e1fc7a.

.github/workflows/master.yml

@@ -30,47 +30,39 @@ jobs:
               else { $_ -replace $m.Value, ("<Version>{0}.{1}.{2}-pre${{ github.run_number }}</Version>" -f $m.Groups[1].Value,$m.Groups[2].Value,([convert]::ToInt32($m.Groups[3].Value)+1)); }
           } | Set-Content Directory.Build.props
 
-      - name: Restore application packages
-        run: dotnet restore LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj 
+      - name: NuGet restore
+        run: dotnet restore LibreHardwareMonitor.sln
 
-      - name: Build application
-        run: dotnet build LibreHardwareMonitor\LibreHardwareMonitor.csproj -c Release -p:Platform=x64
+      - name: Build
+        run: dotnet build LibreHardwareMonitor.sln --configuration Release --no-restore
 
-      - name: Publish application
+      - name: Publish net472
         uses: actions/upload-artifact@v4
         with:
-          name: LibreHardwareMonitor
+          name: LibreHardwareMonitor-net472
           path: |
             bin/Release/net472
 
-      - name: Restore library packages
-        run: dotnet restore LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj 
-
-      - name: Build x64 libraries
-        run: dotnet build LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj -c Release --no-restore -p:Platform=x64
-
-      - name: Publish x64 libraries
+      - name: Publish netstandard20
         uses: actions/upload-artifact@v4
         with:
-          name: LibreHardwareMonitorLib (x64)
+          name: LibreHardwareMonitorLib-netstandard20
           path: |
-            bin/Release/x64
+            bin/Release/netstandard2.0
 
-      - name: Build x86 libraries
-        run: dotnet build LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj -c Release --no-restore -p:Platform=x86
-
-      - name: Publish x86 libraries
+      - name: Publish net80
         uses: actions/upload-artifact@v4
         with:
-          name: LibreHardwareMonitorLib (x86)
+          name: LibreHardwareMonitorLib-net80
           path: |
-            bin/Release/x86
+            bin/Release/net8.0
 
-      - name: Build reference libraries
-        run: dotnet build LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj -c Release --no-restore -p:BuildOnlyRefs=true
-
-      - name: Pack main nupkg
-        run: dotnet pack LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj -c Release -p:PackMainNuget=true --no-build --output bin\Release
+      - name: Publish net90
+        uses: actions/upload-artifact@v4
+        with:
+          name: LibreHardwareMonitorLib-net90
+          path: |
+            bin/Release/net9.0
 
       - name: Publish nupkg
         uses: actions/upload-artifact@v4

.github/workflows/pull requests.yml

@@ -30,47 +30,39 @@ jobs:
               else { $_ -replace $m.Value, ("<Version>{0}.{1}.{2}-ci${{ github.run_number }}</Version>" -f $m.Groups[1].Value,$m.Groups[2].Value,([convert]::ToInt32($m.Groups[3].Value)+1)); }
           } | Set-Content Directory.Build.props
 
-      - name: Restore application packages
-        run: dotnet restore LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj 
+      - name: Restore packages
+        run: dotnet restore LibreHardwareMonitor.sln
 
-      - name: Build application
-        run: dotnet build LibreHardwareMonitor\LibreHardwareMonitor.csproj -c Release -p:Platform=x64
+      - name: Build
+        run: dotnet build LibreHardwareMonitor.sln --configuration Release --no-restore
 
-      - name: Publish application
+      - name: Publish net472
         uses: actions/upload-artifact@v4
         with:
-          name: LibreHardwareMonitor
+          name: LibreHardwareMonitor-net472
           path: |
             bin/Release/net472
 
-      - name: Restore library packages
-        run: dotnet restore LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj 
-
-      - name: Build x64 libraries
-        run: dotnet build LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj -c Release --no-restore -p:Platform=x64
-
-      - name: Publish x64 libraries
+      - name: Publish netstandard20
         uses: actions/upload-artifact@v4
         with:
-          name: LibreHardwareMonitorLib (x64)
+          name: LibreHardwareMonitorLib-netstandard20
           path: |
-            bin/Release/x64
+            bin/Release/netstandard2.0
 
-      - name: Build x86 libraries
-        run: dotnet build LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj -c Release --no-restore -p:Platform=x86
-
-      - name: Publish x86 libraries
+      - name: Publish net80
         uses: actions/upload-artifact@v4
         with:
-          name: LibreHardwareMonitorLib (x86)
+          name: LibreHardwareMonitorLib-net80
           path: |
-            bin/Release/x86
+            bin/Release/net8.0
 
-      - name: Build reference libraries
-        run: dotnet build LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj -c Release --no-restore -p:BuildOnlyRefs=true
-
-      - name: Pack main nupkg
-        run: dotnet pack LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj -c Release -p:PackMainNuget=true --no-build --output bin\Release
+      - name: Publish net90
+        uses: actions/upload-artifact@v4
+        with:
+          name: LibreHardwareMonitorLib-net90
+          path: |
+            bin/Release/net9.0
 
       - name: Publish nupkg
         uses: actions/upload-artifact@v4

LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj

@@ -19,19 +19,12 @@
     <PackageIcon>packageicon.png</PackageIcon>
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
     <Platforms>x64;x86</Platforms>
-    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
-    <NoWarn>$(NoWarn);CA1416</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(BuildOnlyRefs)'=='true'">
-    <Platform>AnyCPU</Platform>
-    <ProduceOnlyReferenceAssembly>true</ProduceOnlyReferenceAssembly>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <OutputPath>..\bin\Debug\$(Platform)\</OutputPath>
+    <OutputPath>..\bin\Debug\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <OutputPath>..\bin\Release\$(Platform)\</OutputPath>
+    <OutputPath>..\bin\Release\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -70,5 +63,4 @@
       <Pack>True</Pack>
     </None>
   </ItemGroup>
-  <Import Project="main.nuget.target" Condition="'$(PackMainNuget)' == 'true'" />
 </Project>

LibreHardwareMonitorLib/main.nuget.target

@@ -1,27 +0,0 @@
-<!-- For packing the multi-platform nuget after building x64, x86 and reference libs -->
-<Project>
-  <PropertyGroup>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <NoWarn>$(NoWarn);NU5131</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="..\bin\$(Configuration)\x64\**\LibreHardwareMonitorLib.dll" Pack="true">
-      <PackagePath>runtimes\win-x64\lib\</PackagePath>
-    </None>
-    <None Include="..\bin\$(Configuration)\x64\**\LibreHardwareMonitorLib.xml" Pack="true">
-      <PackagePath>runtimes\win-x64\lib\</PackagePath>
-    </None>
-    <None Include="..\bin\$(Configuration)\x86\**\LibreHardwareMonitorLib.dll" Pack="true">
-      <PackagePath>runtimes\win-x86\lib\</PackagePath>
-    </None>
-    <None Include="..\bin\$(Configuration)\x86\**\LibreHardwareMonitorLib.xml" Pack="true">
-      <PackagePath>runtimes\win-x86\lib\</PackagePath>
-    </None>
-    <None Include="..\bin\$(Configuration)\AnyCPU\**\LibreHardwareMonitorLib.dll" Pack="true">
-      <PackagePath>ref\</PackagePath>
-    </None>
-    <None Include="..\bin\$(Configuration)\AnyCPU\**\LibreHardwareMonitorLib.xml" Pack="true">
-      <PackagePath>ref\</PackagePath>
-    </None>
-  </ItemGroup>
-</Project>