mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing a merge issue and crossgen issues.

Browse source
This commit is contained in:
Parallels 2018-06-26 14:44:55 -07:00
parent e2b679c4bb
commit 4d9b015f8f
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/package/Installer.MSI.targets
View file

@ -193,7 +193,6 @@
'$(SdkMSBuildExtensionsNupkgFile)'" />
<GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)"
<<<<<<< HEAD
OutputFile="$(SdkMSBuildExtensionsSwrFile)"/> -->
</Target>

23
src/redist/redist.csproj
View file

@ -21,9 +21,9 @@
PublishToolset;
PublishTemplates;
PublishLzmaArchive;
CrossgenPublishDir;
PublishDotnetTools;
PublishVersionFile;
CrossgenPublishDir;
PublishAppHostTemplate;
RetargetVSTestConsole;
GenerateMSBuildExtensions"
@ -49,14 +49,12 @@
<Toolset Remove="*" />
<Toolset Include="$(ToolsetPublishDirectory)/**/*" />
<RefFilesToRemove Include="$(SdkOutputDirectory)/ref/**/*" />
<!-- Workaround for https://github.com/dotnet/toolset/issues/8 -->
<Toolset Remove="$(ToolsetPublishDirectory)/ref/**/*"/>
</ItemGroup>
<Copy SourceFiles="@(Toolset)"
DestinationFiles="@(Toolset->'$(OutputDirectory)/sdk/$(ToolsetVersion)/%(RecursiveDir)%(Filename)%(Extension)')" />
<!-- Workaround for https://github.com/dotnet/toolset/issues/8 -->
<Delete Files="@(RefFilesToRemove)" />
</Target>
<Target Name="PublishDotnetTools"
@ -206,7 +204,7 @@
DiasymReaderPath="@(DiasymReaderPath)"
PlatformAssemblyPaths="@(PlatformAssemblies);@(FSharpFolders);$(SharedFrameworkNameVersionPath)" />
<!--<Crossgen
<Crossgen
SourceAssembly="%(RemainingTargets.FullPath)"
DestinationPath="%(RemainingTargets.FullPath)"
JITPath="$(LibCLRJitPath)"
@ -214,7 +212,7 @@
ReadyToRun="True"
CreateSymbols="$(CreateCrossgenSymbols)"
DiasymReaderPath="@(DiasymReaderPath)"
PlatformAssemblyPaths="@(PlatformAssemblies);@(RemainingFolders);$(SharedFrameworkNameVersionPath)" />-->
PlatformAssemblyPaths="@(PlatformAssemblies);@(RemainingFolders);$(SharedFrameworkNameVersionPath)" />
</Target>
<Target Name="ChmodPublishDir"
@ -226,6 +224,17 @@
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" />
</Target>
<Target Name="SeparateSymbolsFromPublishDir"
AfterTargets="CrossgenPublishDir">
<ItemGroup>
<PdbsToMove Include="$(PublishDir)/**/*.pdb" />
<PdbsToMove Include="$(PublishDir)/**/*.ni.*.map" />
</ItemGroup>
<Move SourceFiles="@(PdbsToMove)"
DestinationFiles="@(PdbsToMove->'$(SymbolsDirectory)/sdk/$(SdkVersion)/%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<Target Name="PublishTemplates">
<ItemGroup>
<TemplatesToBundle Include="$(RepoRoot)/build/BundledTemplates.proj">