upgrading all .NET assemblies, #5303 took care of ones where they needed consolidating (#5304)

Co-authored-by: Clint Rutkas <crutkas@microsoft.com>
This commit is contained in:
Clint Rutkas
2020-07-30 12:16:32 -07:00
committed by GitHub
parent 5b02ee5169
commit ff93b38d23
12 changed files with 32 additions and 20 deletions

View File

@@ -89,7 +89,7 @@
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NLog" Version="4.7.0" />
<PackageReference Include="NLog" Version="4.7.2" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
</ItemGroup>

View File

@@ -88,7 +88,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fody" Version="6.1.1">
<PackageReference Include="Fody" Version="6.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@@ -105,13 +105,13 @@
</PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NuGet.CommandLine" Version="5.5.1">
<PackageReference Include="NuGet.CommandLine" Version="5.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody" Version="3.2.8" />
<PackageReference Include="System.Data.SQLite" Version="1.0.112.2" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.112.2" />
<PackageReference Include="System.Data.SQLite" Version="1.0.113.1" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.1" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
<PackageReference Include="System.Data.OleDb" Version="4.7.1" />

View File

@@ -52,7 +52,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fody" Version="6.1.1">
<PackageReference Include="Fody" Version="6.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

View File

@@ -49,8 +49,8 @@
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.2" />
<PackageReference Include="NLog.Schema" Version="4.7.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.4" />
<PackageReference Include="NLog.Schema" Version="4.7.2" />
<PackageReference Include="Pinyin4DotNet" Version="2016.4.23.4">
<NoWarn>NU1701</NoWarn>
</PackageReference>

View File

@@ -52,13 +52,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fody" Version="6.1.1">
<PackageReference Include="Fody" Version="6.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<PackageReference Include="MahApps.Metro" Version="2.1.0" />
<PackageReference Include="ControlzEx" Version="4.3.0" />
<PackageReference Include="MahApps.Metro" Version="2.1.1" />
<PackageReference Include="ControlzEx" Version="4.3.2" />
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="PropertyChanged.Fody" Version="3.2.8" />