Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit dd01dbf

Browse files
committed
Bringing down MicroBuild.Core props and targets separately from build_tools.
1 parent bbf235e commit dd01dbf

File tree

6 files changed

+23
-6
lines changed

6 files changed

+23
-6
lines changed

NuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
<add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
1414
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
1515
<add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
16+
<add key="build_tools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
1617
</packageSources>
1718
</configuration>

build/DependencyVersions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
2020
<CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
2121
<AspNetCoreRuntimeVersion>2.0.0-preview1-65</AspNetCoreRuntimeVersion>
22+
<MicroBuildVersion>0.2.0</MicroBuildVersion>
2223

2324
<!-- This should either be timestamped or notimestamp as appropriate -->
2425
<AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>

build/MicroBuild.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<MicroBuildPropsAndTargetsPath>$(NuGetPackagesDir)/microbuild.core/$(MicroBuildVersion)/build/</MicroBuildPropsAndTargetsPath>
4+
</PropertyGroup>
5+
</Project>

build/Signing.proj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project InitialTargets="SetSigningProperties" DefaultTargets="SignFiles" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<RepoRoot>$(MSBuildThisFileDirectory)/..</RepoRoot>
5-
</PropertyGroup>
6-
7-
<Import Project="$(RepoRoot)/build_tools/MicroBuild.Core.props" />
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4+
<Import Project="$(MicroBuildPropsAndTargetsPath)MicroBuild.Core.props" />
85

96
<!-- This will be overridden if we're building with MicroBuild. -->
107
<Target Name="SignFiles">
@@ -127,5 +124,5 @@
127124
</ItemGroup>
128125
</Target>
129126

130-
<Import Project="$(RepoRoot)/build_tools/MicroBuild.Core.targets" />
127+
<Import Project="$(MicroBuildPropsAndTargetsPath)MicroBuild.Core.targets" />
131128
</Project>

dir.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<Import Project="build/BuildDefaults.props" />
3636
<Import Project="build/Stage0.props" />
3737
<Import Project="build/CrossGen.props" />
38+
<Import Project="build/MicroBuild.props" />
3839
<Import Project="build/VersionBadge.props" />
3940
<Import Project="build/BundledRuntimes.props" />
4041
<Import Project="build/BackwardsCompatibilityRuntimes.props" />
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
3+
4+
<PropertyGroup>
5+
<TargetFramework>netcoreapp1.0</TargetFramework>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildVersion)" />
10+
</ItemGroup>
11+
12+
</Project>

0 commit comments

Comments
 (0)