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

Add support for pkgprojs in cli repp

Browse source 
- Move src\corehost\packaging to pkg\ directory.
- Renamed PackageCoreHost to PackagePkgProjects and removed blocker
- Updated copy of packages in PackagePkgProjects target to override (because there is no proper clean)
- Update dir.props to match the package version for the runtime.json
- Moved all CoreHost packages under  Microsoft.NETCore.DotNetHost directory
- Add the license files to the packages

Add support for building Microsoft.NETCore.App meta-package
- VersionNumber will be of form 1.0.0-rc2-<NETSTandard.Library build#>-<CLIbuild#>
EX: 1.0.0-rc2-23931-002203
This commit is contained in:
Wes Haggard 2016-04-04 17:55:12 -07:00
parent 722cd3b681
commit 3ab4a30eb8
37 changed files with 315 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

54
pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj Normal file
View file

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<Version>1.0.0</Version>
<PackagePlatform>AnyCPU</PackagePlatform>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.NETCore.DotNetHost\Microsoft.NETCore.DotNetHostPolicy.pkgproj">
<TargetFramework>.NETStandard1.0</TargetFramework>
</ProjectReference>
</ItemGroup>
<Target Name="ReadDependenciesFromProjectJsonFile" BeforeTargets="GetPackageDependencies">
<ReadLinesFromFile File="$(MSBuildThisFileDirectory)project.json">
<Output TaskParameter="Lines" ItemName="ProjectJsonLines" />
</ReadLinesFromFile>
<ItemGroup>
<PackageMatch Include="@(ProjectJsonLines)">
<PackageId>$([System.Text.RegularExpressions.Regex]::Match('%(Identity)', '(\w[^:&quot;]*)'))</PackageId>
<PackageVersion>$([System.Text.RegularExpressions.Regex]::Match('%(Identity)', '(\d+\.\d+.\d+[^&quot;]*)'))</PackageVersion>
</PackageMatch>
<Dependency Include="@(PackageMatch -> '%(PackageId)')" Condition="'%(PackageVersion)' != ''">
<Version>%(PackageVersion)</Version>
<TargetFramework>.NETStandard1.0</TargetFramework>
</Dependency>
<!-- List of dependencies to mark as exclude=compile -->
<Dependency Condition="'%(Dependency.Identity)' == 'Microsoft.CodeAnalysis.CSharp'">
<Exclude>Compile</Exclude>
</Dependency>
<Dependency Condition="'%(Dependency.Identity)' == 'Microsoft.CodeAnalysis.VisualBasic'">
<Exclude>Compile</Exclude>
</Dependency>
<Dependency Condition="'%(Dependency.Identity)' == 'System.Runtime.Loader'">
<Exclude>Compile</Exclude>
</Dependency>
</ItemGroup>
<!-- Use NETStandard.Library version suffix for version suffix of Microsoft.NETCore.App -->
<PropertyGroup>
<NETStandardBuildNumber Condition="'%(Dependency.Identity)' == 'NETSTandard.Library'">$([System.Text.RegularExpressions.Regex]::Match('%(Dependency.Version)', -.*))</NETStandardBuildNumber>
<VersionSuffix Condition="'$(NETStandardBuildNumber)' != ''">$(NETStandardBuildNumber)</VersionSuffix>
<VersionSuffix Condition="'$(CLIBuildVersion)' != ''">$(VersionSuffix)-$(CLIBuildVersion)</VersionSuffix>
</PropertyGroup>
</Target>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>