Rename solution & project files to -legacy suffix

This is in preparation for upcoming .NET6 support, which will have its own solution and project files.
nblockchain · Nov 10, 2022 · cedd6d0 · cedd6d0
1 parent 943e725
commit cedd6d0
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 11 deletions.
diff --git a/CommonBuildProps.proj → CommonBuildProps-legacy.proj b/CommonBuildProps.proj → CommonBuildProps-legacy.proj
diff --git a/InfraLib/InfraLib.fsproj → InfraLib/InfraLib-legacy.fsproj b/InfraLib/InfraLib.fsproj → InfraLib/InfraLib-legacy.fsproj
@@ -55,7 +55,7 @@
     <Compile Include="Git.fs" />
     <Compile Include="Taiga.fs" />
   </ItemGroup>
-  <Import Project="..\CommonBuildProps.proj" />
+  <Import Project="..\CommonBuildProps-legacy.proj" />
   <Import Condition="'$(FSharpTargetsPath)' != ''" Project="$(FSharpTargetsPath)" />
   <Target Name="BeforeBuild">
     <Message Condition="'$(FSharpTargetsPath)' == ''" Importance="High" Text="F# SDK path was not found!" />
@@ -67,4 +67,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/fsx.sln → fsx-legacy.sln b/fsx.sln → fsx-legacy.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "InfraLib", "InfraLib\InfraLib.fsproj", "{4634F264-784E-42DA-B5A1-FE72125DEAFC}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "InfraLib", "InfraLib\InfraLib-legacy.fsproj", "{4634F264-784E-42DA-B5A1-FE72125DEAFC}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsxc", "fsxc\fsxc.fsproj", "{56DA5F03-8F7F-44AB-B692-5A24DB134A8B}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsxc", "fsxc\fsxc-legacy.fsproj", "{56DA5F03-8F7F-44AB-B692-5A24DB134A8B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{8E1108BE-590F-4C6D-8496-A8AAEB8594D8}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/fsxc/fsxc.fsproj → fsxc/fsxc-legacy.fsproj b/fsxc/fsxc.fsproj → fsxc/fsxc-legacy.fsproj
@@ -54,7 +54,7 @@
     <Compile Include="Program.fs" />
     <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="..\CommonBuildProps.proj" />
+  <Import Project="..\CommonBuildProps-legacy.proj" />
   <Import Condition="'$(FSharpTargetsPath)' != ''" Project="$(FSharpTargetsPath)" />
   <Target Name="BeforeBuild">
     <Message Condition="'$(FSharpTargetsPath)' == ''" Importance="High" Text="F# SDK path was not found!" />

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -7,4 +7,4 @@ if [ ! -f ./build.config ]; then
 fi
 source build.config
 
-$BuildTool fsx.sln
+$BuildTool fsx-legacy.sln
diff --git a/scripts/install.sh b/scripts/install.sh
@@ -7,7 +7,7 @@ if [ ! -f ./build.config ]; then
 fi
 source build.config
 
-$BuildTool fsx.sln /p:Configuration=Release
+$BuildTool fsx-legacy.sln /p:Configuration=Release
 
 FSX_INSTALL_DIR="$Prefix/lib/fsx"
 BIN_INSTALL_DIR="$Prefix/bin"

diff --git a/scripts/make.fsx b/scripts/make.fsx
@@ -166,7 +166,7 @@ let BuildSolution
     | _ -> ()
 
 let JustBuild binaryConfig =
-    let solFile = "fsx.sln"
+    let solFile = "fsx-legacy.sln"
 
     Network.RunNugetCommand
         NugetExe

diff --git a/test/testRefNugetLib.fsx b/test/testRefNugetLib.fsx
@@ -8,7 +8,8 @@ open System.Linq
 open Microsoft.Build.Construction
 
 let sol =
-    SolutionFile.Parse <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx.sln")
+    SolutionFile.Parse
+    <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx-legacy.sln")
 
 for (proj: string) in
     (sol

diff --git a/test/testRefNugetLibNewFormat.fsx b/test/testRefNugetLibNewFormat.fsx
@@ -8,7 +8,8 @@ open System.Linq
 open Microsoft.Build.Construction
 
 let sol =
-    SolutionFile.Parse <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx.sln")
+    SolutionFile.Parse
+    <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx-legacy.sln")
 
 for (proj: string) in
     (sol

diff --git a/test/testRefNugetLibNewFormatWithVersion.fsx b/test/testRefNugetLibNewFormatWithVersion.fsx
@@ -8,7 +8,8 @@ open System.Linq
 open Microsoft.Build.Construction
 
 let sol =
-    SolutionFile.Parse <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx.sln")
+    SolutionFile.Parse
+    <| Path.Combine(__SOURCE_DIRECTORY__, "..", "fsx-legacy.sln")
 
 for (proj: string) in
     (sol