Skip to content

Commit 3b73df2

Browse files
committed
Update CoreClr, ProdCon to servicing-26722-03, 20180722-01-1885266, respectively
1 parent 9b13d8d commit 3b73df2

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

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/20180720-01/final/index.json
1+
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180722-01/final/index.json

dependencies.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
for which dotnet/versions commit was last used to update the dependency.
66
-->
77
<PropertyGroup>
8-
<ProdConCurrentRef>249d209ddf374b9fd057e23e1ddd8941aec117ee</ProdConCurrentRef>
9-
<CoreClrCurrentRef>249d209ddf374b9fd057e23e1ddd8941aec117ee</CoreClrCurrentRef>
8+
<ProdConCurrentRef>c6f30484e30cd7db70143b1c46da03c9e5d37547</ProdConCurrentRef>
9+
<CoreClrCurrentRef>c6f30484e30cd7db70143b1c46da03c9e5d37547</CoreClrCurrentRef>
1010
<BuildToolsCurrentRef>91c9a3b3374ff71e72c06d5773bd26598539aa1d</BuildToolsCurrentRef>
1111
</PropertyGroup>
1212

@@ -28,9 +28,9 @@
2828
the product as version strings to be used by the SDK to fetch extra content.
2929
-->
3030
<PropertyGroup>
31-
<MicrosoftAspNetCoreAllPackageVersion>2.1.3</MicrosoftAspNetCoreAllPackageVersion>
32-
<MicrosoftAspNetCoreAppPackageVersion>2.1.3</MicrosoftAspNetCoreAppPackageVersion>
33-
<MicrosoftNETSdkRazorPackageVersion>2.1.2</MicrosoftNETSdkRazorPackageVersion>
31+
<MicrosoftAspNetCoreAllPackageVersion>2.1.3-rtm-30923</MicrosoftAspNetCoreAllPackageVersion>
32+
<MicrosoftAspNetCoreAppPackageVersion>2.1.3-rtm-30923</MicrosoftAspNetCoreAppPackageVersion>
33+
<MicrosoftNETSdkRazorPackageVersion>2.1.2-rtm-30923</MicrosoftNETSdkRazorPackageVersion>
3434
</PropertyGroup>
3535

3636
<ItemGroup>
@@ -50,7 +50,7 @@
5050

5151
<DependencyInfo Include="ProdCon" Condition="'$(UpdateFromManifestFile)' == ''">
5252
<DependencyType>Orchestrated build</DependencyType>
53-
<BasePath>build-info/dotnet/product/cli/release/2.1.3</BasePath>
53+
<BasePath>build-info/dotnet/product/cli/release/2.1</BasePath>
5454
<CurrentRef>$(ProdConCurrentRef)</CurrentRef>
5555
<VersionsRepoOwner>dotnet</VersionsRepoOwner>
5656
<VersionsRepo>versions</VersionsRepo>

repos/core-setup.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true</BuildArguments>
77
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true</BuildCommand>
88
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
9-
<OfficialBuildId>20180720-04</OfficialBuildId>
9+
<OfficialBuildId>20180722-02</OfficialBuildId>
1010

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

repos/coreclr.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) --</BuildCommand>
1111
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
1212
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
13-
<OfficialBuildId>20180720-02</OfficialBuildId>
13+
<OfficialBuildId>20180722-03</OfficialBuildId>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

repos/corefx.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
88
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
99
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
10-
<OfficialBuildId>20180720-08</OfficialBuildId>
10+
<OfficialBuildId>20180722-02</OfficialBuildId>
1111
</PropertyGroup>
1212

1313
<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>20180720.2</OfficialBuildId>
5+
<OfficialBuildId>20180722.2</OfficialBuildId>
66
<OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
77
<BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>
88

src/coreclr

tools-local/ILAsmVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.3-servicing-26719-02
1+
2.1.3-servicing-26722-03

0 commit comments

Comments
 (0)