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

Commit 4c41eac

Browse files
gkhanna79gkhanna79
authored
Merge pull request #613 from schellap/stablize103
Stabilize Microsoft.NETCore.App to 1.0.3.
2 parents a0a3be3 + 694f93c commit 4c41eac

File tree

8 files changed

+47
-14
lines changed

8 files changed

+47
-14
lines changed

‎TestAssets/TestProjects/PortableApp/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"Microsoft.NETCore.App": {
1111
"type": "platform",
12-
"version": "1.0.3-servicing-*"
12+
"version": "1.0.3"
1313
},
1414
"Newtonsoft.Json": "9.0.1-beta1"
1515
}

‎TestAssets/TestProjects/PortableTestApp/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"Microsoft.NETCore.App": {
1414
"type": "platform",
15-
"version": "1.0.3-servicing-*"
15+
"version": "1.0.3"
1616
},
1717
"Newtonsoft.Json": "9.0.1-beta1",
1818
"xunit": "2.1.0",

‎TestAssets/TestProjects/StandaloneApp/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"frameworks": {
66
"netcoreapp1.0": {
77
"dependencies": {
8-
"Microsoft.NETCore.App": "1.0.3-servicing-*",
8+
"Microsoft.NETCore.App": "1.0.3",
99
"Newtonsoft.Json": "9.0.1-beta1"
1010
}
1111
}

‎TestAssets/TestProjects/StandaloneTestApp/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"portable-net451+win8"
1010
],
1111
"dependencies": {
12-
"Microsoft.NETCore.App": "1.0.3-servicing-*",
12+
"Microsoft.NETCore.App": "1.0.3",
1313
"Newtonsoft.Json": "9.0.1-beta1",
1414
"xunit": "2.1.0",
1515
"xunit.netcore.extensions": "1.0.0-prerelease-00206",

‎branchinfo.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
MAJOR_VERSION=1
66
MINOR_VERSION=0
77
PATCH_VERSION=3
8-
RELEASE_SUFFIX=servicing
8+
RELEASE_SUFFIX=
99
CHANNEL=preview
1010
BRANCH_NAME=release/1.0.0

‎build_projects/shared-build-targets-utils/Utils/BuildVersion.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class BuildVersion : Version
66
{
77
public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
88
public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
9-
public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-servicing-{CommitCountString}-00";
9+
public string NetCoreAppVersion => ProductionVersion;
1010
public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
1111
}
1212
}

‎build_projects/shared-build-targets-utils/Utils/HostVersion.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ public override string ToString()
6161
//
6262

6363
// Full versions and package information.
64-
public bool EnsureStableVersion => false;
64+
public bool EnsureStableVersion => true;
6565
public string LatestHostPrerelease => "servicing";
6666
public string LatestHostBuildMajor => CommitCountString;
6767
public string LatestHostBuildMinor => "00";
68-
public VerInfo LatestHostVersion => new VerInfo(1, 0, 1, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
69-
public VerInfo LatestHostFxrVersion => new VerInfo(1, 0, 1, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
70-
public VerInfo LatestHostPolicyVersion => new VerInfo(1, 0, 3, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
68+
public VerInfo LatestHostVersion => new VerInfo(1, 0, 1, "", "", "", CommitCountString);
69+
public VerInfo LatestHostFxrVersion => new VerInfo(1, 0, 1, "", "", "", CommitCountString);
70+
public VerInfo LatestHostPolicyVersion => new VerInfo(1, 0, 3, "", "", "", CommitCountString);
7171

7272
public Dictionary<string, VerInfo> LatestHostPackages => new Dictionary<string, VerInfo>()
7373
{

‎pkg/stable.packages.props

+37-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
<StablePackage Include="Microsoft.NETCore.DotNetHost">
1818
<Version>1.0.1</Version>
1919
</StablePackage>
20-
<!--
2120
<StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
22-
<Version>1.0.3</Version>
21+
<Version>1.0.1</Version>
2322
</StablePackage>
24-
-->
2523
<StablePackage Include="Microsoft.NETCore.DotNetHostResolver">
2624
<Version>1.0.1</Version>
2725
</StablePackage>
@@ -127,5 +125,40 @@
127125
<StablePackage Include="Microsoft.NETCore.App">
128126
<Version>1.0.2</Version>
129127
</StablePackage>
130-
</ItemGroup>
128+
129+
<!-- NETCore 1.0.3 servicing core-setup -->
130+
<StablePackage Include="Microsoft.NETCore.App">
131+
<Version>1.0.3</Version>
132+
</StablePackage>
133+
<StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
134+
<Version>1.0.3</Version>
135+
</StablePackage>
136+
<StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostPolicy">
137+
<Version>1.0.3</Version>
138+
</StablePackage>
139+
<StablePackage Include="runtime.fedora.23-x64.Microsoft.NETCore.DotNetHostPolicy">
140+
<Version>1.0.3</Version>
141+
</StablePackage>
142+
<StablePackage Include="runtime.opensuse.13.2-x64.Microsoft.NETCore.DotNetHostPolicy">
143+
<Version>1.0.3</Version>
144+
</StablePackage>
145+
<StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostPolicy">
146+
<Version>1.0.3</Version>
147+
</StablePackage>
148+
<StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostPolicy">
149+
<Version>1.0.3</Version>
150+
</StablePackage>
151+
<StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostPolicy">
152+
<Version>1.0.3</Version>
153+
</StablePackage>
154+
<StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostPolicy">
155+
<Version>1.0.3</Version>
156+
</StablePackage>
157+
<StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy">
158+
<Version>1.0.3</Version>
159+
</StablePackage>
160+
<StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
161+
<Version>1.0.3</Version>
162+
</StablePackage>
163+
</ItemGroup>
131164
</Project>

0 commit comments

Comments
 (0)