Skip to content
Permalink
Browse files

Merge branch 'master' into onecsproj_onexkpkg2

  • Loading branch information
xen2 committed Oct 2, 2018
2 parents f8ca24d + b04c4b5 commit a22b62fae68f67e70fa881372def36194ff7ecb0
@@ -28,6 +28,13 @@ public static void Initialize()
{
// Override search path since we are in a unit test directory
DirectoryHelper.PackageDirectoryOverride = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"..\..\..\..");

// Running first time? If yes, create nuget redirect package.
var packageVersion = new PackageVersion(XenkoVersion.NuGetVersion);
if (PackageStore.Instance.IsDevelopmentStore)
{
PackageStore.Instance.CheckDeveloperTargetRedirects("Xenko", packageVersion, PackageStore.Instance.InstallationPath).Wait();
}
}
}
}
@@ -17,7 +17,7 @@ private static int Main(string[] args)
var installDir = DirectoryHelper.GetInstallationDirectory("Xenko");
Environment.SetEnvironmentVariable("XenkoDir", installDir);

// Running first time?
// Running first time? If yes, create nuget redirect package.
var packageVersion = new PackageVersion(XenkoVersion.NuGetVersion);
if (PackageStore.Instance.IsDevelopmentStore)
{
@@ -251,7 +251,7 @@ private static async void Startup(UFile initialSessionPath)
return;
}

// Running first time?
// Running first time? If yes, create nuget redirect package.
var packageVersion = new PackageVersion(XenkoVersion.NuGetVersion);
if (PackageStore.Instance.IsDevelopmentStore)
{
@@ -14,7 +14,6 @@
<TargetFramework>$(TargetFramework)</TargetFramework>
<XenkoAssemblyProcessorOptions>--serialization --parameter-key</XenkoAssemblyProcessorOptions>
<XenkoBuildTags>*</XenkoBuildTags>
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
@@ -14,7 +14,6 @@
<TargetFramework>$(TargetFramework)</TargetFramework>
<XenkoAssemblyProcessorOptions>--serialization</XenkoAssemblyProcessorOptions>
<XenkoBuildTags>*</XenkoBuildTags>
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
<XenkoCodeAnalysis>true</XenkoCodeAnalysis>
</PropertyGroup>

@@ -14,7 +14,6 @@
<TargetFramework>$(TargetFramework)</TargetFramework>
<XenkoAssemblyProcessorOptions>--serialization --parameter-key</XenkoAssemblyProcessorOptions>
<XenkoBuildTags>*</XenkoBuildTags>
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
<XenkoCodeAnalysis>true</XenkoCodeAnalysis>
</PropertyGroup>
<Choose>
@@ -80,6 +80,7 @@
<ItemGroup>
<UpToDateCheckInput Include="@(XenkoNativeCFile)" />
<UpToDateCheckInput Include="@(XenkoNativeHFile)" />
<UpToDateCheckOutput Include="@(XenkoNativeOutput)" />
</ItemGroup>

<!-- Update XenkoNativeOutput.Link using computed OutputPath and add to XenkoNativeLib -->
@@ -93,6 +94,10 @@
</XenkoNativeOutput>
<XenkoNativeLib Include="@(XenkoNativeOutput)"/>
</ItemGroup>

<!-- This is necessary for UpToDateCheck: CompileNativeClang is checking only XenkoNativeOutput against native sources
but FastUpToDateCheck check XenkoNativeOutput against various other unrelated files such as C# sources, so we want to mark the file as modified after, even if CompileNativeClang was skipped -->
<Touch Files="@(XenkoNativeOutput)" />
</Target>

<!-- Define ItemGroup so that they are properly copied -->

0 comments on commit a22b62f

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