Skip to content

Commit

Permalink
Revert "[NEW-FEATURE] Update to stc v6 (#303)"
Browse files Browse the repository at this point in the history
This reverts commit b11f32d.
  • Loading branch information
PTKu authored May 6, 2024
1 parent 4f7ad6a commit 1c152ba
Show file tree
Hide file tree
Showing 30 changed files with 302 additions and 1,501 deletions.
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mode: ContinuousDeployment
next-version: 0.19.0
next-version: 0.18.0
branches:
main:
regex: ^master$|^main$
Expand Down
22 changes: 8 additions & 14 deletions src/AXSharp.compiler/src/AXSharp.Compiler/AXSharp.Compiler.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CliWrap" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="NuGet.Configuration" />
<PackageReference Include="NuGet.Packaging" />
<PackageReference Include="Polly" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="YamlDotNet" />
<PackageReference Include="CliWrap"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
<PackageReference Include="Newtonsoft.Json"/>
<PackageReference Include="NuGet.Configuration"/>
<PackageReference Include="NuGet.Packaging"/>
<PackageReference Include="Polly"/>
<PackageReference Include="Serilog.Sinks.Console"/>
<PackageReference Include="YamlDotNet"/>
</ItemGroup>

<ItemGroup>
Expand All @@ -89,11 +88,6 @@
<HintPath>..\..\..\apax\stc\bin\AX.Text.dll</HintPath>
<Private>False</Private>
</Reference>

<Reference Include="AX.Text">
<HintPath>..\..\..\apax\stc\bin\AX.ST.Compiler.PluginAbstractions.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>

</Project>
9 changes: 4 additions & 5 deletions src/AXSharp.compiler/src/AXSharp.Compiler/AXSharpProject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System.Text;
using System.Xml.Linq;
using AX.ST.Semantic;
using AX.ST.Semantic.Analyzer;
using AX.ST.Semantic.Model.Declarations;
using AX.ST.Semantic.Model.Declarations.Types;
using AX.ST.Syntax.Parser;
Expand Down Expand Up @@ -93,7 +92,7 @@ public void Generate()

var toCompile = refParseTrees.Concat(projectSources.Select(p => p.parseTree));

var compilation = Compilation.Create(toCompile, new List<ISemanticAnalyzer>(), Compilation.Settings.Default).Result;
var compilation = Compilation.Create(toCompile, Compilation.Settings.Default).Result;

this.CleanOutput(this.OutputFolder);

Expand All @@ -103,7 +102,7 @@ public void Generate()

foreach (var sourceBuilderType in BuilderTypes)
{
var builder = Activator.CreateInstance(sourceBuilderType, this, compilation.Compilation);
var builder = Activator.CreateInstance(sourceBuilderType, this, compilation);
var treeWalker = builder as ICombinedThreeVisitor;
var sourceBuilder = builder as ISourceBuilder;

Expand All @@ -116,7 +115,7 @@ public void Generate()
$"Could not create {sourceBuilderType.Name} as ISourceBuilder");


origin.parseTree.GetRoot().Visit(new IxNodeVisitor(compilation.Compilation), treeWalker);
origin.parseTree.GetRoot().Visit(new IxNodeVisitor(compilation), treeWalker);



Expand All @@ -136,7 +135,7 @@ public void Generate()
}

TargetProject.ProvisionProjectStructure();
GenerateMetadata(compilation.Compilation);
GenerateMetadata(compilation);
TargetProject.GenerateResources();
TargetProject.GenerateCompanionData();
Log.Logger.Information($"Compilation of project '{AxProject.SrcFolder}' done.");
Expand Down
Loading

0 comments on commit 1c152ba

Please sign in to comment.