diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/tests/test_cookiecutter.py b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/tests/test_cookiecutter.py
index 285b06b26c..987385e1fd 100644
--- a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/tests/test_cookiecutter.py
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/tests/test_cookiecutter.py
@@ -19,7 +19,7 @@ def test_project_tree(cookies):
assert result.project.join('src', 'HelloWorld').isdir()
assert result.project.join(
'src', 'HelloWorld', 'HelloWorld.csproj').isfile()
- assert result.project.join('src', 'HelloWorld', 'Program.cs').isfile()
+ assert result.project.join('src', 'HelloWorld', 'Function.cs').isfile()
assert result.project.join(
'src', 'HelloWorld', 'aws-lambda-tools-defaults.json').isfile()
assert result.project.join(
@@ -30,7 +30,7 @@ def test_project_tree(cookies):
def test_app_content(cookies):
result = cookies.bake(extra_context={'project_name': 'my_lambda'})
- app_file = result.project.join('src', 'HelloWorld', 'Program.cs')
+ app_file = result.project.join('src', 'HelloWorld', 'Function.cs')
app_content = app_file.readlines()
app_content = ''.join(app_content)
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/omnisharp.json b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/omnisharp.json
new file mode 100644
index 0000000000..c42f8db91c
--- /dev/null
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/omnisharp.json
@@ -0,0 +1,11 @@
+{
+ "fileOptions": {
+ "excludeSearchPatterns": [
+ "**/bin/**/*",
+ "**/obj/**/*"
+ ]
+ },
+ "msbuild": {
+ "Platform": "rhel.7.2-x64"
+ }
+}
\ No newline at end of file
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Program.cs b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Function.cs
similarity index 100%
rename from samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Program.cs
rename to samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/Function.cs
diff --git a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/HelloWorld.Tests.csproj b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/HelloWorld.Tests.csproj
index 9aec67ead9..50148be3a2 100644
--- a/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/HelloWorld.Tests.csproj
+++ b/samcli/local/init/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/test/HelloWorld.Test/HelloWorld.Tests.csproj
@@ -10,12 +10,11 @@
-
-
-
-
-
-
+
+
+
+
+