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

Commit 362e48a

Browse files
gkhanna79gkhanna79
authored
Merge pull request #1523 from gkhanna79/Stabilize111
Stabilization of Core-Setup for 1.1.1
2 parents ed27aa5 + 8360869 commit 362e48a

File tree

10 files changed

+37
-20
lines changed

10 files changed

+37
-20
lines changed

‎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.1.1-servicing-*"
12+
"version": "1.1.1"
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.1.1-servicing-*"
15+
"version": "1.1.1"
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.1": {
77
"dependencies": {
8-
"Microsoft.NETCore.App": "1.1.1-servicing-*",
8+
"Microsoft.NETCore.App": "1.1.1",
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.1.1-servicing-*",
12+
"Microsoft.NETCore.App": "1.1.1",
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}-{VersionSuffix}-00";
9+
public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}";
1010
public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
1111
}
1212
}

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

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,23 @@ public override string ToString()
6363
// Full versions and package information.
6464
public string LatestHostBuildMajor => CommitCountString;
6565
public string LatestHostBuildMinor => "00";
66-
public bool EnsureStableVersion => false;
66+
public bool EnsureStableVersion => true;
6767

68-
// Comment below lines when stabilizing 1.1.1
69-
public VerInfo LatestHostVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
70-
public VerInfo LatestHostFxrVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
71-
public VerInfo LatestHostPolicyVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
68+
// Comment below lines when stabilizing 1.1.X and we are going to update one (or more) of the host packages.
69+
//
70+
// public VerInfo LatestHostVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
71+
// public VerInfo LatestHostFxrVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
72+
// public VerInfo LatestHostPolicyVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
73+
74+
// These are the versions used by GenerateMSbuildPropsFile to generate version.props that is used for
75+
// versioning of the host packages.
76+
//
77+
// These should only be incremented in a servicing release if we are updating one (or more) of the host packages.
78+
79+
public VerInfo LatestHostVersion => new VerInfo(1, 1, 0, "", "", "", CommitCountString);
80+
public VerInfo LatestHostFxrVersion => new VerInfo(1, 1, 0, "", "", "", CommitCountString);
81+
public VerInfo LatestHostPolicyVersion => new VerInfo(1, 1, 0, "", "", "", CommitCountString);
7282

73-
// Uncomment below lines when stabilizing 1.1.1
74-
/*
75-
public VerInfo LatestHostVersion => new VerInfo(1, 1, 1, "", "", "", CommitCountString);
76-
public VerInfo LatestHostFxrVersion => new VerInfo(1, 1, 1, "", "", "", CommitCountString);
77-
public VerInfo LatestHostPolicyVersion => new VerInfo(1, 1, 1, "", "", "", CommitCountString);
78-
*/
7983

8084
// If you are producing host packages use this to validate them.
8185
public Dictionary<string, VerInfo> LatestHostPackagesToValidate => new Dictionary<string, VerInfo>()
@@ -98,6 +102,8 @@ public override string ToString()
98102
//
99103
// Locked muxer for consumption in CLI.
100104
//
105+
// These are used for generating platform installers.
106+
//
101107
public bool IsLocked = true; // Set this variable to toggle muxer locking.
102108
public VerInfo LockedHostFxrVersion => IsLocked ? new VerInfo(1, 1, 0, "", "", "", CommitCountString) : LatestHostFxrVersion;
103109
public VerInfo LockedHostVersion => IsLocked ? new VerInfo(1, 1, 0, "", "", "", CommitCountString) : LatestHostVersion;

‎pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767
<Version>4.0.1</Version>
6868
</NETCoreApp10Dependency>
6969
<NETCoreApp10Dependency Include="Microsoft.NETCore.DotNetHostPolicy">
70-
<Version>1.0.1</Version>
70+
<Version>1.0.3</Version>
7171
</NETCoreApp10Dependency>
7272
<NETCoreApp10Dependency Include="Microsoft.NETCore.Runtime.CoreCLR">
73-
<Version>1.0.4</Version>
73+
<Version>1.0.6</Version>
7474
</NETCoreApp10Dependency>
7575
<NETCoreApp10Dependency Include="Microsoft.VisualBasic">
7676
<Version>10.0.1</Version>
@@ -181,6 +181,12 @@
181181
<NETCoreApp10Dependency Include="Libuv">
182182
<Version>1.9.1</Version>
183183
</NETCoreApp10Dependency>
184+
<NETCoreApp10Dependency Include="Microsoft.NETCore.Platforms">
185+
<Version>1.0.2</Version>
186+
</NETCoreApp10Dependency>
187+
<NETCoreApp10Dependency Include="System.Net.Http">
188+
<Version>4.1.1</Version>
189+
</NETCoreApp10Dependency>
184190

185191
<Dependency Include="@(NETCoreApp10Dependency)">
186192
<TargetFramework>.NETCoreApp1.0</TargetFramework>

‎pkg/stable.packages.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44

5+
<!-- NETCore 1.1.1 core-setup -->
6+
<StablePackage Include="Microsoft.NETCore.App">
7+
<Version>1.1.1</Version>
8+
</StablePackage>
9+
510
<!-- NETCore 1.1.0 core-setup -->
611
<StablePackage Include="Microsoft.NETCore.App">
712
<Version>1.1.0</Version>

‎src/Microsoft.DotNet.PlatformAbstractions/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "Abstractions for making code that uses file system and environment testable.",
3-
"version": "1.1.1-servicing-*",
3+
"version": "1.1.1",
44
"buildOptions": {
55
"warningsAsErrors": true,
66
"keyFile": "../../tools/Key.snk",

‎src/Microsoft.Extensions.DependencyModel/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "Abstractions for reading `.deps` files.",
3-
"version": "1.1.1-servicing-*",
3+
"version": "1.1.1",
44
"buildOptions": {
55
"warningsAsErrors": true,
66
"keyFile": "../../tools/Key.snk"

0 commit comments

Comments
 (0)