@ -4,34 +4,31 @@ using System.IO;
using System.Linq ; using System.Linq ;
using System.Text ; using System.Text ;
using System.Threading.Tasks ; using System.Threading.Tasks ;
using System.Xml ;
using Volo.Abp.Cli.Utils ;
using Volo.Abp.DependencyInjection ; using Volo.Abp.DependencyInjection ;
namespace Volo.Abp.Cli.ProjectModification ; namespace Volo.Abp.Cli.ProjectModification ;
public class SolutionFileModifier : ITransientDependency public class SolutionFileModifier : ITransientDependency
{ {
public static Encoding DefaultEncoding = Encoding . UTF8 ; private readonly ICmdHelper _ cmdHelper ;
public SolutionFileModifier ( ICmdHelper cmdHelper )
{
_ cmdHelper = cmdHelper ;
}
public async Task RemoveProjectFromSolutionFileAsync ( string solutionFile , string projectName ) public async Task RemoveProjectFromSolutionFileAsync ( string solutionFile , string projectName )
{ {
using ( var fileStream = File . Open ( solutionFile , FileMode . Open , FileAccess . ReadWrite , FileShare . None ) ) var list = _ cmdHelper . RunCmdAndGetOutput ( $"dotnet sln \" { solutionFile } \ " list" ) ;
foreach ( var line in list . Split ( new [ ] { Environment . NewLine , "\n" } , StringSplitOptions . None ) )
{ {
using ( var sr = new StreamReader ( fileStream , Encoding . Default , true ) ) if ( Path . GetFileNameWithoutExtension ( line . Trim ( ) ) . Equals ( projectName , StringComparison . InvariantCultureIgnoreCas e) )
{ {
var solutionFileContent = await sr . ReadToEndAsync ( ) ; _ cmdHelper . RunCmd ( $"dotnet sln \" { solutionFile } \ " remove \"{line.Trim()}\"" ) ;
solutionFileContent . NormalizeLineEndings ( ) ; break ;
var lines = solutionFileContent . Split ( new [ ] { Environment . NewLine , "\n" } , StringSplitOptions . None ) ;
var updatedContent = RemoveProject ( lines . ToList ( ) , projectName ) . JoinAsString ( Environment . NewLine ) ;
fileStream . Seek ( 0 , SeekOrigin . Begin ) ;
fileStream . SetLength ( 0 ) ;
using ( var sw = new StreamWriter ( fileStream , DefaultEncoding ) )
{
await sw . WriteAsync ( updatedContent ) ;
await sw . FlushAsync ( ) ;
}
} }
} }
} }
@ -48,105 +45,16 @@ public class SolutionFileModifier : ITransientDependency
private async Task AddPackageAsync ( NugetPackageInfo package , string solutionFile ) private async Task AddPackageAsync ( NugetPackageInfo package , string solutionFile )
{ {
var srcFolderId = await AddNewFolderAndGetIdOrGetExistingIdAsync ( solutionFile , "src" ) ; _ cmdHelper . RunCmd ( $"dotnet sln \" { solutionFile } \ " add \"packages\\{package.Name}\\{package.Name}.csproj\" --solution-folder src" ) ;
var solutionFileContent = File . ReadAllText ( solutionFile ) ;
var lines = solutionFileContent . Split ( new [ ] { Environment . NewLine , "\n" } , StringSplitOptions . None ) . ToList ( ) ;
if ( lines . Any ( l = > l . Contains ( $"\" { package . Name } \ "" ) ) )
{
return ;
}
var projectGuid = Guid . NewGuid ( ) . ToString ( ) ;
var newProjectLine = "Project(\"{9A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"" + package . Name + "\"," +
" \"packages\\" + package . Name + "\\" +
"\\" + package . Name + ".csproj\", \"{" + projectGuid + "}\""
+ Environment . NewLine + "EndProject" ;
lines . InsertAfter ( l = > l . Trim ( ) . Equals ( "EndProject" ) , newProjectLine ) ;
var newPostSolutionLine =
" {" + projectGuid + "}.Debug|Any CPU.ActiveCfg = Debug|Any CPU" + Environment . NewLine +
" {" + projectGuid + "}.Debug|Any CPU.Build.0 = Debug|Any CPU" + Environment . NewLine +
" {" + projectGuid + "}.Release|Any CPU.ActiveCfg = Release|Any CPU" + Environment . NewLine +
" {" + projectGuid + "}.Release|Any CPU.Build.0 = Release|Any CPU" ;
lines . InsertAfter ( l = > l . Contains ( "GlobalSection" ) & & l . Contains ( "ProjectConfigurationPlatforms" ) ,
newPostSolutionLine ) ;
var newPreSolutionLine =
" {" + projectGuid + "} = {" + srcFolderId + "}" ;
lines . InsertAfter ( l = > l . Contains ( "GlobalSection" ) & & l . Contains ( "NestedProjects" ) , newPreSolutionLine ) ;
File . WriteAllText ( solutionFile , string . Join ( Environment . NewLine , lines ) , DefaultEncoding ) ;
}
private List < string > RemoveProject ( List < string > solutionFileLines , string projectName )
{
var projectKey = FindProjectKey ( solutionFileLines , projectName ) ;
if ( projectKey = = null )
{
return solutionFileLines ;
}
var newSolutionFileLines = new List < string > ( ) ;
var firstOccurence = true ;
for ( var i = 0 ; i < solutionFileLines . Count ; + + i )
{
if ( solutionFileLines [ i ] . Contains ( projectKey ) )
{
if ( firstOccurence )
{
firstOccurence = false ;
+ + i ; //Skip "EndProject" line too.
}
continue ;
}
newSolutionFileLines . Add ( solutionFileLines [ i ] ) ;
}
return newSolutionFileLines ;
}
private string FindProjectKey ( List < string > solutionFileLines , string projectName )
{
var projectNameWithQuotes = $"\" { projectName } \ "" ;
foreach ( var solutionFileLine in solutionFileLines )
{
if ( solutionFileLine . Contains ( projectNameWithQuotes ) )
{
var curlyBracketStartIndex = solutionFileLine . LastIndexOf ( "{" , StringComparison . OrdinalIgnoreCase ) ;
var curlyBracketEndIndex = solutionFileLine . LastIndexOf ( "}" , StringComparison . OrdinalIgnoreCase ) ;
return solutionFileLine . Substring ( curlyBracketStartIndex + 1 ,
curlyBracketEndIndex - curlyBracketStartIndex - 1 ) ;
}
}
return null ;
} }
private async Task AddModuleAsync ( ModuleWithMastersInfo module , string solutionFile ) private async Task AddModuleAsync ( ModuleWithMastersInfo module , string solutionFile )
{ {
var srcModuleFolderId = await AddNewFolderAndGetIdOrGetExistingIdAsync ( solutionFile , module . Name ,
await AddNewFolderAndGetIdOrGetExistingIdAsync ( solutionFile , "modules" ) ) ;
var testModuleFolderId = await AddNewFolderAndGetIdOrGetExistingIdAsync ( solutionFile , module . Name + ".Tests" ,
await AddNewFolderAndGetIdOrGetExistingIdAsync ( solutionFile , "test" ) ) ;
var file = File . ReadAllText ( solutionFile ) ;
var lines = file . Split ( new [ ] { Environment . NewLine , "\n" } , StringSplitOptions . None ) . ToList ( ) ;
var projectsUnderModule = Directory . GetFiles ( var projectsUnderModule = Directory . GetFiles (
Path . Combine ( Path . GetDirectoryName ( solutionFile ) , "modules" , module . Name ) , Path . Combine ( Path . GetDirectoryName ( solutionFile ) , "modules" , module . Name ) ,
"*.csproj" , "*.csproj" ,
SearchOption . AllDirectories ) ; SearchOption . AllDirectories ) ;
var projectsUnderTest = new List < string > ( ) ; var projectsUnderTest = new List < string > ( ) ;
if ( Directory . Exists ( Path . Combine ( Path . GetDirectoryName ( solutionFile ) , "modules" , module . Name , "test" ) ) ) if ( Directory . Exists ( Path . Combine ( Path . GetDirectoryName ( solutionFile ) , "modules" , module . Name , "test" ) ) )
{ {
@ -158,41 +66,14 @@ public class SolutionFileModifier : ITransientDependency
foreach ( var projectPath in projectsUnderModule ) foreach ( var projectPath in projectsUnderModule )
{ {
var parentFolderId = projectsUnderTest . Contains ( projectPath ) ? testModuleFolderId : srcModuleFolderId ; var folder = projectsUnderTest . Contains ( projectPath ) ? "test" : "src" ;
var projectId = Path . GetFileName ( projectPath ) . Replace ( ".csproj" , "" ) ;
var projectParentFolderInModule = projectsUnderTest . Contains ( projectPath ) ? "test" : "src" ;
if ( lines . Any ( l = > l . Contains ( $"\" { projectId } \ "" ) ) )
{
continue ;
}
var projectGuid = Guid . NewGuid ( ) . ToString ( ) ;
var newProjectLine = "Project(\"{9A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"" + projectId + "\"," +
" \"modules\\" + module . Name + "\\" + projectParentFolderInModule + "\\" +
projectId + "\\" + projectId + ".csproj\", \"{" + projectGuid + "}\""
+ Environment . NewLine + "EndProject" ;
lines . InsertAfter ( l = > l . Trim ( ) . Equals ( "EndProject" ) , newProjectLine ) ;
var newPostSolutionLine = var projectId = Path . GetFileName ( projectPath ) . Replace ( ".csproj" , "" ) ;
" {" + projectGuid + "}.Debug|Any CPU.ActiveCfg = Debug|Any CPU" + Environment . NewLine + var package = @ $"modules\{module.Name}\{folder}\{projectId}\{projectId}.csproj" ;
" {" + projectGuid + "}.Debug|Any CPU.Build.0 = Debug|Any CPU" + Environment . NewLine +
" {" + projectGuid + "}.Release|Any CPU.ActiveCfg = Release|Any CPU" + Environment . NewLine + _ cmdHelper . RunCmd ( $"dotnet sln \" { solutionFile } \ " add \"{package}\" --solution-folder {folder}" ) ;
" {" + projectGuid + "}.Release|Any CPU.Build.0 = Release|Any CPU" ;
lines . InsertAfter ( l = > l . Contains ( "GlobalSection" ) & & l . Contains ( "ProjectConfigurationPlatforms" ) ,
newPostSolutionLine ) ;
var newPreSolutionLine =
" {" + projectGuid + "} = {" + parentFolderId + "}" ;
lines . InsertAfter ( l = > l . Contains ( "GlobalSection" ) & & l . Contains ( "NestedProjects" ) , newPreSolutionLine ) ;
} }
File . WriteAllText ( solutionFile , string . Join ( Environment . NewLine , lines ) , Encoding . UTF8 ) ;
if ( module . MasterModuleInfos ! = null ) if ( module . MasterModuleInfos ! = null )
{ {
foreach ( var masterModule in module . MasterModuleInfos ) foreach ( var masterModule in module . MasterModuleInfos )
@ -201,43 +82,4 @@ public class SolutionFileModifier : ITransientDependency
} }
} }
} }
private async Task < string > AddNewFolderAndGetIdOrGetExistingIdAsync ( string solutionFile , string folderName ,
string parentFolderId = null )
{
var file = File . ReadAllText ( solutionFile ) ;
var lines = file . Split ( new [ ] { Environment . NewLine , "\n" } , StringSplitOptions . None ) . ToList ( ) ;
string folderId ;
var folderLineIndex = lines . FindIndex ( l = >
l . Contains ( "2150E333-8FDC-42A3-9474-1A3956D46DE8" ) & & l . Contains ( "\"" + folderName + "\"" ) ) ;
if ( folderLineIndex < 0 )
{
folderId = Guid . NewGuid ( ) . ToString ( ) ;
var newFolderLine = "Project(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"" + folderName + "\", \"" +
folderName + "\", \"{" + folderId + "}\""
+ Environment . NewLine + "EndProject" ;
lines . InsertAfter ( l = > l . Trim ( ) . Equals ( "EndProject" ) , newFolderLine ) ;
if ( parentFolderId ! = null )
{
var newPreSolutionLine =
" {" + folderId + "} = {" + parentFolderId + "}" ;
lines . InsertAfter ( l = > l . Contains ( "GlobalSection" ) & & l . Contains ( "NestedProjects" ) ,
newPreSolutionLine ) ;
}
}
else
{
folderId = lines [ folderLineIndex ] . Replace ( "\"" , " " ) . Replace ( "{" , " " ) . Replace ( "}" , " " ) . TrimEnd ( )
. Split ( " " ) . Last ( ) ;
}
File . WriteAllText ( solutionFile , string . Join ( Environment . NewLine , lines ) , Encoding . UTF8 ) ;
return folderId ;
}
} }
Ma Liming
8 months ago
GitHub