From 26822d4c876ee6203014eaf6df398c874c4535ea Mon Sep 17 00:00:00 2001
From: Prafull Bhosale <prbhosal@microsoft.com>
Date: Mon, 30 Oct 2017 12:10:24 -0700
Subject: [PATCH] Fix package structure for CodeGeneration.Design

---
 ...VisualStudio.Web.CodeGeneration.Design.csproj | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.VisualStudio.Web.CodeGeneration.Design/Microsoft.VisualStudio.Web.CodeGeneration.Design.csproj b/src/Microsoft.VisualStudio.Web.CodeGeneration.Design/Microsoft.VisualStudio.Web.CodeGeneration.Design.csproj
index 3fb90b331..4d3e467ba 100644
--- a/src/Microsoft.VisualStudio.Web.CodeGeneration.Design/Microsoft.VisualStudio.Web.CodeGeneration.Design.csproj
+++ b/src/Microsoft.VisualStudio.Web.CodeGeneration.Design/Microsoft.VisualStudio.Web.CodeGeneration.Design.csproj
@@ -29,14 +29,14 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(OS)'=='Windows_NT'">
-    <None Include="$(OutputPath)net461\win7-x64\$(AssemblyName).exe" Pack="true" PackagePath="runtimes\win7-x64\native\$(AssemblyName).exe" />
-    <None Include="$(OutputPath)net461\win7-x64\$(AssemblyName).xml" Pack="true" PackagePath="runtimes\win7-x64\native\$(AssemblyName).xml" />
-    <None Include="$(X86ProjectDirectory)\bin\$(Configuration)\net461\win7-x86\$(AssemblyName).exe" Pack="true" PackagePath="runtimes\win7-x86\native\$(AssemblyName).exe" />
-    <None Include="$(X86ProjectDirectory)\bin\$(Configuration)\net461\win7-x86\$(AssemblyName).xml" Pack="true" PackagePath="runtimes\win7-x86\native\$(AssemblyName).xml" />
-    <None Include="$(ARMProjectDirectory)\bin\$(Configuration)\net461\win-arm\$(AssemblyName).exe" Pack="true" PackagePath="runtimes\win-arm\native\$(AssemblyName).exe" />
-    <None Include="$(ARMProjectDirectory)\bin\$(Configuration)\net461\win-arm\$(AssemblyName).xml" Pack="true" PackagePath="runtimes\win-arm\native\$(AssemblyName).xml" />
-    <None Include="$(ARM64ProjectDirectory)\bin\$(Configuration)\net461\win-arm64\$(AssemblyName).exe" Pack="true" PackagePath="runtimes\win-arm64\native\$(AssemblyName).exe" />
-    <None Include="$(ARM64ProjectDirectory)\bin\$(Configuration)\net461\win-arm64\$(AssemblyName).xml" Pack="true" PackagePath="runtimes\win-arm64\native\$(AssemblyName).xml" />
+    <None Include="$(OutputPath)net461\win7-x64\$(AssemblyName).exe" Pack="true" PackagePath="runtimes\win7-x64\lib\net461\$(AssemblyName).exe" />
+    <None Include="$(OutputPath)net461\win7-x64\$(AssemblyName).xml" Pack="true" PackagePath="runtimes\win7-x64\lib\net461\$(AssemblyName).xml" />
+    <None Include="$(X86ProjectDirectory)\bin\$(Configuration)\net461\win7-x86\$(AssemblyName).exe" Pack="true" PackagePath="runtimes\win7-x86\lib\net461\$(AssemblyName).exe" />
+    <None Include="$(X86ProjectDirectory)\bin\$(Configuration)\net461\win7-x86\$(AssemblyName).xml" Pack="true" PackagePath="runtimes\win7-x86\lib\net461\$(AssemblyName).xml" />
+    <None Include="$(ARMProjectDirectory)\bin\$(Configuration)\net461\win-arm\$(AssemblyName).exe" Pack="true" PackagePath="runtimes\win-arm\lib\net461\$(AssemblyName).exe" />
+    <None Include="$(ARMProjectDirectory)\bin\$(Configuration)\net461\win-arm\$(AssemblyName).xml" Pack="true" PackagePath="runtimes\win-arm\lib\net461\$(AssemblyName).xml" />
+    <None Include="$(ARM64ProjectDirectory)\bin\$(Configuration)\net461\win-arm64\$(AssemblyName).exe" Pack="true" PackagePath="runtimes\win-arm64\lib\net461\$(AssemblyName).exe" />
+    <None Include="$(ARM64ProjectDirectory)\bin\$(Configuration)\net461\win-arm64\$(AssemblyName).xml" Pack="true" PackagePath="runtimes\win-arm64\lib\net461\$(AssemblyName).xml" />
     <None Include="$(AnyCpuProjectDirectory)\bin\$(Configuration)\net461\$(AssemblyName).exe" Pack="true" PackagePath="lib\net461\$(AssemblyName).exe" />
     <None Include="$(AnyCpuProjectDirectory)\bin\$(Configuration)\net461\$(AssemblyName).xml" Pack="true" PackagePath="lib\net461\$(AssemblyName).xml" />
   </ItemGroup>