mirror of
https://github.com/microsoft/PowerToys.git
synced 2024-11-23 19:49:17 +08:00
[ci]Fix building for Visual Studio 17.12 (#35905)
This commit is contained in:
parent
2ea9d56129
commit
057c13a34d
@ -72,6 +72,8 @@
|
|||||||
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
|
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
|
||||||
<!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
|
<!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
|
||||||
<PackageVersion Include="System.Diagnostics.EventLog" Version="8.0.1" />
|
<PackageVersion Include="System.Diagnostics.EventLog" Version="8.0.1" />
|
||||||
|
<!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
|
||||||
|
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
|
||||||
<PackageVersion Include="System.Drawing.Common" Version="8.0.7" />
|
<PackageVersion Include="System.Drawing.Common" Version="8.0.7" />
|
||||||
<PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
|
<PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
|
||||||
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
|
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
|
||||||
|
@ -1353,6 +1353,7 @@ EXHIBIT A -Mozilla Public License.
|
|||||||
- System.Data.OleDb 8.0.1
|
- System.Data.OleDb 8.0.1
|
||||||
- System.Data.SqlClient 4.8.6
|
- System.Data.SqlClient 4.8.6
|
||||||
- System.Diagnostics.EventLog 8.0.1
|
- System.Diagnostics.EventLog 8.0.1
|
||||||
|
- System.Diagnostics.PerformanceCounter 8.0.1
|
||||||
- System.Drawing.Common 8.0.7
|
- System.Drawing.Common 8.0.7
|
||||||
- System.IO.Abstractions 21.0.29
|
- System.IO.Abstractions 21.0.29
|
||||||
- System.IO.Abstractions.TestingHelpers 21.0.29
|
- System.IO.Abstractions.TestingHelpers 21.0.29
|
||||||
|
@ -17,6 +17,15 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="System.Data.OleDb" />
|
<PackageReference Include="System.Data.OleDb" />
|
||||||
|
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||||
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="System.Diagnostics.EventLog">
|
||||||
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="System.Diagnostics.PerformanceCounter">
|
||||||
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -39,6 +39,15 @@
|
|||||||
<PackageReference Include="System.Drawing.Common">
|
<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 -->
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||||
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="System.Diagnostics.EventLog">
|
||||||
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="System.Diagnostics.PerformanceCounter">
|
||||||
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -20,6 +20,9 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="System.ServiceProcess.ServiceController" />
|
<PackageReference Include="System.ServiceProcess.ServiceController" />
|
||||||
|
<PackageReference Include="System.Diagnostics.EventLog">
|
||||||
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -34,6 +34,15 @@
|
|||||||
<PackageReference Include="System.Drawing.Common">
|
<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 -->
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||||
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="System.Diagnostics.EventLog">
|
||||||
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="System.Diagnostics.PerformanceCounter">
|
||||||
|
<ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
|
||||||
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
Loading…
Reference in New Issue
Block a user