Skip to content

Commit a4fd35c

Browse files
committed
Refactor location of some solution items
1 parent bbab85a commit a4fd35c

File tree

8 files changed

+52
-15
lines changed

8 files changed

+52
-15
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,5 @@ UpgradeLog*.htm
183183
# Microsoft Fakes
184184
FakesAssemblies/
185185

186-
# Config file
187-
IntegrationEngine.json
188-
189186
# NuGet
190187
*.nupkg

IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,17 @@
9191
</ProjectReference>
9292
</ItemGroup>
9393
<ItemGroup>
94+
<None Include="..\configuration\IntegrationEngine.json">
95+
<Link>IntegrationEngine.json</Link>
96+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
97+
</None>
9498
<None Include="packages.config" />
9599
<None Include="RScripts\CarReport.R">
96100
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
97101
</None>
98102
<None Include="App.config">
99103
<SubType>Designer</SubType>
100104
</None>
101-
<None Include="IntegrationEngine.json">
102-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
103-
</None>
104105
</ItemGroup>
105106
<ItemGroup />
106107
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

IntegrationEngine.Tests/IntegrationEngine.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<Compile Include="EngineHostConfigurationTest.cs" />
6565
</ItemGroup>
6666
<ItemGroup>
67-
<None Include="..\IntegrationEngine\Configuration\IntegrationEngine.json">
67+
<None Include="..\configuration\IntegrationEngine.json">
6868
<Link>IntegrationEngine.json</Link>
6969
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7070
</None>

IntegrationEngine.sln

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{DB65240B-C161-4B58-9EA8-3B490A36921E}"
1111
ProjectSection(SolutionItems) = preProject
1212
.gitignore = .gitignore
13-
package.cmd = package.cmd
1413
README.md = README.md
15-
release.cmd = release.cmd
1614
EndProjectSection
1715
EndProject
1816
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationEngine.Core", "IntegrationEngine.Core\IntegrationEngine.Core.csproj", "{3F3794D7-4078-4D26-954C-7864173EDD86}"
@@ -30,6 +28,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A9C5DD
3028
EndProject
3129
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationEngine.Tests", "IntegrationEngine.Tests\IntegrationEngine.Tests.csproj", "{820C4703-46CF-4C65-AB32-961170D96E46}"
3230
EndProject
31+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E54079EA-35EE-4F75-9FF9-99A97EC0A831}"
32+
ProjectSection(SolutionItems) = preProject
33+
build\package.cmd = build\package.cmd
34+
build\release.cmd = build\release.cmd
35+
EndProjectSection
36+
EndProject
37+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "configuration", "configuration", "{71DC7D2A-17FC-4B14-9D1E-19E4BC8A8190}"
38+
ProjectSection(SolutionItems) = preProject
39+
configuration\IntegrationEngine.json = configuration\IntegrationEngine.json
40+
EndProjectSection
41+
EndProject
3342
Global
3443
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3544
Debug|Any CPU = Debug|Any CPU
@@ -106,6 +115,10 @@ Global
106115
GlobalSection(SolutionProperties) = preSolution
107116
HideSolutionNode = FALSE
108117
EndGlobalSection
118+
GlobalSection(NestedProjects) = preSolution
119+
{E54079EA-35EE-4F75-9FF9-99A97EC0A831} = {DB65240B-C161-4B58-9EA8-3B490A36921E}
120+
{71DC7D2A-17FC-4B14-9D1E-19E4BC8A8190} = {DB65240B-C161-4B58-9EA8-3B490A36921E}
121+
EndGlobalSection
109122
GlobalSection(Performance) = preSolution
110123
HasPerformanceSessions = true
111124
EndGlobalSection

IntegrationEngine/IntegrationEngine.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
147147
<ItemGroup>
148148
<None Include="App.Config" />
149-
<None Include="Configuration\IntegrationEngine.json" />
150149
<None Include="package.nuspec">
151150
<SubType>Designer</SubType>
152151
</None>
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"WebApi": {
3+
"HostName": "localhost",
4+
"Port": 9001
5+
},
6+
"MessageQueue": {
7+
"QueueName": "myqueue",
8+
"ExchangeName": "amq.direct",
9+
"UserName": "guest",
10+
"Password": "guest",
11+
"HostName": "localhost",
12+
"VirtualHost": "/"
13+
},
14+
"Elasticsearch": {
15+
"Protocol": "http",
16+
"HostName": "localhost",
17+
"Port": 9200,
18+
"DefaultIndex": "integration-engine"
19+
},
20+
"Mail": {
21+
"HostName": "localhost",
22+
"Port": 25
23+
},
24+
"Database": {
25+
"ServerType": "SQLServer",
26+
"HostName": "localhost",
27+
"Port": 1433,
28+
"DatabaseName": "IntegrationEngine",
29+
"UserName": "inengine",
30+
"Password": "secret"
31+
}
32+
}

package.cmd

Lines changed: 0 additions & 4 deletions
This file was deleted.

release.cmd

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)