Simplify assembly signing (#265)

sungam3r · web-flow · commit 23251c0df73b · 2022-08-11T00:14:12.000+03:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -23,14 +23,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <PackageReadmeFile Condition="'$(IsPackable)' == 'true'">README.md</PackageReadmeFile>
-
-    <!--
-      Strong name signing of netstandard assemblies for better cross-runtime compatibility
-
-        Ref: https://docs.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/6.0/strong-name-signing-exceptions#recommended-action
-     -->
     <SignAssembly>true</SignAssembly>
-    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)_SignAssembly.targets</CustomBeforeMicrosoftCommonTargets>
+    <AssemblyOriginatorKeyFile>..\graphql.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(IsPackable)' == 'true'">
diff --git a/src/GraphQLParser.sln b/src/GraphQLParser.sln
@@ -18,9 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		graphql.snk = graphql.snk
 		..\LICENSE.md = ..\LICENSE.md
 		..\assets\logo.64x64.png = ..\assets\logo.64x64.png
-		public.snk = public.snk
 		..\README.md = ..\README.md
-		_SignAssembly.targets = _SignAssembly.targets
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQLParser.ApiTests", "GraphQLParser.ApiTests\GraphQLParser.ApiTests.csproj", "{6F01D881-DEA2-4259-977B-FF56DD366592}"
diff --git a/src/GraphQLParser/AST/GraphQLName.cs b/src/GraphQLParser/AST/GraphQLName.cs
@@ -36,12 +36,9 @@ public string StringValue
     {
         get
         {
-            if (_string == null)
-            {
-                _string = Value.Length == 0
+            _string ??= Value.Length == 0
                     ? string.Empty
                     : (string)Value;
-            }
 
             return _string;
         }
diff --git a/src/GraphQLParser/GraphQLParser.csproj b/src/GraphQLParser/GraphQLParser.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Library containing lexer and parser for GraphQL syntax</Description>
diff --git a/src/_SignAssembly.targets b/src/_SignAssembly.targets
diff --git a/src/public.snk b/src/public.snk

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,9 @@ public string StringValue`
`36`	`36`	`{`
`37`	`37`	`get`
`38`	`38`	`{`
`39`		`- if (_string == null)`
`40`		`- {`
`41`		`- _string = Value.Length == 0`
	`39`	`+ _string ??= Value.Length == 0`
`42`	`40`	`? string.Empty`
`43`	`41`	`: (string)Value;`
`44`		`- }`
`45`	`42`
`46`	`43`	`return _string;`
`47`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`
`3`	`3`	`<PropertyGroup>`
`4`	`4`	`<Description>Library containing lexer and parser for GraphQL syntax</Description>`