Cleanup csproj files (#1865)

lahma · web-flow · commit 5ff5589e79c9 · 2024-05-19T09:23:32.000+03:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -24,6 +24,9 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <UseArtifactsOutput>true</UseArtifactsOutput>
 
+    <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
+
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Jint.Benchmark/Jint.Benchmark.csproj b/Jint.Benchmark/Jint.Benchmark.csproj
@@ -17,6 +17,7 @@
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <NoWarn>$(NoWarn);CS8002</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <None Include=".\Scripts\*.*" CopyToOutputDirectory="PreserveNewest" />
diff --git a/Jint.Tests.CommonScripts/Jint.Tests.CommonScripts.csproj b/Jint.Tests.CommonScripts/Jint.Tests.CommonScripts.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>
diff --git a/Jint.Tests.PublicInterface/Jint.Tests.PublicInterface.csproj b/Jint.Tests.PublicInterface/Jint.Tests.PublicInterface.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0</TargetFrameworks>
     <AssemblyOriginatorKeyFile>..\Jint\Jint.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <IsPackable>false</IsPackable>
@@ -17,10 +16,6 @@
     <ProjectReference Include="..\Jint\Jint.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" Condition=" '$(TargetFramework)' == 'net462' " />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Acornima.Extras" />
     <PackageReference Include="Flurl.Http.Signed" />
diff --git a/Jint.Tests.Test262/Jint.Tests.Test262.csproj b/Jint.Tests.Test262/Jint.Tests.Test262.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <!--<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>-->
     <AssemblyOriginatorKeyFile>..\Jint\Jint.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <IsPackable>false</IsPackable>
diff --git a/Jint.Tests/Jint.Tests.csproj b/Jint.Tests/Jint.Tests.csproj
@@ -19,10 +19,6 @@
     <ProjectReference Include="..\Jint\Jint.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" Condition=" '$(TargetFramework)' == 'net462' " />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Acornima.Extras" />
     <PackageReference Include="FluentAssertions" />
diff --git a/Jint.Tests/Parser/JavascriptParserTests.cs b/Jint.Tests/Parser/JavascriptParserTests.cs
@@ -1,6 +1,4 @@
-﻿using Jint.Runtime;
-
-namespace Jint.Tests.Parsing;
+﻿namespace Jint.Tests.Parsing;
 
 public class JavascriptParserTests
 {
diff --git a/Jint.Tests/Runtime/InteropTests.MemberAccess.cs b/Jint.Tests/Runtime/InteropTests.MemberAccess.cs
@@ -183,7 +183,9 @@ public void CanAccessBaseClassStaticFields()
 
         private class BaseClassWithStatics
         {
+#pragma warning disable CS0414 // Field is assigned but its value is never used
             public static int a = 42;
+#pragma warning restore CS0414 // Field is assigned but its value is never used
         }
 
         private class InheritingFromClassWithStatics : BaseClassWithStatics
diff --git a/Jint.Tests/Runtime/InteropTests.cs b/Jint.Tests/Runtime/InteropTests.cs
@@ -3,7 +3,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Jint.Native;
-using Jint.Native.Symbol;
 using Jint.Runtime;
 using Jint.Runtime.Interop;
 using Jint.Tests.Runtime.Converters;
diff --git a/Jint/AstExtensions.cs b/Jint/AstExtensions.cs
@@ -13,7 +13,9 @@ namespace Jint
 {
     public static class AstExtensions
     {
+#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value
         internal static readonly SourceLocation DefaultLocation;
+#pragma warning restore CS0649 // Field is never assigned to, and will always have its default value
 
         public static JsValue GetKey<T>(this T property, Engine engine) where T : IProperty => GetKey(property.Key, engine, property.Computed);
 
diff --git a/Jint/Jint.csproj b/Jint/Jint.csproj
@@ -7,8 +7,6 @@
     <SignAssembly>true</SignAssembly>
     <IsPackable>true</IsPackable>
 
-    <LangVersion>latest</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
diff --git a/Jint/Native/Generator/GeneratorInstance.cs b/Jint/Native/Generator/GeneratorInstance.cs
@@ -13,7 +13,9 @@ internal sealed class GeneratorInstance : ObjectInstance
 {
     internal GeneratorState _generatorState;
     private ExecutionContext _generatorContext;
+#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value
     private readonly JsValue? _generatorBrand;
+#pragma warning restore CS0649 // Field is never assigned to, and will always have its default value
     private JintStatementList _generatorBody = null!;
 
     public JsValue? _nextValue;
diff --git a/Jint/Runtime/Interpreter/Expressions/JintLiteralExpression.cs b/Jint/Runtime/Interpreter/Expressions/JintLiteralExpression.cs
@@ -1,4 +1,3 @@
-using System.Numerics;
 using System.Text.RegularExpressions;
 using Jint.Native;
 
diff --git a/Jint/Runtime/Interpreter/Expressions/JintUpdateExpression.cs b/Jint/Runtime/Interpreter/Expressions/JintUpdateExpression.cs
@@ -1,6 +1,5 @@
 using Jint.Native;
 using Jint.Runtime.Environments;
-using Environment = Jint.Runtime.Environments.Environment;
 
 namespace Jint.Runtime.Interpreter.Expressions
 {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using Jint.Runtime;`
`2`		`-`
`3`		`-namespace Jint.Tests.Parsing;`
	`1`	`+namespace Jint.Tests.Parsing;`
`4`	`2`
`5`	`3`	`public class JavascriptParserTests`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,9 @@ public void CanAccessBaseClassStaticFields()`
`183`	`183`
`184`	`184`	`private class BaseClassWithStatics`
`185`	`185`	`{`
	`186`	`+#pragma warning disable CS0414 // Field is assigned but its value is never used`
`186`	`187`	`public static int a = 42;`
	`188`	`+#pragma warning restore CS0414 // Field is assigned but its value is never used`
`187`	`189`	`}`
`188`	`190`
`189`	`191`	`private class InheritingFromClassWithStatics : BaseClassWithStatics`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ namespace Jint`
`13`	`13`	`{`
`14`	`14`	`public static class AstExtensions`
`15`	`15`	`{`
	`16`	`+#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value`
`16`	`17`	`internal static readonly SourceLocation DefaultLocation;`
	`18`	`+#pragma warning restore CS0649 // Field is never assigned to, and will always have its default value`
`17`	`19`
`18`	`20`	`public static JsValue GetKey<T>(this T property, Engine engine) where T : IProperty => GetKey(property.Key, engine, property.Computed);`
`19`	`21`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ internal sealed class GeneratorInstance : ObjectInstance`
`13`	`13`	`{`
`14`	`14`	`internal GeneratorState _generatorState;`
`15`	`15`	`private ExecutionContext _generatorContext;`
	`16`	`+#pragma warning disable CS0649 // Field is never assigned to, and will always have its default value`
`16`	`17`	`private readonly JsValue? _generatorBrand;`
	`18`	`+#pragma warning restore CS0649 // Field is never assigned to, and will always have its default value`
`17`	`19`	`private JintStatementList _generatorBody = null!;`
`18`	`20`
`19`	`21`	`public JsValue? _nextValue;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Numerics;`
`2`	`1`	`using System.Text.RegularExpressions;`
`3`	`2`	`using Jint.Native;`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using Jint.Native;`
`2`	`2`	`using Jint.Runtime.Environments;`
`3`		`-using Environment = Jint.Runtime.Environments.Environment;`
`4`	`3`
`5`	`4`	`namespace Jint.Runtime.Interpreter.Expressions`
`6`	`5`	`{`