From 5b353c09c2992ada85cdf42a33136a80b3e608ca Mon Sep 17 00:00:00 2001 From: harshalschaudhari Date: Wed, 29 Aug 2018 08:41:24 +0530 Subject: [PATCH 1/3] Hello Word Commiting to integration branch Hello word program. Commiting to Integration. --- HelloWord/.gitattributes | 63 +++++++ HelloWord/.gitignore | 156 ++++++++++++++++++ HelloWord/HelloWord.sln | 22 +++ HelloWord/HelloWord/App.config | 6 + HelloWord/HelloWord/HelloWord.csproj | 58 +++++++ HelloWord/HelloWord/Program.cs | 17 ++ .../HelloWord/Properties/AssemblyInfo.cs | 36 ++++ 7 files changed, 358 insertions(+) create mode 100644 HelloWord/.gitattributes create mode 100644 HelloWord/.gitignore create mode 100644 HelloWord/HelloWord.sln create mode 100644 HelloWord/HelloWord/App.config create mode 100644 HelloWord/HelloWord/HelloWord.csproj create mode 100644 HelloWord/HelloWord/Program.cs create mode 100644 HelloWord/HelloWord/Properties/AssemblyInfo.cs diff --git a/HelloWord/.gitattributes b/HelloWord/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/HelloWord/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/HelloWord/.gitignore b/HelloWord/.gitignore new file mode 100644 index 0000000..1bc915c --- /dev/null +++ b/HelloWord/.gitignore @@ -0,0 +1,156 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets +!packages/*/build/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + + +#LightSwitch generated files +GeneratedArtifacts/ +_Pvt_Extensions/ +ModelManifest.xml + +# ========================= +# Windows detritus +# ========================= + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac desktop service store files +.DS_Store diff --git a/HelloWord/HelloWord.sln b/HelloWord/HelloWord.sln new file mode 100644 index 0000000..2f5b9cc --- /dev/null +++ b/HelloWord/HelloWord.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWord", "HelloWord\HelloWord.csproj", "{294CC734-2A51-4E21-9400-234FF170DA7E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {294CC734-2A51-4E21-9400-234FF170DA7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {294CC734-2A51-4E21-9400-234FF170DA7E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {294CC734-2A51-4E21-9400-234FF170DA7E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {294CC734-2A51-4E21-9400-234FF170DA7E}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/HelloWord/HelloWord/App.config b/HelloWord/HelloWord/App.config new file mode 100644 index 0000000..8e15646 --- /dev/null +++ b/HelloWord/HelloWord/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/HelloWord/HelloWord/HelloWord.csproj b/HelloWord/HelloWord/HelloWord.csproj new file mode 100644 index 0000000..90588b1 --- /dev/null +++ b/HelloWord/HelloWord/HelloWord.csproj @@ -0,0 +1,58 @@ + + + + + Debug + AnyCPU + {294CC734-2A51-4E21-9400-234FF170DA7E} + Exe + Properties + HelloWord + HelloWord + v4.5 + 512 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HelloWord/HelloWord/Program.cs b/HelloWord/HelloWord/Program.cs new file mode 100644 index 0000000..3edf803 --- /dev/null +++ b/HelloWord/HelloWord/Program.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HelloWord +{ + class Program + { + static void Main(string[] args) + { + Console.WriteLine("Hello Word!"); + Console.ReadKey(); + } + } +} diff --git a/HelloWord/HelloWord/Properties/AssemblyInfo.cs b/HelloWord/HelloWord/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..e3b35bf --- /dev/null +++ b/HelloWord/HelloWord/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("HelloWord")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("HelloWord")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("97cd931c-d2f3-4343-b42f-51e02d60d3a0")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] From 936d854f9e5507cb4b35276d76f31747de47f85d Mon Sep 17 00:00:00 2001 From: harshalschaudhari Date: Wed, 29 Aug 2018 08:49:47 +0530 Subject: [PATCH 2/3] Commit to Integration - 1 Change Commit to Integration - 1 Change --- HelloWord/HelloWord/Sample.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 HelloWord/HelloWord/Sample.txt diff --git a/HelloWord/HelloWord/Sample.txt b/HelloWord/HelloWord/Sample.txt new file mode 100644 index 0000000..8b0e052 --- /dev/null +++ b/HelloWord/HelloWord/Sample.txt @@ -0,0 +1 @@ +I want to commit this changes. \ No newline at end of file From 9649c1f98d70d78be3cad743a801a4f0301309e4 Mon Sep 17 00:00:00 2001 From: harshalschaudhari Date: Wed, 29 Aug 2018 09:06:20 +0530 Subject: [PATCH 3/3] Update Program.cs message Update Program.cs message --- HelloWord/HelloWord/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HelloWord/HelloWord/Program.cs b/HelloWord/HelloWord/Program.cs index 3edf803..4ac23b5 100644 --- a/HelloWord/HelloWord/Program.cs +++ b/HelloWord/HelloWord/Program.cs @@ -10,7 +10,7 @@ class Program { static void Main(string[] args) { - Console.WriteLine("Hello Word!"); + Console.WriteLine("Hello Harshal!"); Console.ReadKey(); } }