Prexonite, a .NET hosted scripting language with a focus on meta-programming and embedded DSLs
.net 8
authored by
Christian Klauser
and committed by
Christian Klauser
(Dec 11, 2023, 10:42 PM +0100)
c0b6a5e3
0fa29398
+18
-27
+1
-1
.config/dotnet-tools.json
+1
-1
.config/dotnet-tools.json
+2
-9
.github/workflows/PrxCi.yml
+2
-9
.github/workflows/PrxCi.yml
···
34
34
35
35
steps:
36
36
- uses: actions/checkout@v2
37
-
- name: Setup .NET 6 SDK
37
+
- name: Setup .NET SDK
38
38
uses: actions/setup-dotnet@v1.7.2
39
39
env:
40
40
NUGET_AUTH_TOKEN: '${{secrets.GITHUB_TOKEN}}'
41
41
with:
42
-
dotnet-version: '6.0.x'
43
-
source-url: 'https://nuget.pkg.github.com/chklauser/index.json'
44
-
- name: Setup .NET 5 SDK (for T4)
45
-
uses: actions/setup-dotnet@v1.7.2
46
-
env:
47
-
NUGET_AUTH_TOKEN: '${{secrets.GITHUB_TOKEN}}'
48
-
with:
49
-
dotnet-version: '5.0.x'
42
+
dotnet-version: '8.0.x'
50
43
source-url: 'https://nuget.pkg.github.com/chklauser/index.json'
51
44
- uses: actions/cache@v2
52
45
with:
+2
-4
.github/workflows/PrxRelease.yml
+2
-4
.github/workflows/PrxRelease.yml
···
40
40
echo "::set-output name=version::$ver"
41
41
shell: bash
42
42
- uses: actions/checkout@v2
43
-
- name: Setup .NET 6 SDK
43
+
- name: Setup .NET SDK
44
44
uses: actions/setup-dotnet@v2
45
45
with:
46
-
# dotnet 5.0 is still required for T4
47
46
dotnet-version: |
48
-
6.0.x
49
-
5.0.x
47
+
8.0.x
50
48
source-url: 'https://nuget.pkg.github.com/chklauser/index.json'
51
49
env:
52
50
# Use a personal access token (publishing with the GITHUB_TOKEN is somehow not possible)
+1
-1
.github/workflows/PxCocoCi.yml
+1
-1
.github/workflows/PxCocoCi.yml
+1
-1
.github/workflows/PxCocoRelease.yml
+1
-1
.github/workflows/PxCocoRelease.yml
+5
-5
Prexonite/Prexonite.csproj
+5
-5
Prexonite/Prexonite.csproj
···
96
96
<!-- PType Expression Parser Target -->
97
97
<Target Name="PTypeExpressionParser" BeforeTargets="BeforeBuild">
98
98
<Message Text="Building type expression parser." />
99
-
<PxCoco Grammar="$(PTypeExpressionGrammarDefinition)" Namespace="Prexonite.Internal" FramesDirectory="$(FramesDirectory)" DirectDebug="$(DirectDebug)" RelativePathRoot="$(ProjectDir)">
99
+
<PxCoco Grammar="$(PTypeExpressionGrammarDefinition)" Namespace="Prexonite.Internal" FramesDirectory="$(FramesDirectory)" DirectDebug="$(DirectDebug)" RelativePathRoot="$(ProjectDir)\Internal">
100
100
<Output TaskParameter="OutputFiles" ItemName="PTypeExpressionParserFiles" />
101
101
</PxCoco>
102
102
<Copy SourceFiles="$(ProjectDir)Parser.cs;$(ProjectDir)Scanner.cs" DestinationFolder="$(ProjectDir)Internal" />
···
106
106
<!-- Prexonite Parser Target -->
107
107
<Target Name="PrexoniteParser" DependsOnTargets="PrexoniteGrammar" BeforeTargets="BeforeBuild">
108
108
<Message Text="Building prexonite parser." />
109
-
<PxCoco Grammar="$(PrexoniteGrammarDefinition)" Namespace="Prexonite.Compiler" FramesDirectory="$(FramesDirectory)" DirectDebug="$(DirectDebug)" RelativePathRoot="$(ProjectDir)">
109
+
<PxCoco Grammar="$(PrexoniteGrammarDefinition)" Namespace="Prexonite.Compiler" FramesDirectory="$(FramesDirectory)" DirectDebug="$(DirectDebug)" RelativePathRoot="$(ProjectDir)\Compiler">
110
110
<Output TaskParameter="OutputFiles" ItemName="PrexoniteParserFiles" />
111
111
</PxCoco>
112
112
<!-- We use the CSFlex-generated scanner instead. -->
···
117
117
<!-- Prexonite Grammar Merging Target -->
118
118
<Target Name="PrexoniteGrammar" Outputs="$(ProjectDir)Prexonite__gen.atg" Inputs="@(GrammarFragment->'%(FullPath)')">
119
119
<Message Text="Merging Prexonite Grammar fragments." />
120
-
<Merge InputFiles="@(GrammarFragment->'%(FullPath)')" OutputFile="$(ProjectDir)Prexonite__gen.atg" RelativePathRoot="$(ProjectDir)">
120
+
<Merge InputFiles="@(GrammarFragment->'%(FullPath)')" OutputFile="$(ProjectDir)Prexonite__gen.atg" RelativePathRoot="$(ProjectDir)\Compiler">
121
121
</Merge>
122
122
<Message Text="$(PrexoniteGrammarDefinition) is now ready." />
123
123
</Target>
···
161
161
162
162
<!-- NUGET References -->
163
163
<ItemGroup>
164
-
<PackageReference Include="Lokad.ILPack" Version="0.1.3" />
164
+
<PackageReference Include="Lokad.ILPack" Version="0.2.0" />
165
165
<PackageReference Include="PxCoco" Version="1.98.0" />
166
166
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
167
-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.10" />
167
+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.13" />
168
168
</ItemGroup>
169
169
</Project>
+4
-4
PrexoniteTests/PrexoniteTests.csproj
+4
-4
PrexoniteTests/PrexoniteTests.csproj
···
15
15
<ItemGroup>
16
16
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
17
17
<ProjectReference Include="..\Prexonite\Prexonite.csproj" />
18
-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
19
-
<PackageReference Include="Moq" Version="4.13.1" />
20
-
<PackageReference Include="NUnit" Version="3.12.0" />
21
-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
18
+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
19
+
<PackageReference Include="Moq" Version="4.20.69" />
20
+
<PackageReference Include="NUnit" Version="3.13.3" />
21
+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
22
22
</ItemGroup>
23
23
24
24
<ItemGroup>
+2
-2
PrexoniteTests/Tests/Configurations/ModuleCache.cs
+2
-2
PrexoniteTests/Tests/Configurations/ModuleCache.cs
···
38
38
private static readonly ObjectPool<ModuleCache> LinkedCilCache = mkCachePool();
39
39
40
40
private static ObjectPool<ModuleCache> mkCachePool() =>
41
-
new LeakTrackingObjectPool<ModuleCache>(new DefaultObjectPool<ModuleCache>(
41
+
new DefaultObjectPool<ModuleCache>(
42
42
new DefaultPooledObjectPolicy<ModuleCache>(),
43
43
Environment.ProcessorCount
44
-
));
44
+
);
45
45
46
46
private ITargetDescription? _legacySymbolsDescription;
47
47