help embed files for F# projects with SourceLink.Create.CommandLine (#…

…298) * help embed files for F# projects with SourceLink.Create.CommandLine * 2.7.2 is next * specify the Identity to avoid problems
ctaggart · Dec 28, 2017 · 7ce2050 · 7ce2050
1 parent b40acd9
commit 7ce2050
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 9 deletions.
diff --git a/SourceLink.Create.BitBucket/SourceLink.Create.BitBucket.targets b/SourceLink.Create.BitBucket/SourceLink.Create.BitBucket.targets
@@ -37,7 +37,7 @@
     <ItemGroup>
       <EmbeddedFiles Include="@(_EmbeddedFiles)" />
       <FullPathEmbeddedFiles
-          Condition="$([System.IO.File]::Exists('%(Identity)'))"
+          Condition="$([System.IO.File]::Exists('%(EmbeddedFiles.Identity)'))"
           Include="$([System.IO.Path]::GetFullPath('%(EmbeddedFiles.Identity)'))" />
     </ItemGroup>
     <CreateProperty Value="@(FullPathEmbeddedFiles)">  

diff --git a/SourceLink.Create.BitBucketServer/SourceLink.Create.BitBucketServer.targets b/SourceLink.Create.BitBucketServer/SourceLink.Create.BitBucketServer.targets
@@ -37,7 +37,7 @@
     <ItemGroup>
       <EmbeddedFiles Include="@(_EmbeddedFiles)" />
       <FullPathEmbeddedFiles
-          Condition="$([System.IO.File]::Exists('%(Identity)'))"
+          Condition="$([System.IO.File]::Exists('%(EmbeddedFiles.Identity)'))"
           Include="$([System.IO.Path]::GetFullPath('%(EmbeddedFiles.Identity)'))" />
     </ItemGroup>
     <CreateProperty Value="@(FullPathEmbeddedFiles)">  

diff --git a/SourceLink.Create.CommandLine/SourceLink.Create.CommandLine.targets b/SourceLink.Create.CommandLine/SourceLink.Create.CommandLine.targets
@@ -36,6 +36,14 @@
         ServerType="$(SourceLinkServerType)">
       <Output PropertyName="SourceLink" TaskParameter="SourceLink" />
     </SourceLink.Create.CommandLine.CreateTask>
+    <ItemGroup>
+      <FullPathEmbeddedFiles
+          Condition="$([System.IO.File]::Exists('%(EmbeddedFiles.Identity)'))"
+          Include="$([System.IO.Path]::GetFullPath('%(EmbeddedFiles.Identity)'))" />
+    </ItemGroup>
+    <CreateProperty Value="@(FullPathEmbeddedFiles)">  
+      <Output TaskParameter="Value" PropertyName="embed" />  
+    </CreateProperty>
   </Target>
 
 </Project>
diff --git a/SourceLink.Create.GitHub/SourceLink.Create.GitHub.targets b/SourceLink.Create.GitHub/SourceLink.Create.GitHub.targets
@@ -37,7 +37,7 @@
     <ItemGroup>
       <EmbeddedFiles Include="@(_EmbeddedFiles)" />
       <FullPathEmbeddedFiles
-          Condition="$([System.IO.File]::Exists('%(Identity)'))"
+          Condition="$([System.IO.File]::Exists('%(EmbeddedFiles.Identity)'))"
           Include="$([System.IO.Path]::GetFullPath('%(EmbeddedFiles.Identity)'))" />
     </ItemGroup>
     <CreateProperty Value="@(FullPathEmbeddedFiles)">  

diff --git a/SourceLink.Create.GitLab/SourceLink.Create.GitLab.targets b/SourceLink.Create.GitLab/SourceLink.Create.GitLab.targets
@@ -37,7 +37,7 @@
     <ItemGroup>
       <EmbeddedFiles Include="@(_EmbeddedFiles)" />
       <FullPathEmbeddedFiles
-          Condition="$([System.IO.File]::Exists('%(Identity)'))"
+          Condition="$([System.IO.File]::Exists('%(EmbeddedFiles.Identity)'))"
           Include="$([System.IO.Path]::GetFullPath('%(EmbeddedFiles.Identity)'))" />
     </ItemGroup>
     <CreateProperty Value="@(FullPathEmbeddedFiles)">  

diff --git a/SourceLink.Embed.AllSourceFiles/SourceLink.Embed.AllSourceFiles.targets b/SourceLink.Embed.AllSourceFiles/SourceLink.Embed.AllSourceFiles.targets
@@ -4,7 +4,11 @@
   </PropertyGroup>
   <Target Name="EmbedAllSourceFiles">
     <ItemGroup>
-      <EmbeddedFiles Include="$([System.IO.Path]::GetFullPath('%(Compile.Identity)'))" />
+      <AllSourceFiles Include="%(Compile.Identity)" />
+      <EmbeddedFiles Include="@(AllSourceFiles)" />
+      <FullPathEmbeddedFiles
+          Condition="$([System.IO.File]::Exists('%(EmbeddedFiles.Identity)'))"
+          Include="$([System.IO.Path]::GetFullPath('%(EmbeddedFiles.Identity)'))" />
     </ItemGroup>
     <CreateProperty Value="@(EmbeddedFiles)">  
       <Output TaskParameter="Value" PropertyName="embed" />  

diff --git a/SourceLink.Embed.PaketFiles/SourceLink.Embed.PaketFiles.targets b/SourceLink.Embed.PaketFiles/SourceLink.Embed.PaketFiles.targets
@@ -4,10 +4,15 @@
   </PropertyGroup>
   <Target Name="EmbedPaketFiles">
     <ItemGroup>
-      <EmbeddedFiles Include="$([System.IO.Path]::GetFullPath('%(Compile.Identity)'))"
-        Condition="$([System.String]::Copy('%(Identity)').Contains('paket-files'))" />
+      <PaketFiles
+          Condition="$([System.String]::Copy('%(Compile.Identity)').Contains('paket-files'))"
+          Include="%(Compile.Identity)" />
+      <EmbeddedFiles Include="@(PaketFiles)" />
+      <FullPathEmbeddedFiles
+          Condition="$([System.IO.File]::Exists('%(EmbeddedFiles.Identity)'))"
+          Include="$([System.IO.Path]::GetFullPath('%(EmbeddedFiles.Identity)'))" />
     </ItemGroup>
-    <CreateProperty Value="@(EmbeddedFiles)">  
+    <CreateProperty Value="@(FullPathEmbeddedFiles)">  
       <Output TaskParameter="Value" PropertyName="embed" />  
     </CreateProperty>
   </Target>

diff --git a/build.ps1 b/build.ps1
@@ -1,4 +1,4 @@
-$version = '2.7.0' # the version under development, update after a release
+$version = '2.7.2' # the version under development, update after a release
 $versionSuffix = '-a125' # manually incremented for local builds
 
 function isVersionTag($tag){