diff --git a/Sources/Directory.Build.props b/Sources/Directory.Build.props
index 66d545c..b0e0102 100644
--- a/Sources/Directory.Build.props
+++ b/Sources/Directory.Build.props
@@ -16,8 +16,8 @@
- runtime; build; native; contentfiles; analyzers; buildtransitive
all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Sources/Directory.Packages.props b/Sources/Directory.Packages.props
index 8826e6a..0e55b06 100644
--- a/Sources/Directory.Packages.props
+++ b/Sources/Directory.Packages.props
@@ -4,20 +4,22 @@
-
+
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
+
\ No newline at end of file
diff --git a/Sources/Kysect.PowerShellRunner.CodeGeneration/Kysect.PowerShellRunner.CodeGeneration.csproj b/Sources/Kysect.PowerShellRunner.CodeGeneration/Kysect.PowerShellRunner.CodeGeneration.csproj
index 6bf52d8..1cd832c 100644
--- a/Sources/Kysect.PowerShellRunner.CodeGeneration/Kysect.PowerShellRunner.CodeGeneration.csproj
+++ b/Sources/Kysect.PowerShellRunner.CodeGeneration/Kysect.PowerShellRunner.CodeGeneration.csproj
@@ -4,10 +4,11 @@
-
+
+
diff --git a/Sources/Kysect.PowerShellRunner.CodeGeneration/SchemaGenerating/PowerShellSemanticSchemaGeneratorFactory.cs b/Sources/Kysect.PowerShellRunner.CodeGeneration/SchemaGenerating/PowerShellSemanticSchemaGeneratorFactory.cs
index 365d475..86a98e4 100644
--- a/Sources/Kysect.PowerShellRunner.CodeGeneration/SchemaGenerating/PowerShellSemanticSchemaGeneratorFactory.cs
+++ b/Sources/Kysect.PowerShellRunner.CodeGeneration/SchemaGenerating/PowerShellSemanticSchemaGeneratorFactory.cs
@@ -1,5 +1,6 @@
using Kysect.CommonLib.ProgressTracking;
-using Kysect.DotnetSlnParser.Parsers;
+using Kysect.DotnetProjectSystem.Parsing;
+using Kysect.DotnetProjectSystem.Traversing;
using Kysect.PowerShellRunner.CodeGeneration.Compilation;
using Kysect.PowerShellRunner.CodeGeneration.SemanticParsing;
using Kysect.PowerShellRunner.CodeGeneration.SolutionReading;
diff --git a/Sources/Kysect.PowerShellRunner.CodeGeneration/SdkGenerating/PowerShellSchemaCodeGenerator.cs b/Sources/Kysect.PowerShellRunner.CodeGeneration/SdkGenerating/PowerShellSchemaCodeGenerator.cs
index fe196fe..9060f6b 100644
--- a/Sources/Kysect.PowerShellRunner.CodeGeneration/SdkGenerating/PowerShellSchemaCodeGenerator.cs
+++ b/Sources/Kysect.PowerShellRunner.CodeGeneration/SdkGenerating/PowerShellSchemaCodeGenerator.cs
@@ -1,9 +1,10 @@
using Kysect.CommonLib.BaseTypes.Extensions;
-using Kysect.CommonLib.FileSystem.Extensions;
+using Kysect.CommonLib.FileSystem;
using Kysect.PowerShellRunner.CodeGeneration.SchemaGenerating;
using Kysect.PowerShellRunner.CodeGeneration.UsedModelSearching;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.IO.Abstractions;
namespace Kysect.PowerShellRunner.CodeGeneration.SdkGenerating;
@@ -12,12 +13,14 @@ public class PowerShellSchemaCodeGenerator
private readonly string _outputPath;
private readonly string _namespaceName;
private readonly IPowerShellCodeGeneratorNamespaceProvider _namespaceProvider;
+ private readonly FileSystem _fileSystem;
public PowerShellSchemaCodeGenerator(string outputPath, string namespaceName, IPowerShellCodeGeneratorNamespaceProvider namespaceProvider)
{
_outputPath = outputPath;
_namespaceName = namespaceName;
_namespaceProvider = namespaceProvider;
+ _fileSystem = new FileSystem();
}
public void GenerateSdkCode(PowerShellSchemaDto powerShellSchema)
@@ -54,7 +57,7 @@ public void GenerateSdkCode(PowerShellSchemaDto powerShellSchema)
private void WriteToCsFile(string directoryPath, string typeName, MemberDeclarationSyntax declarationSyntax, string[] usingList)
{
- DirectoryExtensions.EnsureFileExists(directoryPath);
+ _fileSystem.EnsureDirectoryExists(directoryPath);
string fullPath = Path.Combine(directoryPath, $"{typeName}.g.cs");
string content = CodeGenerationNamespaceWrapper.Wrap(declarationSyntax, _namespaceName, usingList).NormalizeWhitespace().ToString();
diff --git a/Sources/Kysect.PowerShellRunner.CodeGeneration/SolutionReading/SolutionSourceFileContentReader.cs b/Sources/Kysect.PowerShellRunner.CodeGeneration/SolutionReading/SolutionSourceFileContentReader.cs
index 73ab76c..8e43a77 100644
--- a/Sources/Kysect.PowerShellRunner.CodeGeneration/SolutionReading/SolutionSourceFileContentReader.cs
+++ b/Sources/Kysect.PowerShellRunner.CodeGeneration/SolutionReading/SolutionSourceFileContentReader.cs
@@ -1,6 +1,6 @@
using Kysect.CommonLib.ProgressTracking;
-using Kysect.DotnetSlnParser.Models;
-using Kysect.DotnetSlnParser.Parsers;
+using Kysect.DotnetProjectSystem.Parsing;
+using Kysect.DotnetProjectSystem.Traversing;
using Microsoft.Extensions.Logging;
using System.IO.Abstractions;
diff --git a/Sources/Kysect.PowerShellRunner.Tests/Kysect.PowerShellRunner.Tests.csproj b/Sources/Kysect.PowerShellRunner.Tests/Kysect.PowerShellRunner.Tests.csproj
index 434638c..d0ba447 100644
--- a/Sources/Kysect.PowerShellRunner.Tests/Kysect.PowerShellRunner.Tests.csproj
+++ b/Sources/Kysect.PowerShellRunner.Tests/Kysect.PowerShellRunner.Tests.csproj
@@ -24,7 +24,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Sources/Kysect.PowerShellRunner.sln b/Sources/Kysect.PowerShellRunner.sln
index 76708fc..31c89c6 100644
--- a/Sources/Kysect.PowerShellRunner.sln
+++ b/Sources/Kysect.PowerShellRunner.sln
@@ -1,4 +1,3 @@
-
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33829.357
@@ -11,7 +10,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kysect.PowerShellRunner", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kysect.PowerShellRunner.CodeGeneration", "Kysect.PowerShellRunner.CodeGeneration\Kysect.PowerShellRunner.CodeGeneration.csproj", "{427C6CA2-F555-40E5-9E8D-C2EAE16A07D5}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kysect.PowerShellRunner.Configuration", "Kysect.PowerShellRunner.Configuration\Kysect.PowerShellRunner.Configuration.csproj", "{1985E7C6-3826-4232-B9F5-089CBF67B464}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kysect.PowerShellRunner.Configuration", "Kysect.PowerShellRunner.Configuration\Kysect.PowerShellRunner.Configuration.csproj", "{1985E7C6-3826-4232-B9F5-089CBF67B464}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1D69C86F-577E-4246-B9E7-B7D2C3F6E0A3}"
+ ProjectSection(SolutionItems) = preProject
+ Directory.Build.props = Directory.Build.props
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution