Supported auto generate AssemblySearchPath by project property `Ass…

…emblySearchNames`.
hsu-net · Dec 20, 2023 · 9f8a105 · 9f8a105
1 parent 1a2993a
commit 9f8a105
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/nuke/Build.Github.cs b/nuke/Build.Github.cs
@@ -39,6 +39,7 @@ partial class Build
     Target Release => _ => _
         .Description("Release")
         .DependsOn(Artifacts)
+        .ProceedAfterFailure()
         .Executes(async () =>
         {
             var tag = $"v{Version}";

diff --git a/src/Hsu.Obfuscar.DotNetTool/nuspec/build/Hsu.Obfuscar.DotNetTool.props b/src/Hsu.Obfuscar.DotNetTool/nuspec/build/Hsu.Obfuscar.DotNetTool.props
@@ -1,4 +1,8 @@
 <Project>
+
+    <PropertyGroup Condition="'$(ObfuscarGlobalToolRestored)' == ''">
+        <ObfuscarGlobalToolRestored>false</ObfuscarGlobalToolRestored>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(ObfuscarBuild)' == ''">
         <ObfuscarBuild>true</ObfuscarBuild>
     </PropertyGroup>
@@ -18,11 +22,7 @@
         <ObfuscarAssembliesInclude>false</ObfuscarAssembliesInclude>
     </PropertyGroup>
     <PropertyGroup>
-        <AssemblySearchNames/>
+        <AssemblySearchNames />
         <!--<AssemblySearchNames>Microsoft.CodeAnalysis.dll;Microsoft.CodeAnalysis.CSharp.dll</AssemblySearchNames>-->
     </PropertyGroup>
-
-    <ItemGroup>
-        <None Include="$(ObfuscarConfigName)" Condition="Exists($(ObfuscarConfigName))"/>
-    </ItemGroup>
 </Project>
diff --git a/src/Hsu.Obfuscar.DotNetTool/nuspec/build/Hsu.Obfuscar.DotNetTool.targets b/src/Hsu.Obfuscar.DotNetTool/nuspec/build/Hsu.Obfuscar.DotNetTool.targets
@@ -4,11 +4,14 @@
     <Target Name="_ObfuscarGlobalToolRestore"
             BeforeTargets="Restore">
         <Exec
-                Condition="'$(ObfuscarBuild)' == 'true'"
+                Condition="'$(ObfuscarBuild)' == 'true' and '$(ObfuscarGlobalToolRestored)'=='false'"
                 ConsoleToMsBuild="true"
                 UseUtf8Encoding="Always"
                 Command="dotnet tool restore">
         </Exec>
+        <PropertyGroup Condition="'$(ObfuscarGlobalToolRestored)' == 'false'">
+            <ObfuscarGlobalToolRestored>true</ObfuscarGlobalToolRestored>
+        </PropertyGroup>
     </Target>
 
     <!-- check tool -->
@@ -57,7 +60,7 @@
             Name="_ObfuscarGetAssemblySearchPaths"
             BeforeTargets="ObfuscarTask"
             DependsOnTargets="_ObfuscarConfigFileCreate">
-        <ItemGroup Condition="'@(AssemblySearchNames)' != ''">
+        <ItemGroup Condition="'$(AssemblySearchNames)' != ''">
             <_ReferenceItems Include="@(ReferencePath)">
                 <Name>$([System.IO.Path]::GetFileName('%(Identity)'))</Name>
                 <Path>$([System.IO.Path]::GetDirectoryName('%(Identity)'))</Path>
@@ -69,31 +72,26 @@
             </AssemblySearchLines>
         </ItemGroup>
 
-        <Message Text="ReferenceItems:" Importance="high" />
-        <Message Text="@(ReferenceItems, '%0D%0A')" Importance="high" />
-
         <Message Text="AssemblySearchLines:" Importance="high" />
         <Message Text="@(AssemblySearchLines->'%(Line)', '%0D%0A')" Importance="high" />
 
-        <PropertyGroup Condition="'@(AssemblySearchNames)' != ''">
+        <PropertyGroup Condition="'$(AssemblySearchNames)' != ''">
             <ObfuscarAssembliesContents><![CDATA[<?xml version="1.0"?>
 <Include>
 @(AssemblySearchLines->'%(Line)', '%0D%0A')
 </Include>]]>
             </ObfuscarAssembliesContents>
         </PropertyGroup>
-        <PropertyGroup Condition="'@(AssemblySearchNames)' == ''">
+        <PropertyGroup Condition="'$(AssemblySearchNames)' == ''">
             <ObfuscarAssembliesContents><![CDATA[<?xml version="1.0"?>
 <Include>
     <AssemblySearchPath path='.' />
 </Include>]]>
             </ObfuscarAssembliesContents>
         </PropertyGroup>
 
-        <Message Text="ObfuscarAssembliesContents:" Importance="high" />
-        <Message Text="$(ObfuscarAssembliesContents)" Importance="high" />
-
         <WriteLinesToFile
+                Overwrite="true"
                 File="$(OutputPath)\$(ObfuscarAssembliesName)"
                 Lines="$(ObfuscarAssembliesContents)" />
     </Target>
@@ -103,6 +101,9 @@
             BeforeTargets="ObfuscarTask"
             DependsOnTargets="_ObfuscarTask">
 
+        <PropertyGroup>
+            <ObfuscarConfigPath>$(ProjectDir)\$(ObfuscarConfigName)</ObfuscarConfigPath>
+        </PropertyGroup>
         <PropertyGroup Condition="'$(ObfuscarAssembliesInclude)' == 'true'">
             <ObfuscarAssembliesIncludeContent>
                 <Include path="$(ObfuscarAssembliesName)" />
@@ -144,8 +145,9 @@
         </PropertyGroup>
 
         <WriteLinesToFile
-                File="$(ObfuscarConfigPath)"
                 Condition="!Exists($(ObfuscarConfigPath))"
+                Overwrite="true"
+                File="$(ObfuscarConfigPath)"
                 Lines="$(ObfuscarContents)" />
     </Target>