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

Add relative paths, add logs by default

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-02-27 17:10:33 -08:00
parent 5d193e8b39
commit 8ca21b67f9
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/Compile.targets
View file

@ -6,7 +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>
<SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath> <SharedFrameworkNameVersionPath>$(OutputDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -121,7 +121,7 @@
DestinationFiles="@(NETCore10Assemblies)" /> DestinationFiles="@(NETCore10Assemblies)" />
<ItemGroup> <ItemGroup>
<FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" /> <FilesToClean Include="$(OutputDirectory)/sdk/**/vbc.exe" />
</ItemGroup> </ItemGroup>
<Delete Files="@(FilesToClean)" /> <Delete Files="@(FilesToClean)" />

2
run-build.ps1
View file

@ -115,6 +115,6 @@ if ($NoBuild)
else else
{ {
dotnet msbuild build.proj /p:Architecture=$Architecture /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles dotnet msbuild build.proj /p:Architecture=$Architecture /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
dotnet msbuild build.proj /m /v:diag /p:Architecture=$Architecture $ExtraParameters dotnet msbuild build.proj /m /v:diag /fl /flp:v=diag /p:Architecture=$Architecture $ExtraParameters
if($LASTEXITCODE -ne 0) { throw "Failed to build" } if($LASTEXITCODE -ne 0) { throw "Failed to build" }
} }

2
run-build.sh
View file

@ -180,7 +180,7 @@ echo "${args[@]}"
if [ $BUILD -eq 1 ]; then if [ $BUILD -eq 1 ]; then
dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
dotnet msbuild build.proj /m /v:diag /p:Architecture=$ARCHITECTURE "${args[@]}" dotnet msbuild build.proj /m /v:diag /fl /flp:v=diag /p:Architecture=$ARCHITECTURE "${args[@]}"
else else
echo "Not building due to --nobuild" echo "Not building due to --nobuild"
echo "Command that would be run is: 'dotnet msbuild build.proj /m /p:Architecture=$ARCHITECTURE ${args[@]}'" echo "Command that would be run is: 'dotnet msbuild build.proj /m /p:Architecture=$ARCHITECTURE ${args[@]}'"

4
src/redist/redist.csproj
View file

@ -91,11 +91,13 @@
$(MSBuildTargetsDirectory)/**/*.props; $(MSBuildTargetsDirectory)/**/*.props;
$(MSBuildTargetsDirectory)/**/*.overridetasks; $(MSBuildTargetsDirectory)/**/*.overridetasks;
$(MSBuildTargetsDirectory)/**/*.tasks" /> $(MSBuildTargetsDirectory)/**/*.tasks" />
<NuPkgContentForMSBuildExtensionsRelativePaths Include="@(NuPkgContentForMSBuildExtensions->'runtimes/any/native/%(RecursiveDir)%(Filename)%(Extension)')" />
</ItemGroup> </ItemGroup>
<RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json" <RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"
SectionName="runtimeTargets" SectionName="runtimeTargets"
AssetPath="@(NuPkgContentForMSBuildExtensions->'%(RecursiveDir)%(Filename)%(Extension)')" /> AssetPath="%(NuPkgContentForMSBuildExtensionsRelativePaths.Identity)" />
<Move SourceFiles="@(NuPkgContentForMSBuildExtensions)" <Move SourceFiles="@(NuPkgContentForMSBuildExtensions)"
DestinationFiles="@(NuPkgContentForMSBuildExtensions->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" /> DestinationFiles="@(NuPkgContentForMSBuildExtensions->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />