Commit 998b4604 authored by Jesse McGrew's avatar Jesse McGrew
Browse files

Updated NuGet packages and fixed new RS1024 warnings.

parent eb12a29d9599
......@@ -6,15 +6,15 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.9.1044">
<PackageReference Include="JunitXml.TestLogger" Version="3.0.98" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.1600">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
</ItemGroup>
<ItemGroup>
......
......@@ -58,7 +58,7 @@ namespace ZilfAnalyzers
if (zilObjectType == null)
return;
if (!GetTypeAndBases(type).Contains(zilObjectType))
if (!GetTypeAndBases(type).Contains(zilObjectType, SymbolEqualityComparer.Default))
return;
foreach (var (ifThis, thenThat) in MethodsToOverrideTogether)
......@@ -89,7 +89,7 @@ namespace ZilfAnalyzers
{
foreach (var bm in GetMethodAndOverridden(dm))
{
if (GetTypeAndBases(baseType).Contains(bm.ContainingType))
if (GetTypeAndBases(baseType).Contains(bm.ContainingType, SymbolEqualityComparer.Default))
{
overridingMethod = dm;
overriddenMethod = bm;
......@@ -150,7 +150,7 @@ namespace ZilfAnalyzers
if (IsEqualsBasedAssertion(method))
{
// applies if any argument inherits from ZilObject
if (!argTypes.Any(argType => GetTypeAndBases(argType).Contains(zilObjectType)))
if (!argTypes.Any(argType => GetTypeAndBases(argType).Contains(zilObjectType, SymbolEqualityComparer.Default)))
return false;
}
else if (IsEqualsBasedCollectionComparison(method))
......@@ -251,7 +251,7 @@ namespace ZilfAnalyzers
if (!DetectMemberAccess(context.Node, out var objType, out var memberNode, context.SemanticModel))
return;
if (objType == null || !GetTypeAndBases(objType).Contains(zilObjectType))
if (objType == null || !GetTypeAndBases(objType).Contains(zilObjectType, SymbolEqualityComparer.Default))
return;
var zilObjectEquals = GetTypeAndBases(zilObjectType)
......@@ -261,7 +261,7 @@ namespace ZilfAnalyzers
var memberSymInfo = context.SemanticModel.GetSymbolInfo(memberNode);
if (memberSymInfo.Symbol is IMethodSymbol method &&
GetMethodAndOverridden(method).Contains(zilObjectEquals))
GetMethodAndOverridden(method).Contains(zilObjectEquals, SymbolEqualityComparer.Default))
{
var diagnostic = Diagnostic.Create(
Rule_ComparingZilObjectsWithEquals,
......
......@@ -24,7 +24,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0" PrivateAssets="all" />
<!--<PackageReference Update="NETStandard.Library" PrivateAssets="all" />-->
</ItemGroup>
......
......@@ -6,11 +6,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.7" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
<PackageReference Include="Tewr.BlazorWorker.BackgroundService" Version="2.1.0" />
<PackageReference Include="Tewr.BlazorWorker.BackgroundService" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
......
......@@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuildTasks" Version="1.5.0.235" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="ReadLine" Version="2.0.1" />
</ItemGroup>
<ItemGroup>
......
......@@ -11,10 +11,10 @@
<NeutralLanguage>English</NeutralLanguage>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="JunitXml.TestLogger" Version="3.0.98" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
</ItemGroup>
<ItemGroup>
<None Include="$(SolutionDir)\Zilf.licenseheader">
......
......@@ -6,10 +6,10 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="JunitXml.TestLogger" Version="3.0.98" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
</ItemGroup>
<ItemGroup>
......
......@@ -7,9 +7,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
......
......@@ -5,11 +5,11 @@
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="JunitXml.TestLogger" Version="3.0.98" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)src\Zilf.Emit\Zilf.Emit.csproj" />
......
......@@ -7,10 +7,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="difflib" Version="2017.7.26.1241" />
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="JunitXml.TestLogger" Version="3.0.98" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
<PackageReference Include="ZLR.VM" Version="0.9.0-*" />
</ItemGroup>
<ItemGroup>
......
......@@ -6,10 +6,10 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="JunitXml.TestLogger" Version="3.0.98" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)src\Zilf\Zilf.csproj" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment