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

Merge conflicts

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-02-27 15:40:11 -08:00
parent 981db5f817
commit 5d193e8b39
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/Compile.targets
View file

@ -6,9 +6,7 @@
<RuntimeNETCoreAppPackageName>runtime.$(CoreCLRRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName> <RuntimeNETCoreAppPackageName>runtime.$(CoreCLRRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
<CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath> <CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath>
<LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath> <LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
<MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir> <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
<MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
<SharedFrameworkNameVersionPath>$(OutputDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
build/MSBuildExtensions.props
View file

@ -1,4 +1,8 @@
<Project> <Project>
<PropertyGroup>
<MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<MSBuildExtensionsContent Include="$(MSBuildImportsDir)/**/*" /> <MSBuildExtensionsContent Include="$(MSBuildImportsDir)/**/*" />
</ItemGroup> </ItemGroup>

4
src/redist/redist.csproj
View file

@ -81,6 +81,10 @@
<Copy SourceFiles="@(MSBuildExtensionsContent)" <Copy SourceFiles="@(MSBuildExtensionsContent)"
DestinationFolder="$(SdkOutputDirectory)/%(RecursiveDir)" /> DestinationFolder="$(SdkOutputDirectory)/%(RecursiveDir)" />
<PropertyGroup>
<MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<NuPkgContentForMSBuildExtensions Include="$(MSBuildTargetsDirectory)/**/*.targets; <NuPkgContentForMSBuildExtensions Include="$(MSBuildTargetsDirectory)/**/*.targets;
$(MSBuildTargetsDirectory)/**/*.Targets; $(MSBuildTargetsDirectory)/**/*.Targets;