Removed "Sample" from sample environment names.

Author: Steve Ives

.gitignore

@@ -1,8 +1,6 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
-SampleData/*.is*
-
 # User-specific files
 *.suo
 *.user
@@ -264,10 +262,10 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
-/SampleXfplEnvironment/cmpdt.ism
-/SampleXfplEnvironment/cmpdt.is1
-/SampleXfplEnvironment/cdt.ism
-/SampleXfplEnvironment/cdt.is1
+/XfplEnvironment/cmpdt.ism
+/XfplEnvironment/cmpdt.is1
+/XfplEnvironment/cdt.ism
+/XfplEnvironment/cdt.is1
 /SampleData/*.ism
 /SampleData/*.is1
 /SampleData/*.ddf

HarmonyCore.sln

@@ -41,10 +41,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{
 		Templates\ODataUnitTests.tpl = Templates\ODataUnitTests.tpl
 	EndProjectSection
 EndProject
-Project("{BBD0F5D1-1CC4-42FD-BA4C-A96779C64378}") = "SampleServices", "SampleServices\SampleServices.synproj", "{24A1BBFD-2660-41E1-A4FC-90B7A13A4911}"
+Project("{BBD0F5D1-1CC4-42FD-BA4C-A96779C64378}") = "Services", "Services\Services.synproj", "{24A1BBFD-2660-41E1-A4FC-90B7A13A4911}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{ECDB0DFD-8865-4EEE-8256-025E04896880}"
 	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
 		Example Queries.txt = Example Queries.txt
 		ExampleJsonResponse.txt = ExampleJsonResponse.txt
 		MakeLinuxDistro.bat = MakeLinuxDistro.bat
@@ -54,7 +55,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		UserDefinedTokens.tkn = UserDefinedTokens.tkn
 	EndProjectSection
 EndProject
-Project("{BBD0F5D1-1CC4-42FD-BA4C-A96779C64378}") = "SampleServices.Test", "SampleServices.Test\SampleServices.Test.synproj", "{0B8D5276-8628-42D9-848E-421C0A0D81DF}"
+Project("{BBD0F5D1-1CC4-42FD-BA4C-A96779C64378}") = "Services.Test", "Services.Test\Services.Test.synproj", "{0B8D5276-8628-42D9-848E-421C0A0D81DF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleData", "SampleData", "{9977F09E-C08B-4E4C-900A-B06D532469AF}"
 	ProjectSection(SolutionItems) = preProject
@@ -81,7 +82,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TraditionalBridge", "Tradit
 		Templates\TraditionalBridge\ODataModel.tpl = Templates\TraditionalBridge\ODataModel.tpl
 	EndProjectSection
 EndProject
-Project("{BBD0F5D1-1CC4-42FD-BA4C-A96779C64378}") = "SampleXfplEnvironment", "SampleXfplEnvironment\SampleXfplEnvironment.synproj", "{FCF497B3-DE91-4C1E-8E7F-BE4151CC8119}"
+Project("{BBD0F5D1-1CC4-42FD-BA4C-A96779C64378}") = "XfplEnvironment", "XfplEnvironment\XfplEnvironment.synproj", "{FCF497B3-DE91-4C1E-8E7F-BE4151CC8119}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{23E9E063-53D3-4618-BD7A-FAFB67256B61}"
 	ProjectSection(SolutionItems) = preProject
@@ -119,7 +120,7 @@ Project("{BBD0F5D1-1CC4-42FD-BA4C-A96779C64378}") = "Harmony.OData", "Harmony.OD
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer", "IdentityServer\IdentityServer.csproj", "{8426B119-93FB-49DA-BA0D-38D5B4852495}"
 EndProject
-Project("{BBD0F5D1-1CC4-42FD-BA4C-A96779C64378}") = "SampleServices.Host", "SampleServices.Host\SampleServices.Host.synproj", "{A4087F94-430C-4781-8AB3-0983DDFC6C90}"
+Project("{BBD0F5D1-1CC4-42FD-BA4C-A96779C64378}") = "Services.Host", "Services.Host\Services.Host.synproj", "{A4087F94-430C-4781-8AB3-0983DDFC6C90}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

MakeLinuxDistro.bat

@@ -9,7 +9,7 @@ pushd %SolutionDir%
 if not exist distribution\linux\debug\.   mkdir distribution\linux\debug
 if not exist distribution\linux\release\. mkdir distribution\linux\release
 
-pushd SampleServices.Test
+pushd Services.Test
 echo Building debug distribution
 dotnet publish -c Debug   -r linux-x64 -o ..\distribution\linux\debug
 echo Building release distribution

MakeWindowsDistro.bat

@@ -9,7 +9,7 @@ pushd %SolutionDir%
 if not exist distribution\windows\debug\.   mkdir distribution\windows\debug
 rem if not exist distribution\windows\release\. mkdir distribution\windows\release
 
-pushd SampleServices.Test
+pushd Services.Test
 echo Building debug distribution
 dotnet publish -c Debug   -r win7-x64 -o ..\distribution\windows\debug
 rem echo Building release distribution