@@ -870,7 +870,7 @@ private static string LoadInitClassFile(string name)
870870 /// <summary>
871871 /// Uninstalls all of the currently installed packages.
872872 /// </summary>
873- internal static void UninstallAll ( )
873+ public static void UninstallAll ( )
874874 {
875875 foreach ( var package in installedPackages . Values . ToList ( ) )
876876 {
@@ -1885,7 +1885,7 @@ private static void ProcessInitTemplate(string initTemplatePath, NugetPackage pa
18851885
18861886 if ( customExceptionLoggingCode . Length > 0 && ! data . InitCs . Contains ( customExceptionLoggingCode ) )
18871887 {
1888- insertPos = data . InitCs . IndexOf ( "\t \t }" , StringComparison . Ordinal ) ;
1888+ insertPos = data . InitCs . IndexOf ( "\n \ t\t }" , StringComparison . Ordinal ) + 1 ;
18891889 data . InitCs = data . InitCs . Insert ( insertPos , customExceptionLoggingCode ) ;
18901890 if ( initIndex > 0 ) initIndex += customExceptionLoggingCode . Length ;
18911891 }
@@ -1938,6 +1938,8 @@ private static void ProcessInitTemplate(string initTemplatePath, NugetPackage pa
19381938 return ;
19391939 }
19401940
1941+ // ************ EditorAppInitializer setup **************
1942+
19411943 if ( data . EditorTxt . Contains ( editorInitCode ) ) return ;
19421944
19431945 DeleteMethodIfExists ( initMethodName , ref data . EditorTxt , out var origStartIndex ) ;
@@ -1951,15 +1953,15 @@ private static void ProcessInitTemplate(string initTemplatePath, NugetPackage pa
19511953 }
19521954
19531955 var initEditIndexStart = data . EditorCs . IndexOf ( "public static void InitEditStuff()" , StringComparison . Ordinal ) ;
1954- var initEditIndexEnd = data . EditorCs . IndexOf ( "\t \t }" , initEditIndexStart , StringComparison . Ordinal ) ;
1956+ var initEditIndexEnd = data . EditorCs . IndexOf ( "\n \ t\t }" , initEditIndexStart , StringComparison . Ordinal ) ;
19551957
19561958 if ( initEditIndexEnd < 0 )
19571959 {
19581960 SystemProxy . LogError ( $ "Invalid format of EditorAppInitializer.cs. Can't insert following code:\n { editorInitCode } ") ;
19591961 }
19601962 else if ( data . EditorCs . IndexOf ( $ "\t { initMethodName } ()", StringComparison . OrdinalIgnoreCase ) < 0 )
19611963 {
1962- data . EditorCs = data . EditorCs . Insert ( initEditIndexEnd , $ "\t \t \t { initMethodName } ();\r \n ") ;
1964+ data . EditorCs = data . EditorCs . Insert ( initEditIndexEnd + 1 , $ "\t \t \t { initMethodName } ();\r \n ") ;
19631965 }
19641966
19651967 var optionalNewLine = "" ;
0 commit comments