diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index e5c7d6e..544cbfc 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -30,47 +30,39 @@ jobs: else { $_ -replace $m.Value, ("{0}.{1}.{2}-pre${{ github.run_number }}" -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 diff --git a/.github/workflows/pull requests.yml b/.github/workflows/pull requests.yml index a87635c..3f57016 100644 --- a/.github/workflows/pull requests.yml +++ b/.github/workflows/pull requests.yml @@ -30,47 +30,39 @@ jobs: else { $_ -replace $m.Value, ("{0}.{1}.{2}-ci${{ github.run_number }}" -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 diff --git a/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj b/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj index cc9428f..1fbfdec 100644 --- a/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj +++ b/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj @@ -19,19 +19,12 @@ packageicon.png true x64;x86 - win-x64;win-x86 - $(NoWarn);CA1416 - - - AnyCPU - true - false - ..\bin\Debug\$(Platform)\ + ..\bin\Debug\ - ..\bin\Release\$(Platform)\ + ..\bin\Release\ true @@ -70,5 +63,4 @@ True - diff --git a/LibreHardwareMonitorLib/main.nuget.target b/LibreHardwareMonitorLib/main.nuget.target deleted file mode 100644 index a6619ed..0000000 --- a/LibreHardwareMonitorLib/main.nuget.target +++ /dev/null @@ -1,27 +0,0 @@ - - - - false - $(NoWarn);NU5131 - - - - runtimes\win-x64\lib\ - - - runtimes\win-x64\lib\ - - - runtimes\win-x86\lib\ - - - runtimes\win-x86\lib\ - - - ref\ - - - ref\ - - - \ No newline at end of file