Skip to content

Commit 72234e4

Browse files
mythzmythz
committed
refactor build.projs/.csprojs to match others
1 parent bc825f5 commit 72234e4

File tree

36 files changed

+155
-88
lines changed

36 files changed

+155
-88
lines changed

‎build/build-sn.proj‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PropertyGroup>
1111
<BuildSolutionDir>$(MSBuildProjectDirectory)/..</BuildSolutionDir>
1212
<SrcDir>$(BuildSolutionDir)/src</SrcDir>
13-
<Configuration Condition="$(Configuration) == ''">Signed</Configuration>
13+
<Configuration>Signed</Configuration>
1414
<NUnitConsoleArgs>/noshadow</NUnitConsoleArgs>
1515
<NuGetPath>$(SrcDir)/.nuget/nuget.exe</NuGetPath>
1616
<NuGetPackageDir>$(BuildSolutionDir)/NuGet.Signed/</NuGetPackageDir>
@@ -33,7 +33,6 @@
3333
<Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)" />
3434

3535
<Target Name="TeamCityBuild">
36-
<!--<Copy SourceFiles="$(BuildSolutionDir)/tests/ServiceStack.Common.Tests/ci.app.config" DestinationFiles="$(BuildSolutionDir)/tests/ServiceStack.Common.Tests/app.config" />-->
3736
<CallTarget Targets="Default" />
3837
</Target>
3938

@@ -109,7 +108,7 @@
109108

110109
<MSBuild Projects="$(SrcDir)/ServiceStack.Api.Swagger/ServiceStack.Api.Swagger.Signed.csproj"
111110
Targets="Build"
112-
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
111+
Properties="Version=$(PackageVersion)" />
113112

114113
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Api.Swagger.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Api.Swagger.Signed/lib/net45')" />
115114
<Copy SourceFiles="%(SwaggerFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Api.Swagger.Signed/lib/net45" />
@@ -122,7 +121,7 @@
122121

123122
<MSBuild Projects="$(SrcDir)/ServiceStack.Api.OpenApi/ServiceStack.Api.OpenApi.Signed.csproj"
124123
Targets="Build"
125-
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
124+
Properties="Version=$(PackageVersion)" />
126125

127126
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Api.OpenApi.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Api.OpenApi.Signed/lib/net45')" />
128127
<Copy SourceFiles="%(OpenApiFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Api.OpenApi.Signed/lib/net45" />
@@ -133,7 +132,9 @@
133132

134133
<!-- ServiceStack.Client -->
135134

136-
<MSBuild Projects="../src/ServiceStack.Client/ServiceStack.Client.Signed.csproj" Properties="Configuration=$(Configuration)"/>
135+
<MSBuild Projects="../src/ServiceStack.Client/ServiceStack.Client.Signed.csproj"
136+
Targets="Build"
137+
Properties="Version=$(PackageVersion)" />
137138
<Copy SourceFiles="%(ClientFiles.Identity)" DestinationFolder="$(BuildSolutionDir)/lib/signed" />
138139

139140
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Client.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Client.Signed/lib/net45')" />
@@ -144,7 +145,9 @@
144145

145146
<!-- ServiceStack.HttpClient -->
146147

147-
<MSBuild Projects="../src/ServiceStack.HttpClient/ServiceStack.HttpClient.Signed.csproj" Properties="Configuration=$(Configuration)"/>
148+
<MSBuild Projects="../src/ServiceStack.HttpClient/ServiceStack.HttpClient.Signed.csproj"
149+
Targets="Build"
150+
Properties="Version=$(PackageVersion)" />
148151
<Copy SourceFiles="%(HttpClientFiles.Identity)" DestinationFolder="$(BuildSolutionDir)/lib/signed" />
149152

150153
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.HttpClient.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.HttpClient.Signed/lib/net45')" />
@@ -155,7 +158,9 @@
155158

156159
<!-- ServiceStack.Common -->
157160

158-
<MSBuild Projects="../src/ServiceStack.Common/ServiceStack.Common.Signed.csproj" Properties="Configuration=$(Configuration)"/>
161+
<MSBuild Projects="../src/ServiceStack.Common/ServiceStack.Common.Signed.csproj"
162+
Targets="Build"
163+
Properties="Version=$(PackageVersion)" />
159164
<Copy SourceFiles="%(CommonFiles.Identity)" DestinationFolder="$(BuildSolutionDir)/lib/signed" />
160165

161166
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Common.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Common.Signed/lib/net45')" />
@@ -166,7 +171,9 @@
166171

167172
<!-- ServiceStack -->
168173

169-
<MSBuild Projects="../src/ServiceStack/ServiceStack.Signed.csproj" Properties="Configuration=$(Configuration)"/>
174+
<MSBuild Projects="../src/ServiceStack/ServiceStack.Signed.csproj"
175+
Targets="Build"
176+
Properties="Version=$(PackageVersion)" />
170177
<Copy SourceFiles="%(ServiceStackFiles.Identity)" DestinationFolder="$(BuildSolutionDir)/lib/signed" />
171178

172179
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Signed/lib/net45')" />
@@ -177,7 +184,9 @@
177184

178185
<!-- ServiceStack.Server -->
179186

180-
<MSBuild Projects="../src/ServiceStack.Server/ServiceStack.Server.Signed.csproj" Properties="Configuration=$(Configuration)"/>
187+
<MSBuild Projects="../src/ServiceStack.Server/ServiceStack.Server.Signed.csproj"
188+
Targets="Build"
189+
Properties="Version=$(PackageVersion)" />
181190
<Copy SourceFiles="%(ServerFiles.Identity)" DestinationFolder="$(BuildSolutionDir)/lib/signed" />
182191

183192
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Server.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Server.Signed/lib/net45')" />
@@ -190,7 +199,7 @@
190199

191200
<MSBuild Projects="$(SrcDir)/ServiceStack.RabbitMq/ServiceStack.RabbitMq.Signed.csproj"
192201
Targets="Build"
193-
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
202+
Properties="Version=$(PackageVersion)" />
194203

195204
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.RabbitMq.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.RabbitMq.Signed/lib/net45')" />
196205
<Copy SourceFiles="%(RabbitMqFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.RabbitMq.Signed/lib/net45" />
@@ -200,7 +209,9 @@
200209

201210
<!-- ServiceStack.Razor -->
202211

203-
<MSBuild Projects="../src/ServiceStack.Razor/ServiceStack.Razor.Signed.csproj" Properties="Configuration=$(Configuration)"/>
212+
<MSBuild Projects="../src/ServiceStack.Razor/ServiceStack.Razor.Signed.csproj"
213+
Targets="Build"
214+
Properties="Version=$(PackageVersion)" />
204215
<Copy SourceFiles="%(RazorFiles.Identity)" DestinationFolder="$(BuildSolutionDir)/lib/signed" />
205216

206217
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Razor.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Razor.Signed/lib/net45')" />
@@ -213,7 +224,7 @@
213224

214225
<MSBuild Projects="$(SrcDir)/ServiceStack.ProtoBuf/ServiceStack.ProtoBuf.Signed.csproj"
215226
Targets="Build"
216-
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
227+
Properties="Version=$(PackageVersion)" />
217228

218229
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.ProtoBuf.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.ProtoBuf.Signed/lib/net45')" />
219230
<Copy SourceFiles="%(ProtoBufFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.ProtoBuf.Signed/lib/net45" />
@@ -225,7 +236,7 @@
225236

226237
<MSBuild Projects="$(SrcDir)/ServiceStack.Mvc/ServiceStack.Mvc.Signed.csproj"
227238
Targets="Build"
228-
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
239+
Properties="Version=$(PackageVersion)" />
229240

230241
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Mvc.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Mvc.Signed/lib/net45')" />
231242
<Copy SourceFiles="%(MvcFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Mvc.Signed/lib/net45" />
@@ -237,7 +248,7 @@
237248

238249
<MSBuild Projects="$(SrcDir)/ServiceStack.Authentication.OAuth2/ServiceStack.Authentication.OAuth2.Signed.csproj"
239250
Targets="Build"
240-
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
251+
Properties="Version=$(PackageVersion)" />
241252

242253
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Authentication.OAuth2.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Authentication.OAuth2.Signed/lib/net45')" />
243254
<Copy SourceFiles="%(OAuth2Files.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Authentication.OAuth2.Signed/lib/net45" />

‎build/build.proj‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,12 @@
3737
<CallTarget Targets="Default" />
3838
</Target>
3939

40-
<Target Name="Build">
41-
<MSBuild Projects="../src/ServiceStack.Interfaces/ServiceStack.Interfaces.csproj" Properties="Configuration=$(Configuration)"/>
42-
<MSBuild Projects="../src/ServiceStack.Common/ServiceStack.Common.csproj" Properties="Configuration=$(Configuration)"/>
43-
<MSBuild Projects="../src/ServiceStack/ServiceStack.csproj" Properties="Configuration=$(Configuration)"/>
44-
</Target>
45-
4640
<Target Name="BuildSolutions">
47-
<MSBuild Projects="$(SrcDir)/ServiceStack.sln" Targets="Restore;Build"
41+
<MSBuild Projects="$(SrcDir)/ServiceStack.sln" Targets="Build"
4842
Properties="Configuration=$(Configuration)" />
4943

50-
<MSBuild Projects="$(SrcDir)/ServiceStack.Logging.sln" Targets="Restore;Build"
44+
<MSBuild Projects="$(SrcDir)/ServiceStack.Logging.sln" Targets="Build"
5145
Properties="Configuration=$(Configuration)" />
52-
53-
<!-- TODO re-add SL5 after re-factor -->
54-
<!--<MSBuild Projects="$(SrcDir)/ServiceStack.SL5.sln" Targets="Build"
55-
Properties="Configuration=$(Configuration)" />-->
5646
</Target>
5747

5848
<Target Name="UpdateVersion">

‎src/ServiceStack.Api.OpenApi/ServiceStack.Api.OpenApi.Signed.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFrameworks>net45</TargetFrameworks>
55
<AssemblyName>ServiceStack.Api.OpenApi</AssemblyName>
66
<PackageId>ServiceStack.Api.OpenApi.Signed</PackageId>
7+
<Configuration>Signed</Configuration>
78
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
89
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
910
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -18,8 +19,9 @@
1819
<AssemblyOriginatorKeyFile>servicestack-sn.pfx</AssemblyOriginatorKeyFile>
1920
</PropertyGroup>
2021

21-
<PropertyGroup Condition="'$(Configuration)'!='Debug'">
22-
<DocumentationFile>bin\Release\$(Configuration)\ServiceStack.Api.OpenApi.xml</DocumentationFile>
22+
<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
23+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
24+
<Optimize>true</Optimize>
2325
</PropertyGroup>
2426

2527
<ItemGroup>

‎src/ServiceStack.Api.OpenApi/ServiceStack.Api.OpenApi.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
1616
</PropertyGroup>
1717

18+
<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
19+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
20+
<Optimize>true</Optimize>
21+
</PropertyGroup>
22+
1823
<ItemGroup>
1924
<EmbeddedResource Include="swagger-ui\**\*.*" Exclude="bin\**;obj\**;@(EmbeddedResource)" />
2025
</ItemGroup>
2126

22-
<PropertyGroup Condition="'$(Configuration)'!='Debug'">
23-
<DocumentationFile>bin\Release\$(Configuration)\ServiceStack.Api.OpenApi.xml</DocumentationFile>
24-
</PropertyGroup>
25-
2627
<ItemGroup>
2728
<Reference Include="..\..\lib\pcl\ServiceStack.Interfaces.dll" />
2829
<ProjectReference Include="..\ServiceStack.Client\ServiceStack.Client.csproj" />

‎src/ServiceStack.Api.Swagger/ServiceStack.Api.Swagger.Signed.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFrameworks>net45</TargetFrameworks>
55
<AssemblyName>ServiceStack.Api.Swagger</AssemblyName>
66
<PackageId>ServiceStack.Api.Swagger.Signed</PackageId>
7+
<Configuration>Signed</Configuration>
78
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
89
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
910
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -18,8 +19,9 @@
1819
<AssemblyOriginatorKeyFile>servicestack-sn.pfx</AssemblyOriginatorKeyFile>
1920
</PropertyGroup>
2021

21-
<PropertyGroup Condition="'$(Configuration)'!='Debug'">
22-
<DocumentationFile>bin\Release\$(Configuration)\ServiceStack.Api.Swagger.xml</DocumentationFile>
22+
<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
23+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
24+
<Optimize>true</Optimize>
2325
</PropertyGroup>
2426

2527
<ItemGroup>

‎src/ServiceStack.Authentication.MongoDb/ServiceStack.Authentication.MongoDb.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
1515
</PropertyGroup>
1616

17-
<PropertyGroup Condition="'$(Configuration)'!='Debug'">
18-
<DocumentationFile>bin\Release\$(Configuration)\ServiceStack.Authentication.MongoDb.xml</DocumentationFile>
17+
<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
18+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
19+
<Optimize>true</Optimize>
1920
</PropertyGroup>
2021

2122
<ItemGroup>

‎src/ServiceStack.Authentication.NHibernate/ServiceStack.Authentication.NHibernate.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
1515
</PropertyGroup>
1616

17-
<PropertyGroup Condition="'$(Configuration)'!='Debug'">
18-
<DocumentationFile>bin\Release\$(Configuration)\ServiceStack.Authentication.NHibernate.xml</DocumentationFile>
17+
<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
18+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
19+
<Optimize>true</Optimize>
1920
</PropertyGroup>
2021

2122
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

‎src/ServiceStack.Authentication.OAuth2/ServiceStack.Authentication.OAuth2.Signed.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<DebugType>portable</DebugType>
66
<AssemblyName>ServiceStack.Authentication.OAuth2</AssemblyName>
77
<PackageId>ServiceStack.Authentication.OAuth2.Signed</PackageId>
8+
<Configuration>Signed</Configuration>
89
<RuntimeIdentifiers>win</RuntimeIdentifiers>
910
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1011
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -15,8 +16,9 @@
1516
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
1617
</PropertyGroup>
1718

18-
<PropertyGroup Condition="'$(Configuration)'!='Debug'">
19-
<DocumentationFile>bin\Release\$(Configuration)\ServiceStack.Authentication.OAuth2.xml</DocumentationFile>
19+
<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
20+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
21+
<Optimize>true</Optimize>
2022
</PropertyGroup>
2123

2224
<ItemGroup>

‎src/ServiceStack.Authentication.OpenId/ServiceStack.Authentication.OpenId.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition="'$(Configuration)'!='Debug'">
19-
<DocumentationFile>bin\Release\$(Configuration)\ServiceStack.Authentication.OpenId.xml</DocumentationFile>
18+
<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
19+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
20+
<Optimize>true</Optimize>
2021
</PropertyGroup>
2122

2223
<ItemGroup>

‎src/ServiceStack.Authentication.RavenDb/ServiceStack.Authentication.RavenDb.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
1515
</PropertyGroup>
1616

17-
<PropertyGroup Condition="'$(Configuration)'!='Debug'">
18-
<DocumentationFile>bin\Release\$(Configuration)\ServiceStack.Authentication.RavenDb.xml</DocumentationFile>
17+
<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
18+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
19+
<Optimize>true</Optimize>
1920
</PropertyGroup>
2021

2122
<ItemGroup>

0 commit comments

Comments
 (0)