diff options
| author | Alex Ghiondea <ghiondea.alexandru@microsoft.com> | 2015-02-18 16:26:30 -0800 |
|---|---|---|
| committer | Alex Ghiondea <ghiondea.alexandru@microsoft.com> | 2015-02-19 11:24:20 -0800 |
| commit | fbc318cfd987694d04431aa4858e299d712af940 (patch) | |
| tree | aee74df1df62da0486580d743a120182c4e9f1c3 /dir.props | |
| parent | f846ccff6be6b47f139a6b910cae20de54f54329 (diff) | |
| download | coreclr-fbc318cfd987694d04431aa4858e299d712af940.tar.gz coreclr-fbc318cfd987694d04431aa4858e299d712af940.tar.bz2 coreclr-fbc318cfd987694d04431aa4858e299d712af940.zip | |
Setup the CoreCLR repo to use the LocalPackagePublish mechanism.
This will enable the 'local publish' of the CoreCLR package to a location where
it can be picked up by the CoreFx build. What this means is that you will be able
to build the CoreCLR package and use that to run the CoreFx tests on top of it.
Changes required to make this happen:
- Refactor the managed build to make sure the buildtools gets restored before
we attempt to use the targets it provides.
- Take a dependency to the Microsoft.DotNet.BuildTools to bring in the packages.targets
- Update the $(PackagesDir) to point to the <repo root>\packages to make it consistent with CoreFx
- Hook-up the LocalPackagePublish targets to the build of the CoreCLR NuGet packages
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 34 |
1 files changed, 28 insertions, 6 deletions
@@ -16,7 +16,7 @@ <SourceDir Condition="'$(__SourceDir)'==''">$(ProjectDir)\src\</SourceDir> <PackagesDir>$(__PackagesDir)\</PackagesDir> - <PackagesDir Condition="'$(__PackagesDir)'==''">$(SourceDir)\.nuget\</PackagesDir> + <PackagesDir Condition="'$(__PackagesDir)'==''">$(ProjectDir)\packages\</PackagesDir> <RootBinDir>$(__RootBinDir)\</RootBinDir> <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)\binaries\</RootBinDir> @@ -37,6 +37,20 @@ <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)\tests\$(BuildArch)\$(BuildType)\</TestWorkingDir> </PropertyGroup> + <!-- Setup Nuget properties --> + <ItemGroup> + <NuSpecSrcs Include="$(SourceDir)\.nuget\Microsoft.DotNet.CoreCLR.nuspec" /> + <NuSpecSrcs Condition="'$(Configuration)'=='Release'" Include="$(SourceDir)\.nuget\Microsoft.DotNet.CoreCLR.Development.nuspec" /> + <NuSpecSrcs Condition="'$(Configuration)'=='Debug'" Include="$(SourceDir)\.nuget\Microsoft.DotNet.CoreCLR.Debug.Development.nuspec" /> + </ItemGroup> + <ItemGroup> + <!-- Backslash appended, see note in dir.props about the PackagesBinDir property --> + <NuSpecs Include="$(PackagesBinDir)\Microsoft.DotNet.CoreCLR.nuspec" /> + <NuSpecs Condition="'$(Configuration)'=='Release'" Include="$(PackagesBinDir)\Microsoft.DotNet.CoreCLR.Development.nuspec" /> + <NuSpecs Condition="'$(Configuration)'=='Debug'" Include="$(PackagesBinDir)\Microsoft.DotNet.CoreCLR.Debug.Development.nuspec" /> + </ItemGroup> + + <!-- Common NuGet properties --> <PropertyGroup> <NuGetToolPath>$(ToolsDir)NuGet.exe</NuGetToolPath> @@ -47,10 +61,18 @@ <!-- Common build tool properties --> <PropertyGroup> - <BuildToolsPackageName>Microsoft.DotNet.BuildTools.CoreCLR</BuildToolsPackageName> - <BuildToolsVersion>1.0.1-prerelease</BuildToolsVersion> - <BuildToolsInstallSempahore>$(ToolsDir)BuildTools.$(BuildToolsVersion).installed.semaphore</BuildToolsInstallSempahore> - <BuildToolsTargetInputs>$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)build.proj</BuildToolsTargetInputs> - <BuildToolsTargetOutputs>$(BuildToolsInstallSempahore)</BuildToolsTargetOutputs> + + <BuildToolsCoreCLRPackageName>Microsoft.DotNet.BuildTools.CoreCLR</BuildToolsCoreCLRPackageName> + <BuildToolsCoreCLRVersion>1.0.1-prerelease</BuildToolsCoreCLRVersion> + <BuildToolsCoreCLRInstallSempahore>$(ToolsDir)BuildTools.$(BuildToolsCoreCLRVersion).installed.semaphore</BuildToolsCoreCLRInstallSempahore> + + <BuildToolsPackageName>Microsoft.DotNet.BuildTools</BuildToolsPackageName> + <BuildToolsVersion>1.0.25-prerelease-00009</BuildToolsVersion> + + <BuildToolsCoreCLRTargetInputs>$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)build.proj</BuildToolsCoreCLRTargetInputs> + <BuildToolsCoreCLRTargetOutputs>$(BuildToolsCoreCLRInstallSempahore)</BuildToolsCoreCLRTargetOutputs> + + <BuildToolsCoreCLRLocation>$(ToolsDir)\$(BuildToolsCoreCLRPackageName).$(BuildToolsCoreCLRVersion)</BuildToolsCoreCLRLocation> + <BuildToolsLocation>$(ToolsDir)\$(BuildToolsPackageName).$(BuildToolsVersion)</BuildToolsLocation> </PropertyGroup> </Project>
\ No newline at end of file |