Skip to content

Commit 52c99a5

Browse files
dotnet-maestro-botdagood
authored andcommitted
Update ProdCon to 20180919-01-2049155 (release/2.1) (#714)
* Update to 2.1.5 ProdCon build Update BuildTools, CoreClr, ProdCon to rc1-03131-06, servicing-26911-03, 20180919-01-2044512, respectively * Update prebuilt baselines * Update ProdCon to 20180919-01-2049155
1 parent 1cef811 commit 52c99a5

15 files changed

+84
-88
lines changed

BuildToolsVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.0-rc1-03006-01
1+
2.1.0-rc1-03131-06

ProdConFeed.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180814-02/final/index.json
1+
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180919-01/final/index.json

dependencies.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
for which dotnet/versions commit was last used to update the dependency.
66
-->
77
<PropertyGroup>
8-
<ProdConCurrentRef>bc1c81f2fcd8b65c43c53694ec9ab4c005b2be6d</ProdConCurrentRef>
9-
<CoreClrCurrentRef>293e58e87c0575e7e425a1bab57d5eb0e25d743e</CoreClrCurrentRef>
10-
<BuildToolsCurrentRef>91c9a3b3374ff71e72c06d5773bd26598539aa1d</BuildToolsCurrentRef>
8+
<ProdConCurrentRef>7863ead82cb2424e8b6f2ac8625ec5f29eb88b84</ProdConCurrentRef>
9+
<CoreClrCurrentRef>1dbfe089b5c3537799927f6541185a8c1fd0adef</CoreClrCurrentRef>
10+
<BuildToolsCurrentRef>1dbfe089b5c3537799927f6541185a8c1fd0adef</BuildToolsCurrentRef>
1111
</PropertyGroup>
1212

1313
<!-- Package dependency verification/auto-upgrade configuration. -->
@@ -22,8 +22,8 @@
2222
the product as version strings to be used by the SDK to fetch extra content.
2323
-->
2424
<PropertyGroup>
25-
<MicrosoftAspNetCoreAllPackageVersion>2.1.4</MicrosoftAspNetCoreAllPackageVersion>
26-
<MicrosoftAspNetCoreAppPackageVersion>2.1.4</MicrosoftAspNetCoreAppPackageVersion>
25+
<MicrosoftAspNetCoreAllPackageVersion>2.1.5</MicrosoftAspNetCoreAllPackageVersion>
26+
<MicrosoftAspNetCoreAppPackageVersion>2.1.5</MicrosoftAspNetCoreAppPackageVersion>
2727
<MicrosoftNETSdkRazorPackageVersion>2.1.2</MicrosoftNETSdkRazorPackageVersion>
2828
</PropertyGroup>
2929

@@ -44,7 +44,7 @@
4444

4545
<DependencyInfo Include="ProdCon" Condition="'$(UpdateFromManifestFile)' == ''">
4646
<DependencyType>Orchestrated build</DependencyType>
47-
<BasePath>build-info/dotnet/product/cli/release/2.1.3</BasePath>
47+
<BasePath>build-info/dotnet/product/cli/release/2.1.5</BasePath>
4848
<CurrentRef>$(ProdConCurrentRef)</CurrentRef>
4949
<VersionsRepoOwner>dotnet</VersionsRepoOwner>
5050
<VersionsRepo>versions</VersionsRepo>

repos/core-setup.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true</BuildArguments>
1313
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true /p:OutputRid=$(OverrideTargetRid) /bl</BuildCommand>
1414
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
15-
<OfficialBuildId>20180814-02</OfficialBuildId>
15+
<OfficialBuildId>20180919-01</OfficialBuildId>
1616

1717
<!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
1818
<PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

repos/coreclr.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) --</BuildCommand>
1515
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
1616
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
17-
<OfficialBuildId>20180814-03</OfficialBuildId>
17+
<OfficialBuildId>20180919-02</OfficialBuildId>
1818
</PropertyGroup>
1919

2020
<ItemGroup>

repos/corefx.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
1414
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
1515
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
16-
<OfficialBuildId>20180814-02</OfficialBuildId>
16+
<OfficialBuildId>20180919-02</OfficialBuildId>
1717
</PropertyGroup>
1818

1919
<ItemGroup>

repos/sdk.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
44
<PropertyGroup>
5-
<OfficialBuildId>20180802.3</OfficialBuildId>
5+
<OfficialBuildId>20180919.1</OfficialBuildId>
66
<OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
77
<BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>
88

0 commit comments

Comments
 (0)