зеркало из https://github.com/dotnet/corefx.git
Merged PR 164801: Prep 1.0.0 for 1.0.15 release
Prep 1.0.0 for 1.0.15 release
This commit is contained in:
Родитель
d5b3986d5d
Коммит
9ee11e5528
|
@ -16,7 +16,7 @@
|
||||||
<XmlDocFileRoot>$(PackagesDir)Microsoft.Private.Intellisense/1.0.0-rc4-24206-00/xmldocs</XmlDocFileRoot>
|
<XmlDocFileRoot>$(PackagesDir)Microsoft.Private.Intellisense/1.0.0-rc4-24206-00/xmldocs</XmlDocFileRoot>
|
||||||
<!-- We're currently not building a "live" baseline, instead we're using .NETCore 1.0 RTM stable versions as the baseline -->
|
<!-- We're currently not building a "live" baseline, instead we're using .NETCore 1.0 RTM stable versions as the baseline -->
|
||||||
<SkipBaseLineCheck>true</SkipBaseLineCheck>
|
<SkipBaseLineCheck>true</SkipBaseLineCheck>
|
||||||
<LineupPackageVersion Condition="'$(LineupPackageVersion)' == ''">1.0.6</LineupPackageVersion>
|
<LineupPackageVersion Condition="'$(LineupPackageVersion)' == ''">1.0.7</LineupPackageVersion>
|
||||||
<PlatformPackageVersion Condition="'$(PlatformPackageVersion)' == ''">1.0.2</PlatformPackageVersion>
|
<PlatformPackageVersion Condition="'$(PlatformPackageVersion)' == ''">1.0.2</PlatformPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
|
@ -1540,7 +1540,7 @@
|
||||||
<Version>4.1.1</Version>
|
<Version>4.1.1</Version>
|
||||||
</StablePackage>
|
</StablePackage>
|
||||||
|
|
||||||
<!-- Post 1.0.14 update for UWP -->
|
<!-- Servicing 1.0.15 wave -->
|
||||||
<StablePackage Include="System.Private.Uri">
|
<StablePackage Include="System.Private.Uri">
|
||||||
<Version>4.0.4</Version>
|
<Version>4.0.4</Version>
|
||||||
</StablePackage>
|
</StablePackage>
|
||||||
|
@ -1550,6 +1550,27 @@
|
||||||
<StablePackage Include="runtime.win7.System.Private.Uri">
|
<StablePackage Include="runtime.win7.System.Private.Uri">
|
||||||
<Version>4.0.4</Version>
|
<Version>4.0.4</Version>
|
||||||
</StablePackage>
|
</StablePackage>
|
||||||
|
<StablePackage Include="Microsoft.NETCore.Targets">
|
||||||
|
<Version>1.0.7</Version>
|
||||||
|
</StablePackage>
|
||||||
|
<StablePackage Include="System.Runtime">
|
||||||
|
<Version>4.1.2</Version>
|
||||||
|
</StablePackage>
|
||||||
|
<StablePackage Include="runtime.any.System.Runtime">
|
||||||
|
<Version>4.1.2</Version>
|
||||||
|
</StablePackage>
|
||||||
|
<StablePackage Include="runtime.aot.System.Runtime">
|
||||||
|
<Version>4.0.22</Version>
|
||||||
|
</StablePackage>
|
||||||
|
<StablePackage Include="System.Runtime.Extensions">
|
||||||
|
<Version>4.1.2</Version>
|
||||||
|
</StablePackage>
|
||||||
|
<StablePackage Include="runtime.unix.System.Runtime.Extensions">
|
||||||
|
<Version>4.1.2</Version>
|
||||||
|
</StablePackage>
|
||||||
|
<StablePackage Include="runtime.win.System.Runtime.Extensions">
|
||||||
|
<Version>4.1.2</Version>
|
||||||
|
</StablePackage>
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>4.1.1</Version>
|
<Version>4.1.2</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Project Include="System.Runtime.Extensions.pkgproj"/>
|
<Project Include="System.Runtime.Extensions.pkgproj"/>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>4.1.1.0</Version>
|
<Version>4.1.2.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>4.1.1.0</Version>
|
<Version>4.1.2.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>4.1.1.0</Version>
|
<Version>4.1.2.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>4.1.1</Version>
|
<Version>4.1.2</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Project Include="System.Runtime.pkgproj" />
|
<Project Include="System.Runtime.pkgproj" />
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>4.1.1.0</Version>
|
<Version>4.1.2.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>4.1.1.0</Version>
|
<Version>4.1.2.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>4.0.21.0</Version>
|
<Version>4.0.22.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -30,6 +30,15 @@
|
||||||
<Project Include="$(MSBuildThisFileDirectory)System.Private.Uri\pkg\System.Private.Uri.builds">
|
<Project Include="$(MSBuildThisFileDirectory)System.Private.Uri\pkg\System.Private.Uri.builds">
|
||||||
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
|
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
|
||||||
</Project>
|
</Project>
|
||||||
|
<Project Include="$(MSBuildThisFileDirectory)System.Runtime\pkg\System.Runtime.builds">
|
||||||
|
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
|
||||||
|
</Project>
|
||||||
|
<Project Include="$(MSBuildThisFileDirectory)System.Runtime.Extensions\pkg\System.Runtime.Extensions.builds">
|
||||||
|
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
|
||||||
|
</Project>
|
||||||
|
<Project Include="..\pkg\Microsoft.NETCore.Targets\Microsoft.NETCore.Targets.builds">
|
||||||
|
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
|
||||||
|
</Project>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(BuildAllPackages)' == 'false' AND '$(SkipNativePackageBuild)' != 'true'" >
|
<ItemGroup Condition="'$(BuildAllPackages)' == 'false' AND '$(SkipNativePackageBuild)' != 'true'" >
|
||||||
|
|
Загрузка…
Ссылка в новой задаче