diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
commit | 4b11dc566a5bbfa1378d6266525c281b028abcc8 (patch) | |
tree | b48831a898906734f8884d08b6e18f1144ee2b82 /dir.props | |
parent | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (diff) | |
download | coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.gz coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.bz2 coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.zip |
Imported Upstream version 1.0.0.9910upstream/1.0.0.9910
Diffstat (limited to 'dir.props')
-rw-r--r-- | dir.props | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -83,9 +83,8 @@ <!-- Output paths --> <PropertyGroup> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(RootBinDir)obj\</BaseIntermediateOutputPath> - <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(BuildType)</IntermediateOutputPath> - <OutputPath Condition="'$(OutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(BuildType)</OutputPath> - <FinalOutputPath Condition="'$(FinalOutputPath)' == ''">$(BinDir)</FinalOutputPath> + <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(BaseIntermediateOutputPath)$(BuildOS).$(BuildArch).$(BuildType)\</IntermediateOutputPath> + <OutputPath Condition="'$(OutputPath)' == ''">$(BinDir)</OutputPath> </PropertyGroup> <Import Condition="Exists('$(ToolsDir)BuildVersion.targets')" Project="$(ToolsDir)BuildVersion.targets" /> @@ -153,7 +152,7 @@ <ProjectUrl>https://dot.net</ProjectUrl> <!-- Central place to set the versions of all nuget packages produced in the repo --> - <PackageVersion Condition="'$(PackageVersion)' == ''">1.2.0</PackageVersion> + <PackageVersion Condition="'$(PackageVersion)' == ''">2.0.0</PackageVersion> <!-- Set the boolean below to true to generate packages with stabilized versions --> <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion> @@ -170,6 +169,8 @@ <MinOSForArch>win7</MinOSForArch> <MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch> <MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch> + <!-- This property must be set to disable local package installation --> + <SkipInstallLocallyBuiltPackages>true</SkipInstallLocallyBuiltPackages> <!-- Define packaging attributes for cross target components --> <HasCrossTargetComponents Condition="'$(TargetsWindows)' == 'true' and ('$(PackagePlatform)' =='arm64' or '$(PackagePlatform)' =='arm')">true</HasCrossTargetComponents> |