Convert to use Central Package Management

* all versions in Directory.Packages.props * use net472 for executable projects * latest versions of libraries
adams85 · Nov 9, 2024 · 4124649 · 4124649
1 parent 9b7cee6
commit 4124649
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 57 deletions.
diff --git a/Acornima.sln b/Acornima.sln
@@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C428FBAE-48E0-4C47-B9D2-688866714516}"

diff --git a/benchmarks/Acornima.Benchmarks/Acornima.Benchmarks.csproj b/benchmarks/Acornima.Benchmarks/Acornima.Benchmarks.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
-    <PackageReference Include="Esprima" Version="3.0.5" />
+    <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="Esprima" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Components" Version="8.1.4" />
+    <PackageReference Include="Nuke.Components" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Acornima.Cli/Acornima.Cli.csproj b/samples/Acornima.Cli/Acornima.Cli.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net462</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <AssemblyName>acornima-cli</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackAsTool>true</PackAsTool>
@@ -10,9 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.*" />
-    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
-    <PackageReference Include="System.Text.Json" Version="6.0.*" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>
@@ -22,7 +21,7 @@
   <!-- Configure polyfills -->
 
   <PropertyGroup>
-    <PolySharpIncludeGeneratedTypes Condition="'$(TargetFramework)' == 'net462'">
+    <PolySharpIncludeGeneratedTypes Condition="'$(TargetFramework)' == 'net472'">
       System.Runtime.CompilerServices.IsExternalInit;
     </PolySharpIncludeGeneratedTypes>
   </PropertyGroup>

diff --git a/samples/Acornima.Cli/Helpers/ConsoleExtensions.cs b/samples/Acornima.Cli/Helpers/ConsoleExtensions.cs
@@ -14,7 +14,7 @@ public static string ReadString(this IConsole console)
         }
 
         bool isWindowsOS;
-#if NET462
+#if NET472
         isWindowsOS = true;
 #else
         isWindowsOS = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);

diff --git a/samples/JsxTranspiler/JsxTranspiler.csproj b/samples/JsxTranspiler/JsxTranspiler.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net462</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <AssemblyName>jsxt</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackAsTool>true</PackAsTool>
@@ -10,8 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.*" />
-    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Acornima.Extras/Acornima.Extras.csproj b/src/Acornima.Extras/Acornima.Extras.csproj
@@ -12,11 +12,6 @@
     <PackageTags>javascript, ecmascript, parser</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Acornima\Acornima.csproj" />
     <ProjectReference Include="..\Acornima.SourceGenerators\Acornima.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />

diff --git a/src/Acornima.SourceGenerators/Acornima.SourceGenerators.csproj b/src/Acornima.SourceGenerators/Acornima.SourceGenerators.csproj
@@ -9,9 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
-    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
   </ItemGroup>
 
   <!-- Configure polyfills -->

diff --git a/src/Acornima/Acornima.csproj b/src/Acornima/Acornima.csproj
@@ -12,16 +12,11 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="System.Memory" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Acornima/Tokenizer.cs b/src/Acornima/Tokenizer.cs
@@ -318,15 +318,27 @@ private void SkipLineComment(int startSkip, CommentKind kind, OnCommentHandler?
 
     // Called at the start of the parse and after every token. Skips
     // whitespace and comments.
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private void SkipSpace(OnCommentHandler? onComment)
+    {
+        if (_position < _endPosition && _input[_position].IsInRange('0', '}'))
+        {
+            return;
+        }
+
+        SkipSpaceUnlikely(onComment);
+    }
+
+    private void SkipSpaceUnlikely(OnCommentHandler? onComment)
     {
         // https://github.com/acornjs/acorn/blob/8.11.3/acorn/src/tokenize.js > `pp.skipSpace = function`
 
         while (_position < _endPosition)
         {
             var ch = _input[_position];
 
-            var charFlags = GetCharFlags(ch) & CharFlags.Skipped;
+            var charFlags =GetCharFlags(ch) & CharFlags.Skipped;
+
             if (charFlags == 0)
             {
                 return;
@@ -367,9 +379,9 @@ private void SkipSpace(OnCommentHandler? onComment)
                         goto default;
 
                     case '#' when _position == 0
-                        && _sourceType != SourceType.Unknown
-                        && (_options._allowHashBang ?? _options._ecmaVersion >= EcmaVersion.ES14)
-                        && 1 < _endPosition && _input[0] == '#' && _input[1] == '!':
+                                  && _sourceType != SourceType.Unknown
+                                  && (_options._allowHashBang ?? _options._ecmaVersion >= EcmaVersion.ES14)
+                                  && 1 < _endPosition && _input[0] == '#' && _input[1] == '!':
 
                         SkipLineComment(startSkip: 2, CommentKind.HashBang, onComment);
                         break;

diff --git a/test/Acornima.Tests.SourceGenerators/Acornima.Tests.SourceGenerators.csproj b/test/Acornima.Tests.SourceGenerators/Acornima.Tests.SourceGenerators.csproj
@@ -5,14 +5,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" Version="3.3.4" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" Version="4.9.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="Verify.XUnit" Version="23.7.2" />
-    <PackageReference Include="Verify.SourceGenerators" Version="2.2.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.analyzers" Version="1.11.0" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" Version="2.5.7" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Verify.XUnit" />
+    <PackageReference Include="Verify.SourceGenerators" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.analyzers" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Acornima.Tests.Test262/.config/dotnet-tools.json b/test/Acornima.Tests.Test262/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "test262harness.console": {
-      "version": "1.0.0",
+      "version": "1.0.1",
       "commands": [
         "test262"
       ]

diff --git a/test/Acornima.Tests.Test262/Acornima.Tests.Test262.csproj b/test/Acornima.Tests.Test262/Acornima.Tests.Test262.csproj
@@ -7,12 +7,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="all" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-      <PackageReference Include="NUnit" Version="4.0.1" />
-      <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-      <PackageReference Include="Spectre.Console" Version="0.48.0" />
-      <PackageReference Include="Test262Harness" Version="1.0.0" />
+      <PackageReference Include="GitHubActionsTestLogger" PrivateAssets="all" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" />
+      <PackageReference Include="NUnit" />
+      <PackageReference Include="NUnit3TestAdapter" />
+      <PackageReference Include="Spectre.Console" />
+      <PackageReference Include="Test262Harness" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/Acornima.Tests/Acornima.Tests.csproj b/test/Acornima.Tests/Acornima.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\src\Karambolo.Public.snk</AssemblyOriginatorKeyFile>
     <DefaultItemExcludes>Fixtures.RegExp\Generator\**;$(DefaultItemExcludes)</DefaultItemExcludes>
@@ -14,19 +14,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DiffEngine" Version="13.0.2" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="UnicodeInformation" Version="2.7.1" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.analyzers" Version="1.11.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
-    <PackageReference Include="xunit.runner.console" Version="2.7.0" PrivateAssets="all" />
+    <PackageReference Include="DiffEngine" />
+    <PackageReference Include="GitHubActionsTestLogger" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="UnicodeInformation" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.analyzers" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.console" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="System.ValueTuple" />
   </ItemGroup>
 
 </Project>