LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove compiler package and update sourcelink (#2498)

Browse Source
This commit is contained in:
James Newton-King
2021-03-18 08:55:07 +13:00
committed by GitHub
parent 8ef662189d
commit ae9fe44e13
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Directory.Build.props
+2 -3
View File
@@ -3,10 +3,9 @@
<AutofacPackageVersion>4.6.2</AutofacPackageVersion> <AutofacPackageVersion>4.6.2</AutofacPackageVersion>
<BenchmarkDotNetPackageVersion>0.10.10</BenchmarkDotNetPackageVersion> <BenchmarkDotNetPackageVersion>0.10.10</BenchmarkDotNetPackageVersion>
<FSharpCorePackageVersion>4.2.3</FSharpCorePackageVersion> <FSharpCorePackageVersion>4.2.3</FSharpCorePackageVersion>
<MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>2.9.2</MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion> <MicrosoftCodeAnalysisNetAnalyzersPackageVersion>5.0.3</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
<MicrosoftCSharpPackageVersion>4.3.0</MicrosoftCSharpPackageVersion> <MicrosoftCSharpPackageVersion>4.3.0</MicrosoftCSharpPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkGitHubPackageVersion> <MicrosoftSourceLinkGitHubPackageVersion>1.0.0</MicrosoftSourceLinkGitHubPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>3.8.0</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNETTestSdkPackageVersion>16.3.0</MicrosoftNETTestSdkPackageVersion> <MicrosoftNETTestSdkPackageVersion>16.3.0</MicrosoftNETTestSdkPackageVersion>
<MoqPackageVersion>4.8.1</MoqPackageVersion> <MoqPackageVersion>4.8.1</MoqPackageVersion>
<NunitPackageVersion>3.11.0</NunitPackageVersion> <NunitPackageVersion>3.11.0</NunitPackageVersion>
Src/Newtonsoft.Json/JsonSerializer.cs
+1 -3
View File
@@ -867,9 +867,7 @@ namespace Newtonsoft.Json
[DebuggerStepThrough] [DebuggerStepThrough]
public T? Deserialize<T>(JsonReader reader) public T? Deserialize<T>(JsonReader reader)
{ {
#pragma warning disable CS8601 // Possible null reference assignment. return (T?)Deserialize(reader, typeof(T));
return (T)Deserialize(reader, typeof(T));
#pragma warning restore CS8601 // Possible null reference assignment.
} }
/// <summary> /// <summary>
Src/Newtonsoft.Json/Newtonsoft.Json.csproj
+1 -3
View File
@@ -39,10 +39,8 @@
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/> <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="$(MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion)" PrivateAssets="All" /> <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersPackageVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" /> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" />
<!-- Compiler to support nullable in non-preview VS2019 -->
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net45'"> <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
<AssemblyTitle>Json.NET</AssemblyTitle> <AssemblyTitle>Json.NET</AssemblyTitle>
Src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs
+4
View File
@@ -492,8 +492,12 @@ namespace Newtonsoft.Json.Utilities
#endif #endif
else else
{ {
// Consider changing this code to call GenericDictionary.Remove when value is null.
//
#pragma warning disable CS8601 // Possible null reference assignment. #pragma warning disable CS8601 // Possible null reference assignment.
#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type.
GenericDictionary[(TKey)key] = (TValue)value; GenericDictionary[(TKey)key] = (TValue)value;
#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type.
#pragma warning restore CS8601 // Possible null reference assignment. #pragma warning restore CS8601 // Possible null reference assignment.
} }
} }