Because they are general purpose, move the .targets and .props files …

…out of the TFM level folder
SteveGilham · Nov 2, 2023 · 06384f8 · 06384f8
1 parent e73c8c7
commit 06384f8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/AltCover.Api.Tests/AltCover.Api.Tests.fsproj b/AltCover.Api.Tests/AltCover.Api.Tests.fsproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="..\nupkg\build\netstandard2.0\AltCover.targets" Link="AltCover.targets" />
+    <EmbeddedResource Include="..\nupkg\build\AltCover.targets" Link="AltCover.targets" />
     <EmbeddedResource Include="..\AltCover.Tests\CompressBoth.xml" Link="CompressBoth.xml" />
     <EmbeddedResource Include="..\AltCover.Tests\Compressible.xml" Link="Compressible.xml" />
     <EmbeddedResource Include="..\AltCover.Tests\CompressInterior.xml" Link="CompressInterior.xml" />

diff --git a/AltCover.Tests/AltCover.Tests.fsproj b/AltCover.Tests/AltCover.Tests.fsproj
@@ -39,7 +39,7 @@
     <EmbeddedResource Include="AltCover.Usage.txt" />
     <EmbeddedResource Include="AltCover.Runner.Usage.txt" />
     <EmbeddedResource Include="coverage-04.xsd" />
-    <EmbeddedResource Include="..\nupkg\build\netstandard2.0\AltCover.targets" Link="AltCover.targets" />
+    <EmbeddedResource Include="..\nupkg\build\AltCover.targets" Link="AltCover.targets" />
     <EmbeddedResource Include="HandRolledMonoCoverage.xml" />
     <EmbeddedResource Include="Sample1WithOpenCover.xml" />
     <EmbeddedResource Include="Sample1ClassExclusion.xml" />

diff --git a/nupkg/build/netstandard2.0/AltCover.props → nupkg/build/AltCover.props b/nupkg/build/netstandard2.0/AltCover.props → nupkg/build/AltCover.props
diff --git a/nupkg/build/netstandard2.0/AltCover.targets → nupkg/build/AltCover.targets b/nupkg/build/netstandard2.0/AltCover.targets → nupkg/build/AltCover.targets
@@ -1,8 +1,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <AltCoverNetCoreEngine>$(MSBuildThisFileDirectory)../../tools/netcoreapp2.0/AltCover.Engine.dll</AltCoverNetCoreEngine>
-    <AltCoverNetStdEngine>$(MSBuildThisFileDirectory)../../lib/netstandard2.0/AltCover.Engine.dll</AltCoverNetStdEngine>
+    <AltCoverNetCoreEngine>$(MSBuildThisFileDirectory)../tools/netcoreapp2.0/AltCover.Engine.dll</AltCoverNetCoreEngine>
+    <AltCoverNetStdEngine>$(MSBuildThisFileDirectory)../lib/netstandard2.0/AltCover.Engine.dll</AltCoverNetStdEngine>
     <AltCoverEngine Condition="Exists($(AltCoverNetStdEngine))">$(AltCoverNetStdEngine)</AltCoverEngine>
     <AltCoverEngine Condition="Exists($(AltCoverNetCoreEngine))">$(AltCoverNetCoreEngine)</AltCoverEngine>
     <AltCoverInstrumentedDirectory>$([System.IO.Path]::Combine($(TargetDir), '__Instrumented'))</AltCoverInstrumentedDirectory>