fixing build process

Author: pamidur

.github/workflows/application.yml

@@ -38,7 +38,7 @@ jobs:
     - name: Test net8
       run: dotnet test -c $app_conf --no-build -f net8.0
     - name: Pack
-      run: dotnet pack -c $app_conf -o `pwd`/artifacts -p:Version=$app_version -p:InformationalVersion="$app_version:$GITHUB_SHA" -p:CommitSHA=$GITHUB_SHA
+      run: dotnet pack -c $app_conf -o `pwd`/artifacts -p:AddPackDeps=true -p:Version=$app_version -p:InformationalVersion="$app_version:$GITHUB_SHA" -p:CommitSHA=$GITHUB_SHA
     - uses: actions/upload-artifact@v4
       with:
         name: artifacts

aspects/Cache/Aspects.Cache.csproj

@@ -15,5 +15,11 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.32" />
     <PackageReference Include="System.Text.Json" Version="6.0.9" />
   </ItemGroup>
+  <ItemGroup Condition="'$(AddPackDeps)' == 'true'">
+    <PackageReference Include="AspectInjector" Version="$(Version)">
+      <IncludeAssets>All</IncludeAssets>
+      <ExcludeAssets>build</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
 
 </Project>

aspects/Directory.Build.targets

@@ -17,8 +17,7 @@
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
      <OutputItemType>Analyzer</OutputItemType>
    </ProjectReference>  -->
-	</ItemGroup>  
-
+	</ItemGroup>
 
   <!-- <ItemGroup>
     <Analyzer Include="$(MSBuildThisFileDirectory)..\..\src\AspectInjector.Analyzer\bin\Debug\netstandard2.0\AspectInjector.Analyzer.dll" />

aspects/Freezable/Aspects.Freezable.csproj

@@ -6,4 +6,10 @@
 Powered by AspectInjector.</Description>
     <PackageProjectUrl>https://github.com/pamidur/aspect-injector/tree/master/samples/src/Freezable</PackageProjectUrl>      
   </PropertyGroup>   
+  <ItemGroup Condition="'$(AddPackDeps)' == 'true'">
+    <PackageReference Include="AspectInjector" Version="$(Version)">
+      <IncludeAssets>All</IncludeAssets>
+      <ExcludeAssets>build</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>

aspects/Lazy/Aspects.Lazy.csproj

@@ -8,5 +8,11 @@
     </Description>
     <PackageProjectUrl>https://github.com/pamidur/aspect-injector/tree/master/samples/src/Lazy</PackageProjectUrl>
   </PropertyGroup>
+  <ItemGroup Condition="'$(AddPackDeps)' == 'true'">
+    <PackageReference Include="AspectInjector" Version="$(Version)">
+      <IncludeAssets>All</IncludeAssets>
+      <ExcludeAssets>build</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
 
 </Project>

aspects/Logging/Aspects.Logging.csproj

@@ -11,4 +11,10 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.32" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.32" />
   </ItemGroup>
+  <ItemGroup Condition="'$(AddPackDeps)' == 'true'">
+    <PackageReference Include="AspectInjector" Version="$(Version)">
+      <IncludeAssets>All</IncludeAssets>
+      <ExcludeAssets>build</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>

aspects/Notify/Aspects.Notify.csproj

@@ -6,4 +6,10 @@
 Powered by AspectInjector.</Description>
     <PackageProjectUrl>https://github.com/pamidur/aspect-injector/tree/master/samples/src/Notify</PackageProjectUrl>
   </PropertyGroup>
+  <ItemGroup Condition="'$(AddPackDeps)' == 'true'">
+    <PackageReference Include="AspectInjector" Version="$(Version)">
+      <IncludeAssets>All</IncludeAssets>
+      <ExcludeAssets>build</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>

aspects/Universal/Aspects.Universal.csproj

@@ -8,5 +8,10 @@
     </Description>
     <PackageProjectUrl>https://github.com/pamidur/aspect-injector/tree/master/samples/src/Universal</PackageProjectUrl>
 	</PropertyGroup>
-
+  <ItemGroup Condition="'$(AddPackDeps)' == 'true'">
+    <PackageReference Include="AspectInjector" Version="$(Version)">
+      <IncludeAssets>All</IncludeAssets>
+      <ExcludeAssets>build</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>

src/AspectInjector/build/AspectInjector.targets

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <UsingTask Condition="'$(AspectInjector_Location)' != ''" TaskName="AspectInjectorTask" AssemblyFile="$(AspectInjector_Location)" />
-  <UsingTask Condition="'$(AspectInjector_Location)' == ''" TaskName="AspectInjectorTask" AssemblyFile="(MSBuildThisFileDirectory)../../binaries/AspectInjector.dll" />
+  <UsingTask Condition="'$(AspectInjector_Location)' == ''" TaskName="AspectInjectorTask" AssemblyFile="$(MSBuildThisFileDirectory)../../binaries/AspectInjector.dll" />
 
   <ItemGroup>
     <PackageReference Update="AspectInjector" PrivateAssets="None" />