Fix the MSBuild targets which generate plugin.config to put it into the correct output directory

Author: Nate McMaster

releasenotes.props

@@ -1,5 +1,9 @@
 <Project>
   <PropertyGroup>
+    <PackageReleaseNotes Condition="'$(VersionPrefix)' == '0.2.4'">
+Bug fix:
+* Fix the MSBuild targets which generate plugin.config to put it into the correct output directory.
+    </PackageReleaseNotes>
     <PackageReleaseNotes Condition="'$(VersionPrefix)' == '0.2.3'">
 Bug fix:
 * Fix config file generation when using the SDK package

src/Plugins.Sdk/sdk/Sdk.props

@@ -1,5 +1,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+
+    <PluginConfigFileName>plugin.config</PluginConfigFileName>
   </PropertyGroup>
 </Project>

src/Plugins.Sdk/sdk/Sdk.targets

@@ -1,14 +1,16 @@
 <Project>
   <PropertyGroup>
-    <IsPlugin Condition=" '$(IsPlugin)' == '' ">true</IsPlugin>
-    <PluginConfigFile>$(TargetDir)plugin.config</PluginConfigFile>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+
+    <IsPlugin Condition=" '$(IsPlugin)' == '' ">true</IsPlugin>
+    <IntermediatePluginConfigFile>$(IntermediateOutputPath)$(MSBuildProjectName).$(PluginConfigFileName)</IntermediatePluginConfigFile>
     <GeneratePluginConfigFile Condition="'$(IsPlugin)' == 'true' AND '$(TargetFramework)' != ''">true</GeneratePluginConfigFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="$(PluginConfigFile)" Condition="'$(GeneratePluginConfigFile)' == 'true'">
+    <Content Include="$(IntermediatePluginConfigFile)" Condition="'$(GeneratePluginConfigFile)' == 'true'">
       <Visible>false</Visible>
+      <Link>$(PluginConfigFileName)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
@@ -17,7 +19,7 @@
   <Target Name="GeneratePluginConfig"
           BeforeTargets="CoreCompile"
           Inputs="$(MSBuildAllProjects);$(TargetPath)"
-          Outputs="$(PluginConfigFile)"
+          Outputs="$(IntermediatePluginConfigFile)"
           Condition="'$(GeneratePluginConfigFile)' == 'true'">
     <PropertyGroup>
       <_AssemblyIdentity>$(AssemblyName)</_AssemblyIdentity>
@@ -31,10 +33,10 @@
       </PluginConfigContent>
     </PropertyGroup>
 
-    <WriteLinesToFile Lines="$(PluginConfigContent)" Overwrite="true" File="$(PluginConfigFile)" />
+    <WriteLinesToFile Lines="$(PluginConfigContent)" Overwrite="true" File="$(IntermediatePluginConfigFile)" />
 
     <ItemGroup>
-      <FileWrites Include="$(PluginConfigFile)" />
+      <FileWrites Include="$(IntermediatePluginConfigFile)" />
     </ItemGroup>
   </Target>
 </Project>

version.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>0.2.3</VersionPrefix>
+    <VersionPrefix>0.2.4</VersionPrefix>
     <VersionSuffix>preview</VersionSuffix>
     <IncludePreReleaseLabelInPackageVersion Condition="'$(IsStableBuild)' != 'true'">true</IncludePreReleaseLabelInPackageVersion>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>