summaryrefslogtreecommitdiff
path: root/dependencies.props
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2017-06-13 18:47:36 +0900
committerJiyoung Yun <jy910.yun@samsung.com>2017-06-13 18:47:36 +0900
commit61d6a817e39d3bae0f47dbc09838d51db22a5d30 (patch)
treecb37caa1784bc738b976273335d6ed04a7cc80b0 /dependencies.props
parent5b975f8233e8c8d17b215372f89ca713b45d6a0b (diff)
downloadcoreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.gz
coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.bz2
coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.zip
Imported Upstream version 2.0.0.11992upstream/2.0.0.11992
Diffstat (limited to 'dependencies.props')
-rw-r--r--dependencies.props35
1 files changed, 29 insertions, 6 deletions
diff --git a/dependencies.props b/dependencies.props
index c06c465d52..8aada2c0a2 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -1,25 +1,40 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup>
+ <!-- Central place to set the versions of all nuget packages produced in the repo -->
+ <PackageVersion Condition="'$(PackageVersion)' == ''">2.0.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>
+
+ <PreReleaseLabel>preview2</PreReleaseLabel>
+ </PropertyGroup>
+
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<PropertyGroup>
- <CoreFxCurrentRef>947e90b41c30a1f0a906f8d996443233c2ceedf4</CoreFxCurrentRef>
- <CoreClrCurrentRef>947e90b41c30a1f0a906f8d996443233c2ceedf4</CoreClrCurrentRef>
+ <CoreFxCurrentRef>d4040dc6f74933eec9827d44e288c9cd15996a15</CoreFxCurrentRef>
+ <CoreClrCurrentRef>d4040dc6f74933eec9827d44e288c9cd15996a15</CoreClrCurrentRef>
</PropertyGroup>
<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
- <CoreFxExpectedPrerelease>preview1-25221-01</CoreFxExpectedPrerelease>
+ <CoreFxExpectedPrerelease>preview2-25331-01</CoreFxExpectedPrerelease>
</PropertyGroup>
<!-- Full package version strings that are used in other parts of the build. -->
<PropertyGroup>
- <CoreClrPackageVersion>2.0.0-preview1-25221-01</CoreClrPackageVersion>
+ <CoreClrPackageVersion>2.0.0-preview2-25330-02</CoreClrPackageVersion>
<XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
+ <XUnitConsoleNetCoreVersion>1.0.2-prerelease-00177</XUnitConsoleNetCoreVersion>
+ <XUnitPerformanceApiVersion>1.0.0-beta-build0007</XUnitPerformanceApiVersion>
+ <MicrosoftDiagnosticsTracingLibraryVersion>1.0.3-alpha-experimental</MicrosoftDiagnosticsTracingLibraryVersion>
</PropertyGroup>
<!-- Package dependency verification/auto-upgrade configuration. -->
<PropertyGroup>
<BaseDotNetBuildInfo>build-info/dotnet/</BaseDotNetBuildInfo>
- <DependencyBranch>master</DependencyBranch>
+ <DependencyBranch>release/2.0.0</DependencyBranch>
<CurrentRefXmlPath>$(MSBuildThisFileFullPath)</CurrentRefXmlPath>
</PropertyGroup>
@@ -72,8 +87,16 @@
<Version>1.0.0-alpha-build0040</Version>
</StaticDependency>
+ <XUnitPerformanceApiDependency Include="xunit.performance.api" />
+ <XUnitPerformanceApiDependency Include="xunit.performance.core" />
+ <XUnitPerformanceApiDependency Include="xunit.performance.execution" />
+ <XUnitPerformanceApiDependency Include="xunit.performance.metrics" />
+ <StaticDependency Include="@(XUnitPerformanceApiDependency)">
+ <Version>$(XUnitPerformanceApiVersion)</Version>
+ </StaticDependency>
+
<StaticDependency Include="xunit.console.netcore">
- <Version>1.0.2-prerelease-00177</Version>
+ <Version>$(XUnitConsoleNetCoreVersion)</Version>
</StaticDependency>
<DependencyBuildInfo Include="@(StaticDependency)">