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

Merge remote-tracking branch 'origin/main' into stefan/opt_in_telem

Browse Source
This commit is contained in:
Stefan Markovic
2024-10-11 10:27:17 +02:00
parent 751c05a636 d3869942c3
commit 13854d4d29
29 changed files with 14 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/launcher/PowerLauncher/PowerLauncher.csproj
View File

@@ -59,14 +59,8 @@
<PackageReference Include="System.ServiceProcess.ServiceController" />
<PackageReference Include="UnitsNet" />
<PackageReference Include="WPF-UI" />
<!-- HACK: Microsoft.Extensions.Hosting is referenced, even if it is not used, to force dll versions to be the same as in other projects. Really only needed since OneNote uses the LazyCache and NLog dependencies, which references older assemblies. -->
<PackageReference Include="Microsoft.Extensions.Hosting" />
<!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
<PackageReference Include="System.Text.Json" />
<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>
</ItemGroup>
<ItemGroup>