Skip to content
Permalink
Browse files

[Tests] Fix build of some test projects

  • Loading branch information
xen2 committed Nov 19, 2018
1 parent 9b985d4 commit c4e21cc9beb9adbe5225d5f6b1d10a7311ed0959
@@ -14,9 +14,6 @@ public class Module
[ModuleInitializer]
internal static void Initialize()
{
// Override search path since we are in a unit test directory
DirectoryHelper.PackageDirectoryOverride = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"..\..\..\..");

AssemblyRegistry.Register(typeof(Module).Assembly, AssemblyCommonCategories.Assets);
RuntimeHelpers.RunModuleConstructor(typeof(Asset).Module.ModuleHandle);

@@ -15,9 +15,6 @@ public class Module
[ModuleInitializer]
internal static void Initialize()
{
// Override search path since we are in a unit test directory
DirectoryHelper.PackageDirectoryOverride = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"..\..\..\..");

PackageSessionPublicHelper.FindAndSetMSBuildVersion();
}
}

This file was deleted.

@@ -51,7 +51,6 @@
<Compile Include="AssetImportTests.cs" />
<Compile Include="TestDependencyResolver.cs" />
<Compile Include="TestPrefabAsset.cs" />
<Compile Include="TestPackageArchive.cs" />
<Compile Include="TestSceneUpgrader.cs" />
<Compile Include="TestVisualScriptCompiler.cs" />
<Compile Include="TexturePackerTests.cs" />
@@ -31,14 +31,6 @@
<Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="1.6.55" />

<PropertyGroup>
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.config</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<Target Name="IncludeExtraAssemblies">
<ItemGroup>
<BuildOutputInPackage Include="$(OutputPath)System.IO.Compression.dll" />
<BuildOutputInPackage Include="$(OutputPath)NuGet*.dll" />
<BuildOutputInPackage Include="$(OutputPath)Newtonsoft.Json.dll" />
</ItemGroup>
</Target>
</Project>

0 comments on commit c4e21cc

Please sign in to comment.
You can’t perform that action at this time.