Skip to content

Commit 5604686

Browse files
eldritchconundrumeldritchconundrum
authored
Modernize and reorganize projects and solutions (#479)
* Migrate to net8.0 * One fsproj per directory, with the same name as the directory
1 parent 865ff9a commit 5604686

28 files changed

+116
-415
lines changed

‎Checker/Checker.fsproj

Lines changed: 12 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,20 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>cf735cb3-7698-41da-9e91-69d0057087cb</ProjectGuid>
94
<OutputType>Exe</OutputType>
10-
<RootNamespace>Checker</RootNamespace>
11-
<AssemblyName>Checker</AssemblyName>
12-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<TargetFSharpCoreVersion>6.0.0.0</TargetFSharpCoreVersion>
15-
<Name>Checker</Name>
16-
<TargetFrameworkProfile />
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<Tailcalls>false</Tailcalls>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<WarningLevel>5</WarningLevel>
26-
<PlatformTarget>AnyCPU</PlatformTarget>
27-
<DocumentationFile>bin\Debug\Checker.XML</DocumentationFile>
28-
<Prefer32Bit>true</Prefer32Bit>
29-
<StartWorkingDirectory>../../..</StartWorkingDirectory>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<StartWorkingDirectory>..</StartWorkingDirectory>
307
<StartArguments>--update-golden</StartArguments>
318
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
33-
<DebugType>pdbonly</DebugType>
34-
<Optimize>true</Optimize>
35-
<Tailcalls>true</Tailcalls>
36-
<OutputPath>bin\Release\</OutputPath>
37-
<DefineConstants>TRACE</DefineConstants>
38-
<WarningLevel>3</WarningLevel>
39-
<PlatformTarget>AnyCPU</PlatformTarget>
40-
<DocumentationFile>bin\Release\Checker.XML</DocumentationFile>
41-
<Prefer32Bit>true</Prefer32Bit>
42-
<StartWorkingDirectory>..\..\..</StartWorkingDirectory>
43-
</PropertyGroup>
44-
<PropertyGroup>
45-
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
46-
</PropertyGroup>
47-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
48-
<DebugSymbols>true</DebugSymbols>
49-
<DebugType>full</DebugType>
50-
<Optimize>false</Optimize>
51-
<Tailcalls>false</Tailcalls>
52-
<OutputPath>bin\Debug\</OutputPath>
53-
<DefineConstants>DEBUG;TRACE</DefineConstants>
54-
<WarningLevel>5</WarningLevel>
55-
<DocumentationFile>bin\Debug\Checker.XML</DocumentationFile>
56-
<Prefer32Bit>true</Prefer32Bit>
57-
<StartWorkingDirectory>../../..</StartWorkingDirectory>
58-
<StartArguments>--update-golden</StartArguments>
59-
<PlatformTarget>x64</PlatformTarget>
60-
</PropertyGroup>
61-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
62-
<DebugType>pdbonly</DebugType>
63-
<Optimize>true</Optimize>
64-
<Tailcalls>true</Tailcalls>
65-
<OutputPath>bin\Release\</OutputPath>
66-
<DefineConstants>TRACE</DefineConstants>
67-
<WarningLevel>3</WarningLevel>
68-
<DocumentationFile>bin\Release\Checker.XML</DocumentationFile>
69-
<Prefer32Bit>true</Prefer32Bit>
70-
<StartWorkingDirectory>..\..\..</StartWorkingDirectory>
71-
<PlatformTarget>x64</PlatformTarget>
72-
</PropertyGroup>
73-
<Choose>
74-
<When Condition="'$(VisualStudioVersion)' == '11.0'">
75-
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
76-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
77-
</PropertyGroup>
78-
</When>
79-
<Otherwise>
80-
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
81-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
82-
</PropertyGroup>
83-
</Otherwise>
84-
</Choose>
85-
<Import Project="$(FSharpTargetsPath)" />
9+
8610
<ItemGroup>
8711
<Compile Include="compression_test.fs" />
8812
<Compile Include="main.fs" />
8913
<None Include="../lib/Compressor.dll">
9014
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9115
</None>
9216
</ItemGroup>
17+
9318
<ItemGroup>
9419
<Reference Include="Argu">
9520
<HintPath>..\lib\Argu.dll</HintPath>
@@ -100,18 +25,10 @@
10025
<Reference Include="OpenTK">
10126
<HintPath>..\lib\OpenTK.dll</HintPath>
10227
</Reference>
103-
<Reference Include="System.ValueTuple" />
104-
<ProjectReference Include="..\Shader Minifier Library.fsproj">
105-
<Name>Shader Minifier Library</Name>
106-
<Project>{059c6af3-1877-4698-be34-bf7eb55d060a}</Project>
107-
<Private>True</Private>
108-
</ProjectReference>
10928
</ItemGroup>
110-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
111-
Other similar extension points exist, see Microsoft.Common.targets.
112-
<Target Name="BeforeBuild">
113-
</Target>
114-
<Target Name="AfterBuild">
115-
</Target>
116-
-->
117-
</Project>
29+
30+
<ItemGroup>
31+
<ProjectReference Include="..\Minifier\Minifier.fsproj" />
32+
</ItemGroup>
33+
34+
</Project>

‎Directory.Build.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
3+
<PropertyGroup>
4+
5+
<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
6+
7+
</PropertyGroup>
8+
</Project>

‎Example/Example.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\Shader Minifier Library.fsproj" />
11+
<ProjectReference Include="..\Minifier\Minifier.fsproj" />
1212
</ItemGroup>
1313

1414
</Project>

‎Minifier/Minifier.fsproj

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<Compile Include="builtin.fs" />
9+
<Compile Include="options.fs" />
10+
<Compile Include="ast.fs" />
11+
<Compile Include="printer.fs" />
12+
<Compile Include="formatter.fs" />
13+
<Compile Include="analyzer.fs" />
14+
<Compile Include="inlining.fs" />
15+
<Compile Include="renamer.fs" />
16+
<Compile Include="rewriter.fs" />
17+
<Compile Include="preprocessor.fs" />
18+
<Compile Include="parse.fs" />
19+
<Compile Include="api.fs" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<Reference Include="Argu">
24+
<HintPath>..\lib\Argu.dll</HintPath>
25+
</Reference>
26+
<Reference Include="FParsec">
27+
<HintPath>..\lib\FParsec.dll</HintPath>
28+
</Reference>
29+
<Reference Include="FParsecCS">
30+
<HintPath>..\lib\FParsecCS.dll</HintPath>
31+
</Reference>
32+
<Reference Include="FSharp.Core">
33+
<HintPath>..\lib\FSharp.Core.dll</HintPath>
34+
</Reference>
35+
</ItemGroup>
36+
37+
</Project>

‎src/analyzer.fs renamed to ‎Minifier/analyzer.fs

File renamed without changes.

‎src/api.fs renamed to ‎Minifier/api.fs

File renamed without changes.

‎src/ast.fs renamed to ‎Minifier/ast.fs

File renamed without changes.

‎src/builtin.fs renamed to ‎Minifier/builtin.fs

File renamed without changes.

‎src/formatter.fs renamed to ‎Minifier/formatter.fs

File renamed without changes.

‎src/inlining.fs renamed to ‎Minifier/inlining.fs

File renamed without changes.

‎src/options.fs renamed to ‎Minifier/options.fs

File renamed without changes.

‎src/parse.fs renamed to ‎Minifier/parse.fs

File renamed without changes.

‎src/preprocessor.fs renamed to ‎Minifier/preprocessor.fs

File renamed without changes.

‎src/printer.fs renamed to ‎Minifier/printer.fs

File renamed without changes.

‎src/renamer.fs renamed to ‎Minifier/renamer.fs

File renamed without changes.

‎src/rewriter.fs renamed to ‎Minifier/rewriter.fs

File renamed without changes.

‎SMBolero.Client/SMBolero.Client.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
77
<Compile Include="Main.fs" />
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.*" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<ProjectReference Include="..\Shader Minifier Library.fsproj" />
17+
<ProjectReference Include="..\Minifier\Minifier.fsproj" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<Content Update="wwwroot\css\index.css">

‎SMBolero.Server/SMBolero.Server.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
77
<Compile Include="Index.fs" />

‎Shader Minifier Library.fsproj

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎Shader Minifier.fsproj

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)