Centralize Build Props Leveraging MSBuildThisFileDirectory (#2)

BlazorFocused · Oct 2, 2023 · e07eaac · e07eaac
1 parent f17629b
commit e07eaac
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 37 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -18,7 +18,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../../BlazorFocused.Automation.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)src/BlazorFocused.Automation.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -14,4 +14,9 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <ItemGroup Label="NuGet Artifacts">
+    <None Include="$(MSBuildThisFileDirectory)BlazorFocused.png" Pack="true" PackagePath="\" Visible="false"  />
+    <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\" Visible="false"/>
+  </ItemGroup>
+
 </Project>
diff --git a/src/CommandLine/src/BlazorFocused.Automation.CommandLine.csproj b/src/CommandLine/src/BlazorFocused.Automation.CommandLine.csproj
@@ -15,11 +15,6 @@
     <PackageReference Include="System.CommandLine" />
   </ItemGroup>
 
-  <ItemGroup Label="NuGet Artifacts">
-    <None Include="..\..\..\BlazorFocused.png" Pack="true" PackagePath="\" Visible="false" />
-    <None Include="..\README.md" Pack="true" PackagePath="\" Visible="false" />
-  </ItemGroup>
-
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>

diff --git a/src/PowerShell/PowerShell/src/BlazorFocused.Automation.PowerShell.csproj b/src/PowerShell/PowerShell/src/BlazorFocused.Automation.PowerShell.csproj
@@ -11,10 +11,6 @@
     <PackageTags>dotnet;csharp;powershell;pscmdlet;cmdlet;</PackageTags>
   </PropertyGroup>
 
-  <PropertyGroup Label="Publishing Properties Override (Path)">
-    <AssemblyOriginatorKeyFile>../../../BlazorFocused.Automation.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="PowerShellStandard.Library" />
   </ItemGroup>
@@ -23,11 +19,6 @@
     <ProjectReference Include="..\..\..\Runtime\src\BlazorFocused.Automation.Runtime.csproj" />
   </ItemGroup>
 
-  <ItemGroup Label="NuGet Artifacts">
-    <None Include="..\..\..\..\BlazorFocused.png" Pack="true" PackagePath="\" Visible="false"  />
-    <None Include="..\README.md" Pack="true" PackagePath="\" Visible="false"/>
-  </ItemGroup>
-
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>

diff --git a/src/PowerShell/PowerShell/test/BlazorFocused.Automation.PowerShell.Test.csproj b/src/PowerShell/PowerShell/test/BlazorFocused.Automation.PowerShell.Test.csproj
@@ -38,8 +38,4 @@
     <ProjectReference Include="..\src\BlazorFocused.Automation.PowerShell.csproj" />
   </ItemGroup>
 
-  <PropertyGroup Label="Publishing Properties Override (Path)">
-    <AssemblyOriginatorKeyFile>../../../BlazorFocused.Automation.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
 </Project>
diff --git a/src/PowerShell/Tools/src/BlazorFocused.Automation.PowerShell.Tools.csproj b/src/PowerShell/Tools/src/BlazorFocused.Automation.PowerShell.Tools.csproj
@@ -19,15 +19,6 @@
     <ProjectReference Include="..\..\PowerShell\src\BlazorFocused.Automation.PowerShell.csproj" />
   </ItemGroup>
 
-  <ItemGroup Label="NuGet Artifacts">
-    <None Include="..\..\..\..\BlazorFocused.png" Pack="true" PackagePath="\" Visible="false"  />
-    <None Include="..\README.md" Pack="true" PackagePath="\" Visible="false"/>
-  </ItemGroup>
-
-  <PropertyGroup Label="Publishing Properties Override (Path)">
-    <AssemblyOriginatorKeyFile>../../../BlazorFocused.Automation.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>

diff --git a/src/PowerShell/Tools/test/BlazorFocused.Automation.PowerShell.Tools.Test.csproj b/src/PowerShell/Tools/test/BlazorFocused.Automation.PowerShell.Tools.Test.csproj
@@ -35,8 +35,4 @@
     <ProjectReference Include="..\src\BlazorFocused.Automation.PowerShell.Tools.csproj" />
   </ItemGroup>
 
-  <PropertyGroup Label="Publishing Properties Override (Path)">
-    <AssemblyOriginatorKeyFile>../../../BlazorFocused.Automation.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
 </Project>
diff --git a/src/Runtime/src/BlazorFocused.Automation.Runtime.csproj b/src/Runtime/src/BlazorFocused.Automation.Runtime.csproj
@@ -15,11 +15,6 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" />
   </ItemGroup>
 
-  <ItemGroup Label="NuGet Artifacts">
-    <None Include="..\..\..\BlazorFocused.png" Pack="true" PackagePath="\" Visible="false"  />
-    <None Include="..\README.md" Pack="true" PackagePath="\" Visible="false"/>
-  </ItemGroup>
-
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>