dotnet
/
core-setup
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #5924 from wtgodbe/1113Stable 

Update dependencies & Mark 1.1.13 stable
This commit is contained in:
William Godbe 2019-04-18 15:34:14 -07:00 коммит произвёл GitHub
Родитель 46266c413b f47f651ba8
Коммит 5917a1a343
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
14 изменённых файлов: 165 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
TestAssets/TestProjects/PortableApp/project.json
Просмотреть файл

@ -9,7 +9,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.1.13-servicing-*"
"version": "1.1.13"
},
"Newtonsoft.Json": "9.0.1-beta1"
}

2
TestAssets/TestProjects/PortableTestApp/project.json
Просмотреть файл

@ -12,7 +12,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.1.13-servicing-*"
"version": "1.1.13"
},
"Newtonsoft.Json": "9.0.1-beta1",
"xunit": "2.1.0",

2
TestAssets/TestProjects/StandaloneApp/project.json
Просмотреть файл

@ -5,7 +5,7 @@
"frameworks": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": "1.1.13-servicing-*",
"Microsoft.NETCore.App": "1.1.13",
"Newtonsoft.Json": "9.0.1-beta1"
}
}

2
TestAssets/TestProjects/StandaloneTestApp/project.json
Просмотреть файл

@ -9,7 +9,7 @@
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": "1.1.13-servicing-*",
"Microsoft.NETCore.App": "1.1.13",
"Newtonsoft.Json": "9.0.1-beta1",
"xunit": "2.1.0",
"xunit.netcore.extensions": "1.0.0-prerelease-00206",

2
branchinfo.txt
Просмотреть файл

@ -4,7 +4,7 @@
MAJOR_VERSION=1
MINOR_VERSION=1
PATCH_VERSION=13
RELEASE_SUFFIX=servicing
RELEASE_SUFFIX=
CHANNEL=release/1.1.0
BRANCH_NAME=release/1.1.0
CONTAINER_NAME=dotnet

2
build_projects/dotnet-host-build/project.json
Просмотреть файл

@ -6,7 +6,7 @@
},
"dependencies": {
"NETStandard.Library": "1.6.1",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.11",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.13",
"Microsoft.NETCore.Platforms": "1.1.2",
"Microsoft.NETCore.Targets": "1.1.4",
"System.Net.Http": "4.3.4",

4
build_projects/shared-build-targets-utils/DependencyVersions.cs
Просмотреть файл

@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class DependencyVersions
{
public static readonly string CoreCLRVersion = "1.1.13-servicing-27612-03";
public static readonly string JitVersion = "1.1.13-servicing-27612-03";
public static readonly string CoreCLRVersion = "1.1.13";
public static readonly string JitVersion = "1.1.13";
}
}

2
build_projects/shared-build-targets-utils/Utils/HostVersion.cs
Просмотреть файл

@ -64,7 +64,7 @@ namespace Microsoft.DotNet.Cli.Build
// Full versions and package information.
public string LatestHostBuildMajor => CommitCountString;
public string LatestHostBuildMinor => "00";
public static bool EnsureStableVersion => false;
public static bool EnsureStableVersion => true;
// Comment below lines when stabilizing 1.1.X and we are going to update one (or more) of the host packages.
//

2
build_projects/update-dependencies/project.json
Просмотреть файл

@ -7,7 +7,7 @@
"dependencies": {
"NETStandard.Library": "1.6.1",
"Microsoft.CSharp": "4.3.0",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.13-servicing-27612-03",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.13",
"Microsoft.NETCore.Platforms": "1.1.2",
"Microsoft.NETCore.Targets": "1.1.4",
"System.Runtime.Serialization.Primitives": "4.3.0",

4
pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
Просмотреть файл

@ -70,13 +70,13 @@
<Version>4.0.1</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.15</Version>
<Version>1.0.16</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="Microsoft.NETCore.Platforms">
<Version>1.0.2</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="Microsoft.NETCore.Runtime.CoreCLR">
<Version>1.0.17</Version>
<Version>1.0.18</Version>
</NETCoreApp10Dependency>
<NETCoreApp10Dependency Include="Microsoft.VisualBasic">
<Version>10.0.1</Version>

2
pkg/projects/Microsoft.NETCore.App/project.json
Просмотреть файл

@ -6,7 +6,7 @@
"Microsoft.CSharp": "4.3.0",
"Microsoft.DiaSymReader.Native": "1.4.1",
"Microsoft.NETCore.Platforms": "1.1.2",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.13-servicing-27612-03",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.13",
"Microsoft.NETCore.Targets": "1.1.4",
"Microsoft.VisualBasic": "10.1.0",
"NETStandard.Library": "1.6.1",

4
pkg/projects/Microsoft.NETCore/project.json
Просмотреть файл

@ -29,7 +29,7 @@
"System.Linq.Queryable": "4.3.0",
"System.Net.Http": "4.3.0",
"System.Net.NetworkInformation": "4.3.0",
"System.Net.Primitives": "4.3.1-servicing-27615-02",
"System.Net.Primitives": "4.3.1",
"System.Numerics.Vectors": "4.3.0",
"System.ObjectModel": "4.3.0",
"System.Reflection": "4.3.0",
@ -48,7 +48,7 @@
"System.Security.Principal": "4.3.0",
"System.Text.Encoding": "4.3.0",
"System.Text.Encoding.Extensions": "4.3.0",
"System.Text.RegularExpressions": "4.3.1-servicing-27615-02",
"System.Text.RegularExpressions": "4.3.1",
"System.Threading": "4.3.0",
"System.Threading.Tasks": "4.3.0",
"System.Threading.Tasks.Dataflow": "4.7.0",

149
pkg/stable.packages.props
Просмотреть файл

@ -1013,5 +1013,154 @@
<StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.12</Version>
</StablePackage>
<!-- NETCore 1.1.13 core-setup -->
<StablePackage Include="Microsoft.NETCore.App">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.debian.9-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.debian.9-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.debian.9-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.fedora.24-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.fedora.24-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.fedora.24-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.fedora.27-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.fedora.27-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.fedora.27-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.fedora.28-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.fedora.28-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.fedora.28-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.opensuse.42.1-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.opensuse.42.1-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.opensuse.42.1-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.opensuse.42.3-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.opensuse.42.3-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.opensuse.42.3-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.18.04-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.18.04-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.18.04-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.win10-arm64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.win10-arm64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.win10-arm64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHost">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.1.13</Version>
</StablePackage>
<StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostResolver">
<Version>1.1.13</Version>
</StablePackage>
</ItemGroup>
</Project>

2
tools/independent/RuntimeGraphGenerator/project.json
Просмотреть файл

@ -13,7 +13,7 @@
"Microsoft.DotNet.ProjectModel": "1.0.0-rc2-002794",
"Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-002794",
"NETStandard.Library": "1.6.1",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.13-servicing-27612-03"
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.13"
},
"frameworks": {
"netcoreapp1.0": {