Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 04:07:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Deps]Fix .NET 8.0.1 dependency version conflicts (#30892)

Browse Source 
* Fix System.Drawing.Common version conflicts

* Fix System.Data.OleDb dependencies

* Fix System.Diagnostics.EventLog dll version incompatibility

* Fix System.CodeDom dll version incompatibility

* Update NOTICE.md
This commit is contained in:
Jaime Bernardo
2024-01-11 16:11:32 +00:00
committed by GitHub
parent 8bdbeb41d4
commit 50b24d0779
32 changed files with 330 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj
View File

@@ -15,6 +15,13 @@
<OutputPath>..\..\..\..\$(Platform)\$(Configuration)\WoxInfrastructure</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='x64'">
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='ARM64'">
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
<DebugSymbols>true</DebugSymbols>
<DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -43,7 +50,17 @@
<ItemGroup>
<PackageReference Include="NLog.Schema" />
<PackageReference Include="hyjiacan.pinyin4net" />
<PackageReference Include="System.Drawing.Common" />
<PackageReference Include="System.Diagnostics.EventLog">
<!-- This package is a dependency of Microsoft.Extensions.Logging.EventLog, but we need to set it here so we can exclude the assets, so it doesn't conflict with the 8.0.1 dll coming from .NET SDK. -->
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
</PackageReference>
<PackageReference Include="System.CodeDom">
<!-- This package is a dependency of System.Management, but we need to set it here so we can exclude the assets, so it doesn't conflict with the 8.0.1 dll coming from .NET SDK. -->
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
</PackageReference>
<PackageReference Include="System.Drawing.Common">
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
</PackageReference>
<PackageReference Include="System.IO.Abstractions" />
</ItemGroup>
</Project>