Package dnx shim

Author: dsplaisted

src/Layout/dnx/dnx.csproj

@@ -10,6 +10,9 @@
     <OptimizationPreference>Size</OptimizationPreference>
     <StackTraceSupport>false</StackTraceSupport>
     <_IsPublishing>true</_IsPublishing>
+
+    <!-- Don't include TargetFramework in output path to make using the result in the redist targets simpler -->
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
   <ItemGroup>

src/Layout/redist/redist.csproj

@@ -69,6 +69,7 @@
     <ProjectReference Include="..\..\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj" />
     <ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-watch\dotnet-watch.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
     <ProjectReference Include="$(RepoRoot)src\BuiltInTools\dotnet-format\dotnet-format.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"  Private="false" />
+    <ProjectReference Include="..\dnx\dnx.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"  Private="false" />
 
     <ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
   </ItemGroup>

src/Layout/redist/targets/GenerateInstallerLayout.targets

@@ -64,12 +64,12 @@
                       Overwrite="true" />
   </Target>
 
-  <Target Name="LayoutDnxScript">
+  <Target Name="LayoutDnxShim">
     <PropertyGroup>
-      <DnxScriptSource Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">dnx.cmd</DnxScriptSource>
-      <DnxScriptSource Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))">dnx</DnxScriptSource>
+      <DnxShimSource Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">$(ArtifactsBinDir)dnx\$(Configuration)\win-$(TargetArchitecture)\publish\dnx.exe</DnxShimSource>
+      <DnxShimSource Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))">dnx</DnxShimSource>
     </PropertyGroup>
-    <Copy SourceFiles="$(DnxScriptSource)" DestinationFolder="$(RedistInstallerLayoutPath)" />
+    <Copy SourceFiles="$(DnxShimSource)" DestinationFolder="$(RedistInstallerLayoutPath)" />
 
     <!-- Mark script as executable -->
     <Exec Command="chmod 755 &quot;$(RedistInstallerLayoutPath)/dnx&quot;" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
@@ -92,7 +92,7 @@
                             LayoutManifests;
                             LayoutBaselineWorkloadSet;
                             LayoutWorkloadUserLocalMarker;
-                            LayoutDnxScript;
+                            LayoutDnxShim;
                             CrossgenLayout;
                             ReplaceBundledRuntimePackFilesWithSymbolicLinks"
           AfterTargets="AfterBuild" />