Skip to content

Commit a31032e

Browse files
mzorecmzorec
committed
Moves FlubuCore Web Api deployment scripts from BuildScript to seperate project.
1 parent 01bb4be commit a31032e

File tree

11 files changed

+65
-28
lines changed

11 files changed

+65
-28
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,3 +139,5 @@ src/GlobalToolTest/.vs/
139139
src/FlubuCore.ConsoleTestApp/.vs/
140140
src/FlubuCore.ConsoleTestApp/bin/
141141
src/FlubuCore.ConsoleTestApp/obj/
142+
src/Deploy/bin/
143+
src/Deploy/obj/

‎src/Build.csproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
<Compile Remove=".vs\**" />
1010
<Compile Remove="Backup1\**" />
1111
<Compile Remove="Backup\**" />
12+
<Compile Remove="BuildScript\bin\**" />
1213
<Compile Remove="build\**" />
14+
<Compile Remove="Deploy\**" />
1315
<Compile Remove="dotnet-flubu\**" />
1416
<Compile Remove="Flubu.SystemTests\**" />
1517
<Compile Remove="Flubu.Tests\**" />
@@ -38,13 +40,16 @@
3840
<Compile Remove="GlobalToolTest\**" />
3941
<Compile Remove="Nuget\**" />
4042
<Compile Remove="output\**" />
43+
<Compile Remove="packages\**" />
4144
<Compile Remove="Template\**" />
4245
<Compile Remove="tools\**" />
4346
<EmbeddedResource Remove=".git\**" />
4447
<EmbeddedResource Remove=".vs\**" />
4548
<EmbeddedResource Remove="Backup1\**" />
4649
<EmbeddedResource Remove="Backup\**" />
50+
<EmbeddedResource Remove="BuildScript\bin\**" />
4751
<EmbeddedResource Remove="build\**" />
52+
<EmbeddedResource Remove="Deploy\**" />
4853
<EmbeddedResource Remove="dotnet-flubu\**" />
4954
<EmbeddedResource Remove="Flubu.SystemTests\**" />
5055
<EmbeddedResource Remove="Flubu.Tests\**" />
@@ -73,13 +78,16 @@
7378
<EmbeddedResource Remove="GlobalToolTest\**" />
7479
<EmbeddedResource Remove="Nuget\**" />
7580
<EmbeddedResource Remove="output\**" />
81+
<EmbeddedResource Remove="packages\**" />
7682
<EmbeddedResource Remove="Template\**" />
7783
<EmbeddedResource Remove="tools\**" />
7884
<None Remove=".git\**" />
7985
<None Remove=".vs\**" />
8086
<None Remove="Backup1\**" />
8187
<None Remove="Backup\**" />
88+
<None Remove="BuildScript\bin\**" />
8289
<None Remove="build\**" />
90+
<None Remove="Deploy\**" />
8391
<None Remove="dotnet-flubu\**" />
8492
<None Remove="Flubu.SystemTests\**" />
8593
<None Remove="Flubu.Tests\**" />
@@ -108,6 +116,7 @@
108116
<None Remove="GlobalToolTest\**" />
109117
<None Remove="Nuget\**" />
110118
<None Remove="output\**" />
119+
<None Remove="packages\**" />
111120
<None Remove="Template\**" />
112121
<None Remove="tools\**" />
113122
</ItemGroup>
@@ -126,13 +135,7 @@
126135
<DotNetCliToolReference Include="dotnet-flubu" Version="5.1.1" />
127136
</ItemGroup>
128137
<ItemGroup>
129-
<None Include="BuildScript\NetCore2.0\Deploy.csproj" />
130-
<None Include="BuildScript\NetCore3.1\Deploy.csproj" />
131-
</ItemGroup>
132-
<ItemGroup>
133-
<PackageReference Include="LiteDB" Version="4.1.2" />
134-
</ItemGroup>
135-
<ItemGroup>
136-
<ProjectReference Include="FlubuCore.WebApi\FlubuCore.WebApi.csproj" />
138+
<PackageReference Include="FlubuCore" Version="5.1.1" />
137139
</ItemGroup>
140+
138141
</Project>

‎src/BuildScript/BuildScript.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ public void PackageWebApi(ITarget target)
265265
.AddTask(x => x.PackageTask(Output.CombineWith("WebApiPackages\\net462"))
266266
.AddDirectoryToPackage(@"FlubuCore.WebApi\bin\Release\net462\win7-x64\publish", "FlubuCore.WebApi", true)
267267
.AddDirectoryToPackage(@"FlubuCore.WebApi.Updater\bin\Release\net462", "FlubuCore.WebApi", true)
268-
.AddFileToPackage("BuildScript\\DeployScript.cs", "")
269-
.AddFileToPackage("BuildScript\\DeploymentConfig.json", "")
268+
.AddFileToPackage("Deploy\\DeployScript.cs", "")
269+
.AddFileToPackage("Deploy\\DeploymentConfig.json", "")
270270
.AddFileToPackage(Output.CombineWith("flubu.exe"), "")
271271
.AddFileToPackage(Output.CombineWith("flubu.exe.config"), "")
272272
.AddFileToPackage(Output.CombineWith("FlubuCore.dll"), "")
@@ -281,8 +281,8 @@ public void PackageWebApi(ITarget target)
281281
.AddTask(x => x.PackageTask(Output.CombineWith("WebApiPackages\\NetCore2.0\\Windows"))
282282
.AddDirectoryToPackage(@"FlubuCore.WebApi\bin\Release\netcoreapp2.0\publish", "FlubuCore.WebApi", true)
283283
.AddDirectoryToPackage(@"FlubuCore.WebApi.Updater\bin\Release\netcoreapp2.0", "FlubuCore.WebApi", true)
284-
.AddFileToPackage("BuildScript\\DeploymentScript.cs", "")
285-
.AddFileToPackage("BuildScript\\DeploymentConfig.json", "")
284+
.AddFileToPackage("Deploy\\DeploymentScript.cs", "")
285+
.AddFileToPackage("Deploy\\DeploymentConfig.json", "")
286286
.AddFileToPackage("output\\flubu.exe", "")
287287
.AddFileToPackage("output\\flubu.exe.config", "")
288288
.AddFileToPackage("output\\FlubuCore.dll", "")
@@ -297,8 +297,8 @@ public void PackageWebApi(ITarget target)
297297
.AddTask(x => x.PackageTask(Output.CombineWith("WebApiPackages\\NetCore2.1\\Windows"))
298298
.AddDirectoryToPackage(@"FlubuCore.WebApi\bin\Release\netcoreapp2.1\publish", "FlubuCore.WebApi", true)
299299
.AddDirectoryToPackage(@"FlubuCore.WebApi.Updater\bin\Release\netcoreapp2.0", "FlubuCore.WebApi", true)
300-
.AddFileToPackage("BuildScript\\DeploymentScript.cs", "")
301-
.AddFileToPackage("BuildScript\\DeploymentConfig.json", "")
300+
.AddFileToPackage("Deploy\\DeploymentScript.cs", "")
301+
.AddFileToPackage("Deploy\\DeploymentConfig.json", "")
302302
.AddFileToPackage("output\\flubu.exe", "")
303303
.AddFileToPackage("output\\flubu.exe.config", "")
304304
.AddFileToPackage("output\\FlubuCore.dll", "")
@@ -313,10 +313,10 @@ public void PackageWebApi(ITarget target)
313313
.AddTask(x => x.PackageTask(Output.CombineWith("WebApiPackages\\NetCore2.0\\Linux"))
314314
.AddDirectoryToPackage(@"FlubuCore.WebApi\bin\Release\netcoreapp2.0\publish", "FlubuCore.WebApi", true)
315315
.AddDirectoryToPackage(@"FlubuCore.WebApi.Updater\bin\Release\netcoreapp2.0", "FlubuCore.WebApi", true)
316-
.AddFileToPackage("BuildScript\\DeploymentScript.cs", "")
317-
.AddFileToPackage("BuildScript\\DeploymentConfig.json", "")
318-
.AddFileToPackage("BuildScript\\NetCore2.0\\Deploy.csproj", "")
319-
.AddFileToPackage("BuildScript\\Deploy.bat", "")
316+
.AddFileToPackage("Deploy\\DeploymentScript.cs", "")
317+
.AddFileToPackage("Deploy\\DeploymentConfig.json", "")
318+
.AddFileToPackage("Deploy\\NetCore2.0\\Deploy.csproj", "")
319+
.AddFileToPackage("Deploy\\Deploy.bat", "")
320320
.AddFileToPackage(@"packages\Newtonsoft.Json\12.0.3\lib\netstandard1.3\Newtonsoft.Json.dll", "lib")
321321
.AddFileToPackage(@"packages\litedb\4.1.2\lib\netstandard2.0\LiteDB.dll", "lib")
322322
.AddFileToPackage(@"packages\litedb\4.1.2\lib\netstandard2.0\LiteDB.dll", "")
@@ -328,10 +328,10 @@ public void PackageWebApi(ITarget target)
328328
.AddTask(x => x.PackageTask(Output.CombineWith("WebApiPackages\\NetCore2.1\\Linux"))
329329
.AddDirectoryToPackage(@"FlubuCore.WebApi\bin\Release\netcoreapp2.1\publish", "FlubuCore.WebApi", true)
330330
.AddDirectoryToPackage(@"FlubuCore.WebApi.Updater\bin\Release\netcoreapp2.0", "FlubuCore.WebApi", true)
331-
.AddFileToPackage("BuildScript\\DeploymentScript.cs", "")
332-
.AddFileToPackage("BuildScript\\DeploymentConfig.json", "")
333-
.AddFileToPackage("BuildScript\\NetCore2.0\\Deploy.csproj", "")
334-
.AddFileToPackage("BuildScript\\Deploy.bat", "")
331+
.AddFileToPackage("Deploy\\DeploymentScript.cs", "")
332+
.AddFileToPackage("Deploy\\DeploymentConfig.json", "")
333+
.AddFileToPackage("Deploy\\NetCore2.0\\Deploy.csproj", "")
334+
.AddFileToPackage("Deploy\\Deploy.bat", "")
335335
.AddFileToPackage(@"packages\Newtonsoft.Json\12.0.3\lib\netstandard1.3\Newtonsoft.Json.dll", "lib")
336336
.AddFileToPackage(@"packages\litedb\4.1.2\lib\netstandard2.0\LiteDB.dll", "lib")
337337
.AddFileToPackage(@"packages\System.Reflection.TypeExtensions.dll", "lib")
@@ -342,10 +342,10 @@ public void PackageWebApi(ITarget target)
342342
.AddTask(x => x.PackageTask(Output.CombineWith("WebApiPackages\\NetCore3.1\\Linux"))
343343
.AddDirectoryToPackage(@"FlubuCore.WebApi\bin\Release\netcoreapp3.1\publish", "FlubuCore.WebApi", true)
344344
.AddDirectoryToPackage(@"FlubuCore.WebApi.Updater\bin\Release\netcoreapp2.0", "FlubuCore.WebApi", true)
345-
.AddFileToPackage("BuildScript\\DeploymentScript.cs", "")
346-
.AddFileToPackage("BuildScript\\DeploymentConfig.json", "")
347-
.AddFileToPackage("BuildScript\\NetCore3.1\\Deploy.csproj", "")
348-
.AddFileToPackage("BuildScript\\Deploy.bat", "")
345+
.AddFileToPackage("Deploy\\DeploymentScript.cs", "")
346+
.AddFileToPackage("Deploy\\DeploymentConfig.json", "")
347+
.AddFileToPackage("Deploy\\NetCore3.1\\Deploy.csproj", "")
348+
.AddFileToPackage("Deployt\\Deploy.bat", "")
349349
.AddFileToPackage(@"packages\Newtonsoft.Json\12.0.3\lib\netstandard1.3\Newtonsoft.Json.dll", "lib")
350350
.AddFileToPackage(@"packages\litedb\4.1.2\lib\netstandard2.0\LiteDB.dll", "lib")
351351
.AddFileToPackage(@"packages\System.Reflection.TypeExtensions.dll", "lib")
@@ -356,8 +356,8 @@ public void PackageWebApi(ITarget target)
356356
.AddTask(x => x.PackageTask(Output.CombineWith("WebApiPackages\\NetCore3.1\\Windows"))
357357
.AddDirectoryToPackage(@"FlubuCore.WebApi\bin\Release\netcoreapp3.1\publish", "FlubuCore.WebApi", true)
358358
.AddDirectoryToPackage(@"FlubuCore.WebApi.Updater\bin\Release\netcoreapp2.0", "FlubuCore.WebApi", true)
359-
.AddFileToPackage("BuildScript\\DeploymentScript.cs", "")
360-
.AddFileToPackage("BuildScript\\DeploymentConfig.json", "")
359+
.AddFileToPackage("Deploy\\DeploymentScript.cs", "")
360+
.AddFileToPackage("Deploy\\DeploymentConfig.json", "")
361361
.AddFileToPackage("output\\flubu.exe", "")
362362
.AddFileToPackage("output\\flubu.exe.config", "")
363363
.AddFileToPackage("output\\FlubuCore.dll", "")

src/BuildScript/Deploy.bat renamed to src/Deploy/Deploy.bat

File renamed without changes.

‎src/Deploy/Deploy.csproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<None Include="NetCore2.0\Deploy.csproj" />
9+
<None Include="NetCore3.1\Deploy.csproj" />
10+
</ItemGroup>
11+
<ItemGroup>
12+
13+
<PackageReference Include="LiteDB" Version="4.1.2" />
14+
</ItemGroup>
15+
<ItemGroup>
16+
<ProjectReference Include="..\FlubuCore.WebApi\FlubuCore.WebApi.csproj" />
17+
</ItemGroup>
18+
</Project>

src/BuildScript/DeployScript.cs renamed to src/Deploy/DeployScript.cs

File renamed without changes.

src/BuildScript/DeploymentConfig.json renamed to src/Deploy/DeploymentConfig.json

File renamed without changes.

src/BuildScript/DeploymentScript.cs renamed to src/Deploy/DeploymentScript.cs

File renamed without changes.

src/BuildScript/NetCore2.0/Deploy.csproj renamed to src/Deploy/NetCore2.0/Deploy.csproj

File renamed without changes.

src/BuildScript/NetCore3.1/Deploy.csproj renamed to src/Deploy/NetCore3.1/Deploy.csproj

File renamed without changes.

0 commit comments

Comments
 (0)