[Build] Removed test assemblies from build.

SiliconStudio · Nov 25, 2014 · b47b609 · b47b609
1 parent fe3417d
commit b47b609
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 2 deletions.
diff --git a/build/Paradox.build b/build/Paradox.build
@@ -10,6 +10,7 @@ Build file used to build Paradox and package it from the command line
     <ParadoxSolution>$(ParadoxRoot)build\Paradox</ParadoxSolution>
     <BuildProperties>Configuration=Release;GenerateDoc=true;NoWarn=1591</BuildProperties>
     <BuildProperties Condition="'$(SiliconStudioSign)' != ''">$(BuildProperties);SiliconStudioSign=$(SiliconStudioSign)</BuildProperties>
+    <BuildProperties Condition="'$(SiliconStudioOfficialBuild)' != ''">$(BuildProperties);SiliconStudioOfficialBuild=$(SiliconStudioOfficialBuild)</BuildProperties>
     <ILRepackPath>$(ParadoxRootBin)ILRepack.exe</ILRepackPath>
     <NuGetPath>$(ParadoxRootBin)NuGet.exe</NuGetPath>
     <SiliconStudioStoreUrl>https://store.paradox3d.net</SiliconStudioStoreUrl>

diff --git a/sources/assets/SiliconStudio.Assets.Tests/SiliconStudio.Assets.Tests.csproj b/sources/assets/SiliconStudio.Assets.Tests/SiliconStudio.Assets.Tests.csproj
@@ -8,6 +8,7 @@
     <AssemblyName>SiliconStudio.Assets.Tests</AssemblyName>
     <SiliconStudioAssemblyProcessor>true</SiliconStudioAssemblyProcessor>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>SiliconStudio.Assets.Tests.TestPackage</StartupObject>

diff --git a/...common/buildengine/SiliconStudio.BuildEngine.Tests/SiliconStudio.BuildEngine.Tests.csproj b/...common/buildengine/SiliconStudio.BuildEngine.Tests/SiliconStudio.BuildEngine.Tests.csproj
@@ -11,6 +11,7 @@
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
     <SiliconStudioAssemblyProcessor>true</SiliconStudioAssemblyProcessor>
     <SiliconStudioAssemblyProcessorOptions>--auto-module-initializer --serialization</SiliconStudioAssemblyProcessorOptions>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />

diff --git a/...n/core/SiliconStudio.AssemblyProcessor.Tests/SiliconStudio.AssemblyProcessor.Tests.csproj b/...n/core/SiliconStudio.AssemblyProcessor.Tests/SiliconStudio.AssemblyProcessor.Tests.csproj
@@ -13,6 +13,7 @@
     <AssemblyName>SiliconStudio.AssemblyProcessor.Tests</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Cecil">

diff --git a/sources/common/core/SiliconStudio.Core.Design.Tests/SiliconStudio.Core.Design.Tests.csproj b/sources/common/core/SiliconStudio.Core.Design.Tests/SiliconStudio.Core.Design.Tests.csproj
@@ -13,6 +13,7 @@
     <SiliconStudioAssemblyProcessorOptions>--auto-module-initializer --serialization</SiliconStudioAssemblyProcessorOptions>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
     <ParadoxBuildTags>WindowsTools</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Condition="'$(SiliconStudioPlatform)' == 'Windows'" Include="nunit.core.interfaces">

diff --git a/sources/common/core/SiliconStudio.Core.Tests/SiliconStudio.Core.Tests.Android.csproj b/sources/common/core/SiliconStudio.Core.Tests/SiliconStudio.Core.Tests.Android.csproj
@@ -17,6 +17,7 @@
     <SiliconStudioAssemblyProcessor>true</SiliconStudioAssemblyProcessor>
     <SiliconStudioAssemblyProcessorOptions>--auto-module-initializer --serialization</SiliconStudioAssemblyProcessorOptions>
     <ParadoxBuildTags>Windows;Android;iOS</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" Label="Paradox.DoNotSync" />

diff --git a/sources/common/core/SiliconStudio.Core.Tests/SiliconStudio.Core.Tests.csproj b/sources/common/core/SiliconStudio.Core.Tests/SiliconStudio.Core.Tests.csproj
@@ -15,6 +15,7 @@
     <SiliconStudioAssemblyProcessor>true</SiliconStudioAssemblyProcessor>
     <SiliconStudioAssemblyProcessorOptions>--auto-module-initializer --serialization</SiliconStudioAssemblyProcessorOptions>
     <ParadoxBuildTags>Windows;Android;iOS</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.core.interfaces" Label="Paradox.DoNotSync">

diff --git a/sources/common/core/SiliconStudio.Core.Tests/SiliconStudio.Core.Tests.iOS.csproj b/sources/common/core/SiliconStudio.Core.Tests/SiliconStudio.Core.Tests.iOS.csproj
@@ -27,6 +27,7 @@
     <SiliconStudioAssemblyProcessor>true</SiliconStudioAssemblyProcessor>
     <SiliconStudioAssemblyProcessorOptions>--auto-module-initializer --serialization</SiliconStudioAssemblyProcessorOptions>
     <ParadoxBuildTags>Windows;Android;iOS</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="monotouch" Label="Paradox.DoNotSync" />

diff --git a/...mon/presentation/SiliconStudio.Presentation.Tests/SiliconStudio.Presentation.Tests.csproj b/...mon/presentation/SiliconStudio.Presentation.Tests/SiliconStudio.Presentation.Tests.csproj
@@ -10,6 +10,7 @@
     <AssemblyName>SiliconStudio.Presentation.Tests</AssemblyName>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
     <ParadoxBuildTags>WindowsTools</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework">

diff --git a/sources/common/presentation/SiliconStudio.Quantum.Tests/SiliconStudio.Quantum.Tests.csproj b/sources/common/presentation/SiliconStudio.Quantum.Tests/SiliconStudio.Quantum.Tests.csproj
@@ -12,6 +12,7 @@
     <SiliconStudioAssemblyProcessor>true</SiliconStudioAssemblyProcessor>
     <SiliconStudioAssemblyProcessorOptions>--auto-module-initializer --serialization</SiliconStudioAssemblyProcessorOptions>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.core.interfaces, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

diff --git a/...iliconStudio.Paradox.Graphics.Regression/SiliconStudio.Paradox.Graphics.Regression.csproj b/...iliconStudio.Paradox.Graphics.Regression/SiliconStudio.Paradox.Graphics.Regression.csproj
@@ -14,6 +14,7 @@
     <SiliconStudioPlatformDependent>true</SiliconStudioPlatformDependent>
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>

diff --git a/sources/targets/Paradox.UnitTests.targets b/sources/targets/Paradox.UnitTests.targets
@@ -3,8 +3,8 @@
   <Import Project="$(SolutionDir)$(SolutionName).PreSettings.Local.targets" Condition="Exists('$(SolutionDir)$(SolutionName).PreSettings.Local.targets')" />
 
   <PropertyGroup>
-    <!-- Do not compile unit test when signing/packaging -->
-    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioSign)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
+    <!-- Do not compile unit test when packaging -->
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
 
     <SiliconStudioUnitTest>true</SiliconStudioUnitTest>
     <SiliconStudioDependenciesDir></SiliconStudioDependenciesDir>

diff --git a/...ts/tools/SiliconStudio.TextureConverter.Tests/SiliconStudio.TextureConverter.Tests.csproj b/...ts/tools/SiliconStudio.TextureConverter.Tests/SiliconStudio.TextureConverter.Tests.csproj
@@ -10,6 +10,7 @@
     <AssemblyName>SiliconStudio.TextureConverter.Tests</AssemblyName>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
     <ParadoxBuildTags>WindowsTools</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.core.interfaces">

diff --git a/sources/tools/SiliconStudio.ImageComparerService/SiliconStudio.ImageComparerService.csproj b/sources/tools/SiliconStudio.ImageComparerService/SiliconStudio.ImageComparerService.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
     <ParadoxBuildTags>WindowsTools</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>

diff --git a/...iconStudio.Paradox.FixProjectReferences/SiliconStudio.Paradox.FixProjectReferences.csproj b/...iconStudio.Paradox.FixProjectReferences/SiliconStudio.Paradox.FixProjectReferences.csproj
@@ -16,6 +16,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
     <ParadoxBuildTags>WindowsTools</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <Prefer32Bit>false</Prefer32Bit>

diff --git a/...ools/SiliconStudio.Paradox.ProjectGenerator/SiliconStudio.Paradox.ProjectGenerator.csproj b/...ools/SiliconStudio.Paradox.ProjectGenerator/SiliconStudio.Paradox.ProjectGenerator.csproj
@@ -13,6 +13,7 @@
     <AssemblyName>SiliconStudio.Paradox.ProjectGenerator</AssemblyName>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
     <ParadoxBuildTags>WindowsTools</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <Prefer32Bit>true</Prefer32Bit>

diff --git a/sources/tools/SiliconStudio.Paradox.StorageTool/SiliconStudio.StorageTool.csproj b/sources/tools/SiliconStudio.Paradox.StorageTool/SiliconStudio.StorageTool.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
     <ParadoxBuildTags>WindowsTools</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <Prefer32Bit>false</Prefer32Bit>

diff --git a/sources/tools/SiliconStudio.Paradox.TestRunner/SiliconStudio.Paradox.TestRunner.csproj b/sources/tools/SiliconStudio.Paradox.TestRunner/SiliconStudio.Paradox.TestRunner.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
     <ParadoxBuildTags>WindowsTools</ParadoxBuildTags>
+    <SiliconStudioCompilerTargetsEnable Condition="'$(SiliconStudioPackageBuild)' == 'true'">false</SiliconStudioCompilerTargetsEnable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Options">