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 #613 from schellap/stablize103
Browse files Browse the repository at this point in the history
Stabilize Microsoft.NETCore.App to 1.0.3.
  • Loading branch information
gkhanna79 authored Nov 10, 2016
2 parents a0a3be3 + 694f93c commit 4c41eac
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 14 deletions.
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/PortableApp/project.json
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.3-servicing-*"
"version": "1.0.3"
},
"Newtonsoft.Json": "9.0.1-beta1"
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/PortableTestApp/project.json
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.3-servicing-*"
"version": "1.0.3"
},
"Newtonsoft.Json": "9.0.1-beta1",
"xunit": "2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/StandaloneApp/project.json
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.3-servicing-*",
"Microsoft.NETCore.App": "1.0.3",
"Newtonsoft.Json": "9.0.1-beta1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/StandaloneTestApp/project.json
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.3-servicing-*",
"Microsoft.NETCore.App": "1.0.3",
"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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
MAJOR_VERSION=1
MINOR_VERSION=0
PATCH_VERSION=3
RELEASE_SUFFIX=servicing
RELEASE_SUFFIX=
CHANNEL=preview
BRANCH_NAME=release/1.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public class BuildVersion : Version
{
public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-servicing-{CommitCountString}-00";
public string NetCoreAppVersion => ProductionVersion;
public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ public override string ToString()
//

// Full versions and package information.
public bool EnsureStableVersion => false;
public bool EnsureStableVersion => true;
public string LatestHostPrerelease => "servicing";
public string LatestHostBuildMajor => CommitCountString;
public string LatestHostBuildMinor => "00";
public VerInfo LatestHostVersion => new VerInfo(1, 0, 1, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
public VerInfo LatestHostFxrVersion => new VerInfo(1, 0, 1, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
public VerInfo LatestHostPolicyVersion => new VerInfo(1, 0, 3, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
public VerInfo LatestHostVersion => new VerInfo(1, 0, 1, "", "", "", CommitCountString);
public VerInfo LatestHostFxrVersion => new VerInfo(1, 0, 1, "", "", "", CommitCountString);
public VerInfo LatestHostPolicyVersion => new VerInfo(1, 0, 3, "", "", "", CommitCountString);

public Dictionary<string, VerInfo> LatestHostPackages => new Dictionary<string, VerInfo>()
{
Expand Down
41 changes: 37 additions & 4 deletions pkg/stable.packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@
<StablePackage Include="Microsoft.NETCore.DotNetHost">
<Version>1.0.1</Version>
</StablePackage>
<!--
<StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
<Version>1.0.1</Version>
</StablePackage>
-->
<StablePackage Include="Microsoft.NETCore.DotNetHostResolver">
<Version>1.0.1</Version>
</StablePackage>
Expand Down Expand Up @@ -127,5 +125,40 @@
<StablePackage Include="Microsoft.NETCore.App">
<Version>1.0.2</Version>
</StablePackage>
</ItemGroup>

<!-- NETCore 1.0.3 servicing core-setup -->
<StablePackage Include="Microsoft.NETCore.App">
<Version>1.0.3</Version>
</StablePackage>
<StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
</StablePackage>
<StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
</StablePackage>
<StablePackage Include="runtime.fedora.23-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
</StablePackage>
<StablePackage Include="runtime.opensuse.13.2-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
</StablePackage>
<StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
</StablePackage>
<StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
</StablePackage>
<StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
</StablePackage>
<StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
</StablePackage>
<StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
<Version>1.0.3</Version>
</StablePackage>
</ItemGroup>
</Project>

0 comments on commit 4c41eac

Please sign in to comment.