From 3f2f3aaa4f918b7bf13b8b1d64c2928172d4f54c Mon Sep 17 00:00:00 2001
From: stan-sz <37585349+stan-sz@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:55:19 +0200
Subject: [PATCH 1/2] Fix loading UsingTask first before property is populated.

referencetrimmer\3.3.11\build\ReferenceTrimmer.targets line 3 pos 55: MSB4022 The result "" of evaluating the value "$(ReferenceTrimmerTasksAssembly)" of the "AssemblyFile" attribute in element <UsingTask> is not valid.
---
 src/Package/build/ReferenceTrimmer.targets | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Package/build/ReferenceTrimmer.targets b/src/Package/build/ReferenceTrimmer.targets
index 10c8df4..dc0bd40 100644
--- a/src/Package/build/ReferenceTrimmer.targets
+++ b/src/Package/build/ReferenceTrimmer.targets
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <UsingTask TaskName="CollectDeclaredReferencesTask" AssemblyFile="$(ReferenceTrimmerTasksAssembly)" />
+  <UsingTask TaskName="CollectDeclaredReferencesTask" AssemblyFile="$(ReferenceTrimmerTasksAssembly)" Condition=" '$(ReferenceTrimmerTasksAssembly)' != '' " />
+  <UsingTask TaskName="CollectDeclaredReferencesTask" AssemblyFile="$(MSBuildThisFileDirectory)ReferenceTrimmer.Tasks.dll" Condition=" '$(ReferenceTrimmerTasksAssembly)' == '' " />
 
   <PropertyGroup>
     <CoreCompileDependsOn Condition="'$(EnableReferenceTrimmer)' != 'false'">$(CoreCompileDependsOn);CollectDeclaredReferences</CoreCompileDependsOn>
@@ -51,4 +52,4 @@
       <FileWrites Include="$(_ReferenceTrimmerUnusedReferencesFile)" Condition="'$(EnableReferenceTrimmerDiagnostics)'=='true'" />
     </ItemGroup>
   </Target>
-</Project>
\ No newline at end of file
+</Project>

From 4d943df808a33fe60f5b86f61dfd0cec0f158060 Mon Sep 17 00:00:00 2001
From: stan-sz <37585349+stan-sz@users.noreply.github.com>
Date: Tue, 22 Apr 2025 11:56:13 +0200
Subject: [PATCH 2/2] Update ReferenceTrimmer.props

---
 src/Package/build/ReferenceTrimmer.props | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Package/build/ReferenceTrimmer.props b/src/Package/build/ReferenceTrimmer.props
index ab9363b..3fc541e 100644
--- a/src/Package/build/ReferenceTrimmer.props
+++ b/src/Package/build/ReferenceTrimmer.props
@@ -1,9 +1,5 @@
 <Project>
 
-  <PropertyGroup>
-    <ReferenceTrimmerTasksAssembly Condition=" '$(ReferenceTrimmerTasksAssembly)' == '' ">$(MSBuildThisFileDirectory)ReferenceTrimmer.Tasks.dll</ReferenceTrimmerTasksAssembly>
-  </PropertyGroup>
-
   <ItemDefinitionGroup Condition=" '$(EnableReferenceTrimmer)' != 'false' and '$(ReferenceTrimmerEnableVcxproj)' != 'false' ">
     <Link>
         <!-- Enable link.exe traceouts of unused libraries and delay-load DLLs from vcxproj projects.