Skip to content

Commit

Permalink
Refactor the F# lib (#47)
Browse files Browse the repository at this point in the history
* Refactored project structure and dependencies

The solution file has been updated to reflect changes in the project structure. A common project was removed, and two new projects were added for testing and FSharp. The CLI project's dependencies have also been updated accordingly. Files from the common directory were moved to the FSharp directory, and references in these files were updated to match their new location. Additionally, a new file was added to the FSharp project, and its package references were adjusted for better organization.

* Revert test package sln change

We'll catch this in a different branch

* This file doesn't exist yet
  • Loading branch information
UnstoppableMango authored May 4, 2024
1 parent 470ec6a commit 649dce1
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 32 deletions.
16 changes: 8 additions & 8 deletions Tdl.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
Expand Down Expand Up @@ -48,15 +48,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "proto", "proto", "{D33909C2
proto\buf.yaml = proto\buf.yaml
EndProjectSection
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UnMango.Tdl.Common", "src\Common\UnMango.Tdl.Common.fsproj", "{C2AD9627-8FFF-4D17-918B-FBB764EFB207}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v1alpha1", "v1alpha1", "{748534DB-77B0-4CEF-83C1-C12855E2A79F}"
ProjectSection(SolutionItems) = preProject
proto\unmango\dev\tdl\v1alpha1\uml.proto = proto\unmango\dev\tdl\v1alpha1\uml.proto
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnMango.Tdl.Abstractions", "src\Abstractions\UnMango.Tdl.Abstractions.csproj", "{C91D0104-CD82-4A78-868C-B8F4B1ED459A}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UnMango.Tdl.FSharp", "src\FSharp\UnMango.Tdl.FSharp.fsproj", "{2C9FDB41-F299-42BC-8E07-3297A4387BF3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -90,14 +90,14 @@ Global
{A3CDE2F6-3B42-44D5-B23F-8E349DAA3FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A3CDE2F6-3B42-44D5-B23F-8E349DAA3FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A3CDE2F6-3B42-44D5-B23F-8E349DAA3FAC}.Release|Any CPU.Build.0 = Release|Any CPU
{C2AD9627-8FFF-4D17-918B-FBB764EFB207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C2AD9627-8FFF-4D17-918B-FBB764EFB207}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2AD9627-8FFF-4D17-918B-FBB764EFB207}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2AD9627-8FFF-4D17-918B-FBB764EFB207}.Release|Any CPU.Build.0 = Release|Any CPU
{C91D0104-CD82-4A78-868C-B8F4B1ED459A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C91D0104-CD82-4A78-868C-B8F4B1ED459A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C91D0104-CD82-4A78-868C-B8F4B1ED459A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C91D0104-CD82-4A78-868C-B8F4B1ED459A}.Release|Any CPU.Build.0 = Release|Any CPU
{2C9FDB41-F299-42BC-8E07-3297A4387BF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C9FDB41-F299-42BC-8E07-3297A4387BF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C9FDB41-F299-42BC-8E07-3297A4387BF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C9FDB41-F299-42BC-8E07-3297A4387BF3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{08902DF7-376C-4CC7-92AA-E5E8AE26975F} = {4C2EFA7D-EC3E-4D68-8DC6-EC1418D2A36F}
Expand All @@ -107,8 +107,8 @@ Global
{2A9EBCAF-97BD-4570-9AF4-12E2CBD555F4} = {4C2EFA7D-EC3E-4D68-8DC6-EC1418D2A36F}
{A3CDE2F6-3B42-44D5-B23F-8E349DAA3FAC} = {4C2EFA7D-EC3E-4D68-8DC6-EC1418D2A36F}
{A019E942-34BF-4F88-AFA8-3AA445D409E6} = {B3AC8EAB-9388-4D81-AF13-DEC3F7C08EB0}
{C2AD9627-8FFF-4D17-918B-FBB764EFB207} = {4C2EFA7D-EC3E-4D68-8DC6-EC1418D2A36F}
{748534DB-77B0-4CEF-83C1-C12855E2A79F} = {D33909C2-5104-4E7E-A0F1-FC98FF7B4C5A}
{C91D0104-CD82-4A78-868C-B8F4B1ED459A} = {4C2EFA7D-EC3E-4D68-8DC6-EC1418D2A36F}
{2C9FDB41-F299-42BC-8E07-3297A4387BF3} = {4C2EFA7D-EC3E-4D68-8DC6-EC1418D2A36F}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion src/Cli/UnMango.Tdl.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Common\UnMango.Tdl.Common.fsproj" />
<ProjectReference Include="..\FSharp\UnMango.Tdl.FSharp.fsproj" />
<ProjectReference Include="..\Language\UnMango.Tdl.Language.fsproj"/>
</ItemGroup>

Expand Down
23 changes: 0 additions & 23 deletions src/Common/UnMango.Tdl.Common.fsproj

This file was deleted.

File renamed without changes.
File renamed without changes.
24 changes: 24 additions & 0 deletions src/FSharp/UnMango.Tdl.FSharp.fsproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RootNamespace>UnMango.Tdl</RootNamespace>
</PropertyGroup>

<ItemGroup>
<Compile Include="Library.fs"/>
<Compile Include="Broker.fs"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Control.Reactive" Version="5.0.5"/>
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="all"/>
<PackageReference Include="UnMango.CliWrap.FSharp" Version="0.0.7-alpha.0.2"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Abstractions\UnMango.Tdl.Abstractions.csproj" />
</ItemGroup>

</Project>

0 comments on commit 649dce1

Please sign in to comment.