Skip to content

Convert to File Scoped Namespaces #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 20, 2023
Merged

Convert to File Scoped Namespaces #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a02bb6
File Scoped Namespaces
BenjaminMichaelis Mar 19, 2023
6517476
Revert table 3.03 and 10.18
BenjaminMichaelis Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 7 additions & 8 deletions src/Chapter01/Listing01.03.MultipleStatementsOneOneLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_03
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_03;

public class HelloWorld
{
public class HelloWorld
public static void Main()
{
public static void Main()
{
#region INCLUDE
Console.WriteLine("Up"); Console.WriteLine("Down");
#endregion INCLUDE
}
#region INCLUDE
Console.WriteLine("Up"); Console.WriteLine("Down");
#endregion INCLUDE
}
}
19 changes: 9 additions & 10 deletions src/Chapter01/Listing01.04.MultipleStatementsOnSeparateLines.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_04
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_04;

public class HelloWorld
{
public class HelloWorld
public static void Main()
{
public static void Main()
{
#region INCLUDE
Console.WriteLine("Down");
Console.WriteLine("Side");
Console.WriteLine("Up");
#endregion INCLUDE
}
#region INCLUDE
Console.WriteLine("Down");
Console.WriteLine("Side");
Console.WriteLine("Up");
#endregion INCLUDE
}
}
17 changes: 8 additions & 9 deletions src/Chapter01/Listing01.05.SplittingAStatementAcrossMultipleLines.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_05
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_05;

public class HelloWorld
{
public class HelloWorld
public static void Main()
{
public static void Main()
{
#region INCLUDE
Console.WriteLine(
"Hello. My name is Inigo Montoya.");
#endregion INCLUDE
}
#region INCLUDE
Console.WriteLine(
"Hello. My name is Inigo Montoya.");
#endregion INCLUDE
}
}
15 changes: 7 additions & 8 deletions src/Chapter01/Listing01.06.HelloWorldInC#.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_06
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_06;

#region INCLUDE
public class Program
{
#region INCLUDE
public class Program
public static void Main()
{
public static void Main()
{
System.Console.WriteLine("Hello. My name is Inigo Montoya.");
}
System.Console.WriteLine("Hello. My name is Inigo Montoya.");
}
#endregion INCLUDE
}
#endregion INCLUDE
13 changes: 6 additions & 7 deletions src/Chapter01/Listing01.07.BasicClassDeclaration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_07
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_07;

#region INCLUDE
public class HelloWorld
{
#region INCLUDE
public class HelloWorld
{
// ...
}
#endregion INCLUDE
// ...
}
#endregion INCLUDE
23 changes: 11 additions & 12 deletions src/Chapter01/Listing01.08.BreakingApartHelloWorld.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_08
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_08;

#region INCLUDE
public class Program // BEGIN Class definition
{
#region INCLUDE
public class Program // BEGIN Class definition
{
public static void Main() // Method declaration
{ // BEGIN method implementation
Console.WriteLine( // This statement spans 2 lines
"Hello, My name is Inigo Montoya");
} // END method implementation
} // END class definition
#endregion INCLUDE
}
public static void Main() // Method declaration
{ // BEGIN method implementation
Console.WriteLine( // This statement spans 2 lines
"Hello, My name is Inigo Montoya");
} // END method implementation
} // END class definition
#endregion INCLUDE
19 changes: 9 additions & 10 deletions src/Chapter01/Listing01.09.TheMainMethodWithParametersAndAReturn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_09
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_09;

public class Program
{
public class Program
#region INCLUDE
public static int Main(string[] args)
{
#region INCLUDE
public static int Main(string[] args)
{
#region EXCLUDE
return 0;
#endregion EXCLUDE
}
#endregion INCLUDE
#region EXCLUDE
return 0;
#endregion EXCLUDE
}
#endregion INCLUDE
}
5 changes: 2 additions & 3 deletions src/Chapter01/Listing01.10.NoIndentationFormatting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_10
{
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_10;

#region INCLUDE
public class HelloWorld
{
Expand All @@ -9,4 +9,3 @@ public static void Main()
}
}
#endregion INCLUDE
}
21 changes: 10 additions & 11 deletions src/Chapter01/Listing01.12.DeclaringAndAssigningAVariable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_12
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_12;

#region INCLUDE
public class MiracleMax
{
#region INCLUDE
public class MiracleMax
public static void Main()
{
public static void Main()
{
string max; // "string" identifies the data type
// "max" is the variable
max = "Have fun storming the castle!";
Console.WriteLine(max);
}
string max; // "string" identifies the data type
// "max" is the variable
max = "Have fun storming the castle!";
Console.WriteLine(max);
}
#endregion INCLUDE
}
#endregion INCLUDE
23 changes: 11 additions & 12 deletions src/Chapter01/Listing01.13.DeclaringTwoVariablesWithinOneStatement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_13
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_13;

public class HelloWorld
{
public class HelloWorld
public static void Main()
{
public static void Main()
{
#region INCLUDE
string message1, message2;
#endregion INCLUDE
#region INCLUDE
string message1, message2;
#endregion INCLUDE

message1 = "My name is Inigo Montoya.";;
message2 = "You killed my father....";
message1 = "My name is Inigo Montoya.";;
message2 = "You killed my father....";

Console.WriteLine(message1);
Console.WriteLine(message2);
}
Console.WriteLine(message1);
Console.WriteLine(message2);
}
}
35 changes: 17 additions & 18 deletions src/Chapter01/Listing01.14.ChangingTheValueOfAVariable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_14
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_14;

#region INCLUDE
public class StormingTheCastle
{
#region INCLUDE
public class StormingTheCastle
public static void Main()
{
public static void Main()
{
string valerie;
#region HIGHLIGHT
string miracleMax = "Have fun storming the castle!";
string valerie;
#region HIGHLIGHT
string miracleMax = "Have fun storming the castle!";

valerie = "Think it will work?";
#endregion HIGHLIGHT
valerie = "Think it will work?";
#endregion HIGHLIGHT

Console.WriteLine(miracleMax);
Console.WriteLine(valerie);
Console.WriteLine(miracleMax);
Console.WriteLine(valerie);

#region HIGHLIGHT
miracleMax = "It would take a miracle.";
#endregion HIGHLIGHT
Console.WriteLine(miracleMax);
}
#region HIGHLIGHT
miracleMax = "It would take a miracle.";
#endregion HIGHLIGHT
Console.WriteLine(miracleMax);
}
#endregion INCLUDE
}
#endregion INCLUDE
25 changes: 12 additions & 13 deletions src/Chapter01/Listing01.15.AssignmentReturningAValueThatCanBeassignedAgain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_15
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_15;

#region INCLUDE
public class StormingTheCastle
{
#region INCLUDE
public class StormingTheCastle
public static void Main()
{
public static void Main()
{
// ...
string requirements, miracleMax;
requirements = miracleMax = "It would take a miracle.";
#region EXCLUDE
Console.WriteLine(miracleMax);
#endregion EXCLUDE
}
// ...
string requirements, miracleMax;
requirements = miracleMax = "It would take a miracle.";
#region EXCLUDE
Console.WriteLine(miracleMax);
#endregion EXCLUDE
}
#endregion INCLUDE
}
#endregion INCLUDE
27 changes: 13 additions & 14 deletions src/Chapter01/Listing01.16.UsingSystemConsoleReadLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_16
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_16;

#region INCLUDE
public class HeyYou
{
#region INCLUDE
public class HeyYou
public static void Main()
{
public static void Main()
{
string firstName;
string lastName;
string firstName;
string lastName;

Console.WriteLine("Hey you!");
Console.WriteLine("Hey you!");

Console.Write("Enter your first name: ");
firstName = Console.ReadLine();
Console.Write("Enter your first name: ");
firstName = Console.ReadLine();

Console.Write("Enter your last name: ");
lastName = Console.ReadLine();
}
Console.Write("Enter your last name: ");
lastName = Console.ReadLine();
}
#endregion INCLUDE
}
#endregion INCLUDE
23 changes: 11 additions & 12 deletions src/Chapter01/Listing01.17.UsingSystemConsoleRead.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_17
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_17;

public class Program
{
public class Program
public static void Main()
{
public static void Main()
{
#region INCLUDE
int readValue;
char character;
readValue = Console.Read();
character = (char) readValue;
Console.Write(character);
#endregion INCLUDE
}
#region INCLUDE
int readValue;
char character;
readValue = Console.Read();
character = (char) readValue;
Console.Write(character);
#endregion INCLUDE
}
}
35 changes: 17 additions & 18 deletions src/Chapter01/Listing01.18.FormattingUsingStringInterpolation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_18
namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing01_18;

#region INCLUDE
public class HeyYou
{
#region INCLUDE
public class HeyYou
public static void Main()
{
public static void Main()
{
string firstName;
string lastName;
string firstName;
string lastName;

Console.WriteLine("Hey you!");
Console.WriteLine("Hey you!");

Console.Write("Enter your first name: ");
firstName = Console.ReadLine();
Console.Write("Enter your first name: ");
firstName = Console.ReadLine();

Console.Write("Enter your last name: ");
lastName = Console.ReadLine();
Console.Write("Enter your last name: ");
lastName = Console.ReadLine();

Console.WriteLine(
#region HIGHLIGHT
$"Your full name is { firstName } { lastName }.");
#endregion HIGHLIGHT
}
Console.WriteLine(
#region HIGHLIGHT
$"Your full name is { firstName } { lastName }.");
#endregion HIGHLIGHT
}
#endregion INCLUDE
}
#endregion INCLUDE
Loading