Skip to content

Commit 1c4b342

Browse files
authored
Merge pull request #9 from gitFerdo/dev
Dev
2 parents cfaae20 + 2130603 commit 1c4b342

15 files changed

+46
-17
lines changed

Giraffe/Program.cs

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,47 @@ class Program
1010
{
1111
static void Main(string[] args)
1212
{
13-
string color, pluralNoun, celebrity;
13+
Console.WriteLine(GetMax(20, 10));
1414

15-
Console.Write("Enter a color: ");
16-
color = Console.ReadLine();
15+
Console.WriteLine(GetMax2(10, 30, 5));
1716

18-
Console.Write("Enter a plural noun: ");
19-
pluralNoun = Console.ReadLine();
17+
// Console.ReadLine();
18+
}
19+
20+
static int GetMax(int num1, int num2)
21+
{
22+
int result;
2023

21-
Console.Write("Enter a celebrity: ");
22-
celebrity = Console.ReadLine();
24+
if (num1 > num2)
25+
{
26+
result = num1;
27+
}
28+
else
29+
{
30+
result = num2;
31+
}
32+
return result;
33+
}
34+
35+
// Comparison operator method
36+
static int GetMax2(int num1, int num2, int num3)
37+
{
38+
int result;
2339

24-
Console.WriteLine("Roses are " + color);
25-
Console.WriteLine(pluralNoun + " are blue");
26-
Console.WriteLine("I Love " + celebrity);
40+
if (num1 >= num2 && num1 >= num3)
41+
{
42+
result = num1;
43+
}
44+
else if (num2 >= num1 && num2 >= num3)
45+
{
46+
result = num2;
47+
}
48+
else
49+
{
50+
result = num3;
51+
}
2752

28-
// Console.ReadLine();
53+
return result;
2954
}
3055
}
3156
}

Giraffe/bin/Debug/net8.0/Giraffe.dll

-512 Bytes
Binary file not shown.

Giraffe/bin/Debug/net8.0/Giraffe.exe

0 Bytes
Binary file not shown.

Giraffe/bin/Debug/net8.0/Giraffe.pdb

136 Bytes
Binary file not shown.

Giraffe/obj/Debug/net8.0/Giraffe.AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[assembly: System.Reflection.AssemblyCompanyAttribute("Giraffe")]
1414
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
1515
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
16-
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+31b78044f7a53fcb41f6cd88a19c80a46a8c9c11")]
16+
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+003a91e7249e9cd7b0282899b22c32d1cacd2c69")]
1717
[assembly: System.Reflection.AssemblyProductAttribute("Giraffe")]
1818
[assembly: System.Reflection.AssemblyTitleAttribute("Giraffe")]
1919
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a2cad0ae8fe381d245fe61e7979bc6785bad549330a0bb64796ca67a4d9373fd
1+
48d380c669163f93ca971d91106253b45e4e0ac5c639eb840379a4e6de3a187d

Giraffe/obj/Debug/net8.0/Giraffe.dll

-512 Bytes
Binary file not shown.

Giraffe/obj/Debug/net8.0/Giraffe.pdb

136 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"documents":{"D:\\Amasha\\learn\\.net-project\\*":"https://raw.githubusercontent.com/gitFerdo/.net-project/31b78044f7a53fcb41f6cd88a19c80a46a8c9c11/*"}}
1+
{"documents":{"D:\\Amasha\\learn\\.net-project\\*":"https://raw.githubusercontent.com/gitFerdo/.net-project/003a91e7249e9cd7b0282899b22c32d1cacd2c69/*"}}

Giraffe/obj/Debug/net8.0/apphost.exe

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)