Merge pull request #3899 from ArchonMegalon/master

Bugfixes for SINners
chummer5a · Sep 30, 2019 · ebd1e1a · ebd1e1a
2 parents 3a99145 + ecc96b6
commit ebd1e1a
Show file tree

Hide file tree

Showing 12 changed files with 321 additions and 333 deletions.
diff --git a/Chummer/frmCareer.Designer.cs b/Chummer/frmCareer.Designer.cs
diff --git a/Chummer/frmOptions.Designer.cs b/Chummer/frmOptions.Designer.cs
diff --git a/ChummerHub.Client/Backend/Utils.cs b/ChummerHub.Client/Backend/Utils.cs
@@ -626,10 +626,12 @@ public static async Task<object> HandleError(HttpOperationResponse response,
             }
             catch (Exception e)
             {
-                rb = new ResultBase();
-                rb.ErrorText = content;
-                rb.MyException = e;
-                rb.CallSuccess = false;
+                rb = new ResultBase
+                {
+                    ErrorText = content,
+                    MyException = e,
+                    CallSuccess = false
+                };
                 ResponseBody = rb;
                 Log.Warn(e, "Error parsing response from SINners WebService as response.Response.Content: " + content);
             }
@@ -644,10 +646,12 @@ public static async Task<object> HandleError(HttpOperationResponse response,
             }
             catch (Exception e)
             {
-                rb = new ResultBase();
-                rb.ErrorText = content;
-                rb.MyException = e;
-                rb.CallSuccess = false;
+                rb = new ResultBase
+                {
+                    ErrorText = content,
+                    MyException = e,
+                    CallSuccess = false
+                };
                 ResponseBody = rb;
                 Log.Warn(e, "Error parsing response from SINners WebService as ResponseBody: " + content);
             }
@@ -675,9 +679,6 @@ public static async Task<object> HandleError(HttpOperationResponse response,
                         });
                     });
                     show.Start();
-
-
-
                 });
             }
             return ResponseBody;

diff --git a/ChummerHub.Client/ChummerHub.Client.csproj b/ChummerHub.Client/ChummerHub.Client.csproj
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.4\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.4\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" />
+  <Import Project="..\packages\Microsoft.NetFramework.Analyzers.2.9.4\build\Microsoft.NetFramework.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.4\build\Microsoft.NetFramework.Analyzers.props')" />
+  <Import Project="..\packages\Microsoft.NetCore.Analyzers.2.9.4\build\Microsoft.NetCore.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.4\build\Microsoft.NetCore.Analyzers.props')" />
+  <Import Project="..\packages\Microsoft.CodeQuality.Analyzers.2.9.4\build\Microsoft.CodeQuality.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.4\build\Microsoft.CodeQuality.Analyzers.props')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.4\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.4\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +16,8 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -363,6 +370,17 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.VersionCheckAnalyzer.resources.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.4\analyzers\dotnet\Microsoft.CodeAnalysis.VersionCheckAnalyzer.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.4\analyzers\dotnet\cs\Humanizer.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.4\analyzers\dotnet\cs\Microsoft.CodeQuality.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.4\analyzers\dotnet\cs\Microsoft.CodeQuality.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.9.4\analyzers\dotnet\cs\Microsoft.NetCore.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.9.4\analyzers\dotnet\cs\Microsoft.NetCore.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.4\analyzers\dotnet\cs\Microsoft.NetFramework.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.4\analyzers\dotnet\cs\Microsoft.NetFramework.CSharp.Analyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>echo Statement 1: copy "$(TargetDir)$(TargetName).*" "$(TargetDir)Plugins\SINners\" /Y
@@ -398,4 +416,14 @@
         mkdir "$(SolutionDir)Chummer\bin\$(ConfigurationName)\Plugins\SINners\"
         Exit 0</PreBuildEvent>
   </PropertyGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.4\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.4\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.4\build\Microsoft.CodeQuality.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeQuality.Analyzers.2.9.4\build\Microsoft.CodeQuality.Analyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.4\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.2.9.4\build\Microsoft.NetCore.Analyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.4\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.9.4\build\Microsoft.NetFramework.Analyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.4\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.4\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
+  </Target>
 </Project>
diff --git a/ChummerHub.Client/Model/CharacterExtended.cs b/ChummerHub.Client/Model/CharacterExtended.cs
@@ -531,7 +531,7 @@ public async Task<string> PrepareModel()
             }
             foreach(var visnow in ucSINnersOptions.SINnerVisibility.UserRights)
             {
-                if (!MySINnerFile.SiNnerMetaData.Visibility.UserRights.Any(a => a.EMail?.ToLowerInvariant() == visnow.EMail?.ToLowerInvariant()))
+                if (!MySINnerFile.SiNnerMetaData.Visibility.UserRights.Any(a => a.EMail?.ToLowerInvariant() == visnow.EMail.ToLowerInvariant()))
                 {
                     MySINnerFile.SiNnerMetaData.Visibility.UserRights.Add(visnow);
                 }

diff --git a/ChummerHub.Client/Model/SINnerVisibility.cs b/ChummerHub.Client/Model/SINnerVisibility.cs
@@ -55,7 +55,7 @@ public void AddVisibilityForEmail(string email)
                 CanEdit = true,
                 Id = Guid.NewGuid()
             };
-            var found = from a in this.UserRightsObservable where email != null && a!= null && a.EMail != null &&  a.EMail.ToLowerInvariant() == email.ToLowerInvariant() select a;
+            var found = from a in this.UserRightsObservable where email != null && a!= null && a.EMail != null &&  a.EMail?.ToLowerInvariant() == email.ToLowerInvariant() select a;
             if (found.Any())
                 ur = found.FirstOrDefault();
             if (!this.UserRightsObservable.Contains(ur))

diff --git a/ChummerHub.Client/UI/ucSINnerGroupCreate.Designer.cs b/ChummerHub.Client/UI/ucSINnerGroupCreate.Designer.cs