summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
authorwtgodbe <wigodbe@microsoft.com>2017-05-24 14:34:46 -0700
committerwtgodbe <wigodbe@microsoft.com>2017-06-06 12:13:34 -0700
commit029a54431d17569b6656ed644de426d3f4f8d346 (patch)
treefb6fc79ab6ee5e154a9516ab3ae063b335c0116b /dir.props
parent794eca076a882fcd2639fa692ca457150940231b (diff)
downloadcoreclr-029a54431d17569b6656ed644de426d3f4f8d346.tar.gz
coreclr-029a54431d17569b6656ed644de426d3f4f8d346.tar.bz2
coreclr-029a54431d17569b6656ed644de426d3f4f8d346.zip
Test packages from current build in pipeline
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props12
1 files changed, 4 insertions, 8 deletions
diff --git a/dir.props b/dir.props
index 451e550673..9039f49cb0 100644
--- a/dir.props
+++ b/dir.props
@@ -124,7 +124,6 @@
<!-- Packaging properties -->
<PropertyGroup>
<LicenseUrl>https://github.com/dotnet/coreclr/blob/master/LICENSE.TXT</LicenseUrl>
- <PreReleaseLabel>preview1</PreReleaseLabel>
<PackageDescriptionFile>$(SourceDir).nuget/descriptions.json</PackageDescriptionFile>
<PackageLicenseFile>$(ProjectDir)LICENSE.TXT</PackageLicenseFile>
<PackageThirdPartyNoticesFile>$(ProjectDir)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
@@ -138,13 +137,6 @@
<ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>
<ProjectUrl>https://dot.net</ProjectUrl>
-
- <!-- Central place to set the versions of all nuget packages produced in the repo -->
- <PackageVersion Condition="'$(PackageVersion)' == ''">2.1.0</PackageVersion>
-
- <!-- Set the boolean below to true to generate packages with stabilized versions -->
- <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
- <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
<!-- On Windows, MSbuild still runs against Desktop FX while it runs on .NET Core on non-Windows. this requires
pulling in different packaging dependencies.
@@ -186,6 +178,10 @@
<PackageIndex Include="$(PackageIndexFile)" />
</ItemGroup>
+ <PropertyGroup>
+ <BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile>
+ </PropertyGroup>
+
<!-- Use Roslyn Compilers to build -->
<Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false'" />
<Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)')" />