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

Commit 837b29e

Browse files
authored
Merge pull request #448 from gkhanna79/Stabilize102
Stabilize M.N.App 1.0.2
2 parents c5fed11 + 854c440 commit 837b29e

6 files changed

Lines changed: 10 additions & 5 deletions

File tree

TestAssets/TestProjects/PortableApp/project.json

Lines changed: 1 addition & 1 deletion
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.2-servicing-*"
12+
"version": "1.0.2"
1313
},
1414
"Newtonsoft.Json": "9.0.1-beta1"
1515
}

TestAssets/TestProjects/PortableTestApp/project.json

Lines changed: 1 addition & 1 deletion
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.2-servicing-*"
15+
"version": "1.0.2"
1616
},
1717
"Newtonsoft.Json": "9.0.1-beta1",
1818
"xunit": "2.1.0",

TestAssets/TestProjects/StandaloneApp/project.json

Lines changed: 1 addition & 1 deletion
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.2-servicing-*",
8+
"Microsoft.NETCore.App": "1.0.2",
99
"Newtonsoft.Json": "9.0.1-beta1"
1010
}
1111
}

TestAssets/TestProjects/StandaloneTestApp/project.json

Lines changed: 1 addition & 1 deletion
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.2-servicing-*",
12+
"Microsoft.NETCore.App": "1.0.2",
1313
"Newtonsoft.Json": "9.0.1-beta1",
1414
"xunit": "2.1.0",
1515
"xunit.netcore.extensions": "1.0.0-prerelease-00206",

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

Lines changed: 1 addition & 1 deletion
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 => $"{Major}.{Minor}.{Patch}";
1010
public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
1111
}
1212
}

pkg/stable.packages.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,10 @@
120120
<StablePackage Include="Microsoft.NETCore.App">
121121
<Version>1.0.1</Version>
122122
</StablePackage>
123+
124+
<!-- NETCore 1.0.2 servicing core-setup -->
125+
<StablePackage Include="Microsoft.NETCore.App">
126+
<Version>1.0.2</Version>
127+
</StablePackage>
123128
</ItemGroup>
124129
</Project>

0 commit comments

Comments
 (0)