Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Merge pull request #5923 from wtgodbe/1016Stable
Browse files Browse the repository at this point in the history 
Bump versions & Mark 1.0.16 stable
  • Loading branch information
@wtgodbe
wtgodbe authored Apr 18, 2019
2 parents c64a117 + 8f85782 commit 8f3458b
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 14 deletions.
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/PortableApp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.16-servicing-*"
"version": "1.0.16"
},
"Newtonsoft.Json": "9.0.1-beta1"
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/PortableTestApp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.16-servicing-*"
"version": "1.0.16"
},
"Newtonsoft.Json": "9.0.1-beta1",
"xunit": "2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/StandaloneApp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.16-servicing-*",
"Microsoft.NETCore.App": "1.0.16",
"Newtonsoft.Json": "9.0.1-beta1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/StandaloneTestApp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": "1.0.16-servicing-*",
"Microsoft.NETCore.App": "1.0.16",
"Newtonsoft.Json": "9.0.1-beta1",
"xunit": "2.1.0",
"xunit.netcore.extensions": "1.0.0-prerelease-00206",
Expand Down
2 changes: 1 addition & 1 deletion branchinfo.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
MAJOR_VERSION=1
MINOR_VERSION=0
PATCH_VERSION=16
RELEASE_SUFFIX=servicing
RELEASE_SUFFIX=
CHANNEL=preview
BRANCH_NAME=release/1.0.0
CONTAINER_NAME=dotnet
2 changes: 1 addition & 1 deletion build_projects/dotnet-host-build/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"dependencies": {
"NETStandard.Library": "1.6.0",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.18-servicing-27612-01",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.18",
"Microsoft.CSharp": "4.0.1",
"System.Dynamic.Runtime": "4.0.11",
"System.Reflection.Metadata": "1.3.0",
Expand Down
4 changes: 2 additions & 2 deletions build_projects/shared-build-targets-utils/DependencyVersions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class DependencyVersions
{
public static readonly string CoreCLRVersion = "1.0.18-servicing-27612-01";
public static readonly string JitVersion = "1.0.18-servicing-27612-01";
public static readonly string CoreCLRVersion = "1.0.18";
public static readonly string JitVersion = "1.0.18";
}
}
2 changes: 1 addition & 1 deletion build_projects/shared-build-targets-utils/Utils/HostVersion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public override string ToString()
//

// Full versions and package information.
public static bool EnsureStableVersion => false;
public static bool EnsureStableVersion => true;
public string LatestHostPrerelease => "servicing";
public string LatestHostBuildMajor => CommitCountString;
public string LatestHostBuildMinor => "00";
Expand Down
2 changes: 1 addition & 1 deletion build_projects/update-dependencies/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"NETStandard.Library": "1.6.0",
"Microsoft.CSharp": "4.0.1",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.18-servicing-27612-01",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.18",
"System.Runtime.Serialization.Primitives": "4.1.1",
"Microsoft.DotNet.Cli.Build.Framework": {
"target": "project"
Expand Down
2 changes: 1 addition & 1 deletion pkg/projects/Microsoft.NETCore.App/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Microsoft.CodeAnalysis.CSharp": "1.3.0",
"Microsoft.CodeAnalysis.VisualBasic": "1.3.0",
"Microsoft.CSharp": "4.0.1",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.18-servicing-27612-01",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.18",
"Microsoft.VisualBasic": "10.0.1",
"NETStandard.Library": "1.6.0",
"System.Buffers": "4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions pkg/projects/Microsoft.NETCore/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"System.Linq.Queryable": "4.0.1",
"System.Net.Http": "4.1.1",
"System.Net.NetworkInformation": "4.1.0",
"System.Net.Primitives": "4.0.12-servicing-27615-02",
"System.Net.Primitives": "4.0.12",
"System.Numerics.Vectors": "4.1.1",
"System.ObjectModel": "4.0.12",
"System.Reflection": "4.1.0",
Expand All @@ -47,7 +47,7 @@
"System.Security.Principal": "4.0.1",
"System.Text.Encoding": "4.0.11",
"System.Text.Encoding.Extensions": "4.0.11",
"System.Text.RegularExpressions": "4.1.1-servicing-27615-02",
"System.Text.RegularExpressions": "4.1.1",
"System.Threading": "4.0.11",
"System.Threading.Tasks": "4.0.11",
"System.Threading.Tasks.Dataflow": "4.6.0",
Expand Down
29 changes: 29 additions & 0 deletions pkg/stable.packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,5 +490,34 @@
<StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.15</Version>
</StablePackage>

<!-- NETCore 1.0.16 servicing core-setup -->
<StablePackage Include="Microsoft.NETCore.App">
<Version>1.0.16</Version>
</StablePackage>
<StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.16</Version>
</StablePackage>
<StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.16</Version>
</StablePackage>
<StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.16</Version>
</StablePackage>
<StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.16</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.16</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.16</Version>
</StablePackage>
<StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.16</Version>
</StablePackage>
<StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.16</Version>
</StablePackage>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion tools/independent/RuntimeGraphGenerator/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Microsoft.DotNet.ProjectModel": "1.0.0-rc2-002794",
"Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-002794",
"NETStandard.Library": "1.6.0",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.18-servicing-27612-01"
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.18"
},
"frameworks": {
"netcoreapp1.0": {
Expand Down

0 comments on commit 8f3458b

Please sign in to comment.