Generate NativeDllName in tests

tmat · tmat · commit 9aadf0bcae8b · 2018-04-16T10:36:16.000-07:00
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -37,5 +37,7 @@
       <Content Include="@(_TestAppFile)" CopyToOutputDirectory="PreserveNewest" Visible="false" />
     </ItemGroup>
   </Target>
+    
+  <Import Project="..\Targets\GenerateNativeDllName.targets" />
 
 </Project>
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -38,7 +38,8 @@
     <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.8.0" />
   </ItemGroup>
 
-  <Import Project="CodeGenerator.targets" />
+  <Import Project="..\Targets\CodeGenerator.targets" />
+  <Import Project="..\Targets\GenerateNativeDllName.targets" />
 
   <Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
     <PropertyGroup>
diff --git a/Targets/CodeGenerator.targets b/Targets/CodeGenerator.targets
@@ -6,36 +6,12 @@
 
   <Target Name="DefineProperties">
     <PropertyGroup>
-      <NativeDllNamePath>$(IntermediateOutputPath)NativeDllName.g.cs</NativeDllNamePath>
       <UniqueIdentifierPath>$(IntermediateOutputPath)UniqueIdentifier.g.cs</UniqueIdentifierPath>
       <AssemblyCommitIdsPath>$(IntermediateOutputPath)AssemblyCommitIds.g.cs</AssemblyCommitIdsPath>
     </PropertyGroup>
   </Target>
 
 
-  <Target Name="GenerateNativeDllNameCs" Inputs="$(libgit2_propsfile)" Outputs="$(NativeDllNamePath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineProperties">
-    <PropertyGroup>
-      <NativeDllNameSourceLines>
-        namespace LibGit2Sharp.Core
-        {
-        internal static class NativeDllName
-        {
-        public const string Name = "$(libgit2_filename)"%3b
-        }
-        }
-      </NativeDllNameSourceLines>
-    </PropertyGroup>
-
-    <WriteLinesToFile File="$(NativeDllNamePath)" Lines="$(NativeDllNameSourceLines)" Overwrite="true" />
-
-    <ItemGroup>
-      <Compile Include="$(NativeDllNamePath)" />
-      <FileWrites Include="$(NativeDllNamePath)" />
-    </ItemGroup>
-
-  </Target>
-
-
   <Target Name="GenerateUniqueIdentifierCs" Inputs="$(MSBuildThisFileFullPath);$(MSBuildAllProjects);@(Compile)" Outputs="$(UniqueIdentifierPath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineProperties">
 
     <PropertyGroup>
diff --git a/Targets/GenerateNativeDllName.targets b/Targets/GenerateNativeDllName.targets
@@ -0,0 +1,33 @@
+﻿<Project>
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <Target Name="DefineNativeDllName">
+    <PropertyGroup>
+      <NativeDllNamePath>$(IntermediateOutputPath)NativeDllName.g.cs</NativeDllNamePath>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="GenerateNativeDllNameCs" Inputs="$(libgit2_propsfile)" Outputs="$(NativeDllNamePath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineNativeDllName">
+    <PropertyGroup>
+      <NativeDllNameSourceLines>
+        namespace LibGit2Sharp.Core
+        {
+        internal static class NativeDllName
+        {
+        public const string Name = "$(libgit2_filename)"%3b
+        }
+        }
+      </NativeDllNameSourceLines>
+    </PropertyGroup>
+
+    <WriteLinesToFile File="$(NativeDllNamePath)" Lines="$(NativeDllNameSourceLines)" Overwrite="true" />
+
+    <ItemGroup>
+      <Compile Include="$(NativeDllNamePath)" />
+      <FileWrites Include="$(NativeDllNamePath)" />
+    </ItemGroup>
+  </Target>
+</Project>
