From 8c4619e956bff8903c1b49f033841ecdd8ad7345 Mon Sep 17 00:00:00 2001 From: Martin Kuschnik Date: Thu, 7 Dec 2023 21:53:52 +0100 Subject: [PATCH] disabled WholeProgramOptimization for static library build --- .github/workflows/dotnet.yml | 10 ++++++---- WmiLight.Native/WmiLight.Native.rc | 8 ++++---- WmiLight/WmiLight.csproj | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 369fb34..61136cc 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -51,13 +51,13 @@ jobs: # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:ConfigurationType=DynamicLibrary /p:Platform=x86 WmiLight.Native\WmiLight.Native.vcxproj - - name: Build Native static Lib (x64) + - name: Build Native static Lib (x64, NoOp) # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference - run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:ConfigurationType=StaticLibrary /p:Platform=x64 WmiLight.Native\WmiLight.Native.vcxproj + run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:ConfigurationType=StaticLibrary /p:WholeProgramOptimization=false /p:Platform=x64 WmiLight.Native\WmiLight.Native.vcxproj - - name: Build Native static Lib (x86) + - name: Build Native static Lib (x86, NoOp) # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference - run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:ConfigurationType=StaticLibrary /p:Platform=x86 WmiLight.Native\WmiLight.Native.vcxproj + run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:ConfigurationType=StaticLibrary /p:WholeProgramOptimization=false /p:Platform=x86 WmiLight.Native\WmiLight.Native.vcxproj - name: Pack with dotnet run: dotnet pack WmiLight\WmiLight.csproj --configuration ${{env.BUILD_CONFIGURATION}} --output nuget-packages --no-build @@ -86,7 +86,9 @@ jobs: Copy-Item 'WmiLight.Native\bin\${{env.BUILD_CONFIGURATION}}\x86\WmiLight.Native.dll' 'nuget-packages\unpacked\runtimes\win-x86\native\' Copy-Item 'WmiLight.Native\bin\${{env.BUILD_CONFIGURATION}}\x64\WmiLight.Native.lib' 'nuget-packages\unpacked\lib\native\win-x64\' + Copy-Item 'WmiLight.Native\bin\${{env.BUILD_CONFIGURATION}}\x64\WmiLight.Native.pdb' 'nuget-packages\unpacked\lib\native\win-x64\' Copy-Item 'WmiLight.Native\bin\${{env.BUILD_CONFIGURATION}}\x86\WmiLight.Native.lib' 'nuget-packages\unpacked\lib\native\win-x86\' + Copy-Item 'WmiLight.Native\bin\${{env.BUILD_CONFIGURATION}}\x86\WmiLight.Native.pdb' 'nuget-packages\unpacked\lib\native\win-x86\' Compress-Archive 'nuget-packages\unpacked\*' $zip_file diff --git a/WmiLight.Native/WmiLight.Native.rc b/WmiLight.Native/WmiLight.Native.rc index ed57a3b..eead7dc 100644 --- a/WmiLight.Native/WmiLight.Native.rc +++ b/WmiLight.Native/WmiLight.Native.rc @@ -43,8 +43,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 5,0,1,0 - PRODUCTVERSION 5,0,1,0 + FILEVERSION 5,0,2,0 + PRODUCTVERSION 5,0,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -61,12 +61,12 @@ BEGIN BEGIN VALUE "CompanyName", "Martin Kuschnik" VALUE "FileDescription", "The native part of the WmiLight lib." - VALUE "FileVersion", "5.0.1.0" + VALUE "FileVersion", "5.0.2.0" VALUE "InternalName", "WmiLight.Native" VALUE "LegalCopyright", "Copyright 2023 Martin Kuschnik" VALUE "OriginalFilename", "WmiLight.Native.dll" VALUE "ProductName", "WmiLight" - VALUE "ProductVersion", "5.0.1.0" + VALUE "ProductVersion", "5.0.2.0" END END BLOCK "VarFileInfo" diff --git a/WmiLight/WmiLight.csproj b/WmiLight/WmiLight.csproj index f51e5fd..3cde705 100644 --- a/WmiLight/WmiLight.csproj +++ b/WmiLight/WmiLight.csproj @@ -23,7 +23,7 @@ - 5.0.1-pre2 + 5.0.2-pre WmiLight Martin Kuschnik Martin Kuschnik