Bringing down MicroBuild.Core props and targets separately from build_tools.

This commit is contained in:
Livar Cunha 2017-05-10 12:08:38 -07:00
parent bbf235e333
commit dd01dbf4ce
6 changed files with 23 additions and 6 deletions

View file

@ -13,5 +13,6 @@
<add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
<add key="build_tools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
</packageSources>
</configuration>

View file

@ -19,6 +19,7 @@
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
<CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
<AspNetCoreRuntimeVersion>2.0.0-preview1-65</AspNetCoreRuntimeVersion>
<MicroBuildVersion>0.2.0</MicroBuildVersion>
<!-- This should either be timestamped or notimestamp as appropriate -->
<AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>

5
build/MicroBuild.props Normal file
View file

@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<MicroBuildPropsAndTargetsPath>$(NuGetPackagesDir)/microbuild.core/$(MicroBuildVersion)/build/</MicroBuildPropsAndTargetsPath>
</PropertyGroup>
</Project>

View file

@ -1,10 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project InitialTargets="SetSigningProperties" DefaultTargets="SignFiles" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<RepoRoot>$(MSBuildThisFileDirectory)/..</RepoRoot>
</PropertyGroup>
<Import Project="$(RepoRoot)/build_tools/MicroBuild.Core.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$(MicroBuildPropsAndTargetsPath)MicroBuild.Core.props" />
<!-- This will be overridden if we're building with MicroBuild. -->
<Target Name="SignFiles">
@ -127,5 +124,5 @@
</ItemGroup>
</Target>
<Import Project="$(RepoRoot)/build_tools/MicroBuild.Core.targets" />
<Import Project="$(MicroBuildPropsAndTargetsPath)MicroBuild.Core.targets" />
</Project>

View file

@ -35,6 +35,7 @@
<Import Project="build/BuildDefaults.props" />
<Import Project="build/Stage0.props" />
<Import Project="build/CrossGen.props" />
<Import Project="build/MicroBuild.props" />
<Import Project="build/VersionBadge.props" />
<Import Project="build/BundledRuntimes.props" />
<Import Project="build/BackwardsCompatibilityRuntimes.props" />

View file

@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildVersion)" />
</ItemGroup>
</Project>