diff --git a/build/ProjectK.CSharp.targets b/build/ProjectK.CSharp.targets
new file mode 100644
index 0000000000..386a55d6c6
--- /dev/null
+++ b/build/ProjectK.CSharp.targets
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
diff --git a/build/ProjectK.Common.props b/build/ProjectK.Common.props
new file mode 100644
index 0000000000..8fd10a4b6f
--- /dev/null
+++ b/build/ProjectK.Common.props
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+ .NETServer
+ v1.0
+
+
+ .NET for Server
+
+
+ $(MSBuildThisFileDirectory)
+ $(TargetFrameworkRootPath)
+ <_FullFrameworkReferenceAssemblyPaths>$(FrameworkPathOverride)
+ <_TargetFrameworkDirectories>$(FrameworkPathOverride)
+ true
+
+
+ true
+
+
+
+
+
+ {CandidateAssemblyFiles};
+ $(ReferencePath);
+ {HintPathFromItem};
+ {TargetFrameworkDirectory};
+ {Registry:$(FrameworkRegistryBase),$(TargetFrameworkVersion),$(AssemblyFoldersSuffix)$(AssemblyFoldersExConditions)};
+ {RawFileName};
+ $(OutDir)
+
+
+
+
diff --git a/build/ProjectK.Common.targets b/build/ProjectK.Common.targets
new file mode 100644
index 0000000000..f316df7f4b
--- /dev/null
+++ b/build/ProjectK.Common.targets
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+ $(ResolveReferencesDependsOn);
+ ImplicitlyExpandTargetFramework;
+
+
+
+ $(ImplicitlyExpandTargetFrameworkDependsOn);
+ GetReferenceAssemblyPaths
+
+
+
+
+
+
+
+ false
+ false
+ $(TargetFrameworkMonikerDisplayName)
+ $(TargetFrameworkIdentifier),$(TargetFrameworkVersion)
+ ImplicitlyExpandTargetFramework
+ True
+
+
+
+
+
+
+
+
+ <_ResolveAssemblyReferenceResolvedFiles Include="@(ReferencePath)"
+ Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandTargetFramework'"/>
+
+
+
+
diff --git a/build/_k-generate-projects.shade b/build/_k-generate-projects.shade
index 663e470a8b..405a579dc7 100644
--- a/build/_k-generate-projects.shade
+++ b/build/_k-generate-projects.shade
@@ -500,35 +500,7 @@ functions
private static string GetProjectKTargets(string packagesDir)
{
- Func getVersion = version => {
- var dash = version.LastIndexOf('-');
-
- if(dash != -1)
- {
- var lastToken = version.Substring(dash + 1);
-
- if(lastToken.StartsWith("t"))
- {
- return Int64.Parse(lastToken.Substring(1));
- }
-
- return Int64.Parse(lastToken);
- }
- return Int64.MaxValue;
- };
-
- var projectK = Directory.GetDirectories(packagesDir, "ProjectK*")
- .Select(p => new { Path = p, Build = getVersion(p) })
- .OrderByDescending(p => p.Build)
- .FirstOrDefault();
-
- if (projectK == null)
- {
- Warn("Project K targets aren't installed");
- return "";
- }
-
- return Path.Combine("..", "..", projectK.Path.Substring(projectK.Path.IndexOf("packages")), "Framework\\K\\v1.0\\ProjectK.CSharp.targets");
+ return Path.Combine(packagesDir, "KoreBuild", "build", "ProjectK.CSharp.targets");
}
private static string GetProjectFileName(string projectName, string config)