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

Convert redist.csproj outputdir to static property

Browse source 
Also some cleanup to unnecessary stuff.
This commit is contained in:
Piotr Puszkiewicz 2017-02-16 14:15:05 -08:00
parent 1f45b5fa0a
commit a7fdc20f25
3 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/Compile.targets
View file

@ -50,11 +50,8 @@
<!-- Publish DotNet -->
<DotNetPublish ToolPath="$(Stage0Directory)"
Output="$(SdkOutputDirectory)"
Configuration="$(Configuration)"
VersionSuffix="$(CommitCount)"
ProjectPath="$(SrcDirectory)/redist/redist.csproj"
MSBuildArgs="/p:GenerateRuntimeConfigurationFiles=true" />
ProjectPath="$(SrcDirectory)/redist/redist.csproj" />
<!-- Publish Roslyn -->
<DotNetPublish ToolPath="$(Stage0Directory)"

1
build/OutputDirectories.props
View file

@ -7,6 +7,7 @@
<DotnetStage1>$(Stage1Directory)/dotnet$(ExeExtension)</DotnetStage1>
<Stage2Directory>$(BaseOutputDirectory)/stage2</Stage2Directory>
<Stage2SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</Stage2SymbolsDirectory>
<Stage2SdkDirectory>$(Stage2Directory)/sdk/$(CommitCount)</Stage2SdkDirectory>
<DotnetStage2>$(Stage2Directory)/dotnet$(ExeExtension)</DotnetStage2>
<OutputDirectory>$(Stage2Directory)/</OutputDirectory>
<Stage2CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory>

25
src/redist/redist.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
@ -7,23 +7,16 @@
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.4</PackageTargetFallback>
<PublishDir>$(Stage2SdkDirectory)</PublishDir>
<VersionSuffix>$(CommitCount)</VersionSuffix>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.App">
<Version>$(CLI_SharedFrameworkVersion)</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build.Runtime">
<Version>$(CLI_MSBuild_Version)</Version>
</PackageReference>
<PackageReference Include="NuGet.Build.Tasks">
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="Microsoft.TestPlatform.CLI">
<Version>$(CLI_TestPlatform_Version)</Version>
</PackageReference>
<PackageReference Include="Microsoft.TestPlatform.Build">
<Version>$(CLI_TestPlatform_Version)</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
<PackageReference Include="Microsoft.Build.Runtime" Version="$(CLI_MSBuild_Version)" />
<PackageReference Include="NuGet.Build.Tasks" Version="$(CLI_NuGet_Version)" />
<PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(CLI_TestPlatform_Version)" />
<PackageReference Include="Microsoft.TestPlatform.Build" Version="$(CLI_TestPlatform_Version)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\dotnet\dotnet.csproj" />