Skip to content

Commit

Permalink
[release/2.2] Update ProdCon, baselines to 20181014-01-2116274 (#816)
Browse files Browse the repository at this point in the history
* Update ProdCon to 20181014-01-2116274

* Update baselines for 2.2.0-preview3 ProdCon
  • Loading branch information
dagood authored Oct 16, 2018
1 parent e71de15 commit 206293f
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion ProdConFeed.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20181010-04/final/index.json
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20181014-01/final/index.json
8 changes: 4 additions & 4 deletions dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
for which dotnet/versions commit was last used to update the dependency.
-->
<PropertyGroup>
<ProdConCurrentRef>d2982064838c8c57e1f03ef9211679da72f4fd3a</ProdConCurrentRef>
<ProdConCurrentRef>2415b17b695c145fae79c7087549e97cfe641956</ProdConCurrentRef>
<CoreClrCurrentRef>d2982064838c8c57e1f03ef9211679da72f4fd3a</CoreClrCurrentRef>
<BuildToolsCurrentRef>c45fef92df48cbec1b73a48eb7b06e31b220986b</BuildToolsCurrentRef>
</PropertyGroup>
Expand All @@ -22,9 +22,9 @@
the product as version strings to be used by the SDK to fetch extra content.
-->
<PropertyGroup>
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview3-35458</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview3-35458</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview3-35458</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview3-35497</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview3-35497</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview3-35497</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion repos/core-setup.proj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>

<OfficialBuildId>20181010-04</OfficialBuildId>
<OfficialBuildId>20181014-02</OfficialBuildId>

<!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
<PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>
Expand Down
2 changes: 1 addition & 1 deletion repos/coreclr.proj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>

<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OfficialBuildId>20181010-07</OfficialBuildId>
<OfficialBuildId>20181014-03</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion repos/corefx.proj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OfficialBuildId>20181010-06</OfficialBuildId>
<OfficialBuildId>20181014-02</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion repos/sdk.proj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
<PropertyGroup>
<OfficialBuildId>20181010.5</OfficialBuildId>
<OfficialBuildId>20181014.2</OfficialBuildId>

<OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>

Expand Down
2 changes: 1 addition & 1 deletion src/cli
16 changes: 8 additions & 8 deletions tools-local/prebuilt-baseline-offline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
<Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.2" Version="1.0.2-beta4-20180821-1966911" />
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-prerelease-02430-04" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.2.0-preview3-35458" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="2.2.0-preview3-35458" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.0-preview3-35458" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.2.0-preview3-35497" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="2.2.0-preview3-35497" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.0-preview3-35497" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.0" />
Expand All @@ -135,7 +135,7 @@
<Usage Id="Microsoft.Net.Compilers" Version="2.8.0-beta4-62824-10" />
<Usage Id="Microsoft.Net.Compilers.netcore" Version="2.6.0-beta3-62316-02" />
<Usage Id="Microsoft.Net.Compilers.Targets.NetCore" Version="0.1.5-dev" />
<Usage Id="Microsoft.NET.Sdk.Razor" Version="2.2.0-preview3-35458" />
<Usage Id="Microsoft.NET.Sdk.Razor" Version="2.2.0-preview3-35497" />
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.6.0" />
Expand Down Expand Up @@ -271,10 +271,10 @@
<Usage Id="NuGet.Versioning" Version="4.4.0" />
<Usage Id="NUnit3.DotNetNew.Template" Version="1.5.1" />
<Usage Id="OpenCover" Version="4.6.519" />
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
<Usage Id="optimization.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
<Usage Id="optimization.windows_nt-x64.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
<Usage Id="optimization.windows_nt-x86.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.2.0-release-20180912-0041" />
<Usage Id="optimization.PGO.CoreCLR" Version="2.2.0-release-20180912-0041" />
<Usage Id="optimization.windows_nt-x64.PGO.CoreCLR" Version="2.2.0-release-20180912-0041" />
<Usage Id="optimization.windows_nt-x86.PGO.CoreCLR" Version="2.2.0-release-20180912-0041" />
<Usage Id="Pdb2Pdb" Version="1.1.0-beta1-62316-01" />
<Usage Id="ReportGenerator" Version="3.0.1" />
<Usage Id="runtime.any.System.Collections" Version="4.0.11" Rid="any" />
Expand Down
16 changes: 8 additions & 8 deletions tools-local/prebuilt-baseline-online.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
<Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.2" Version="1.0.2-beta4-20180821-1966911" />
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-prerelease-02430-04" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.2.0-preview3-35458" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="2.2.0-preview3-35458" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.0-preview3-35458" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.2.0-preview3-35497" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="2.2.0-preview3-35497" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.0-preview3-35497" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.0" />
Expand All @@ -122,7 +122,7 @@
<Usage Id="Microsoft.Net.Compilers" Version="2.8.0-beta4-62824-10" />
<Usage Id="Microsoft.Net.Compilers.netcore" Version="2.6.0-beta3-62316-02" />
<Usage Id="Microsoft.Net.Compilers.Targets.NetCore" Version="0.1.5-dev" />
<Usage Id="Microsoft.NET.Sdk.Razor" Version="2.2.0-preview3-35458" />
<Usage Id="Microsoft.NET.Sdk.Razor" Version="2.2.0-preview3-35497" />
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<Usage Id="Microsoft.NET.Test.Sdk" Version="15.6.0" />
Expand Down Expand Up @@ -263,10 +263,10 @@
<Usage Id="NuGet.Versioning" Version="4.4.0" />
<Usage Id="NUnit3.DotNetNew.Template" Version="1.5.1" />
<Usage Id="OpenCover" Version="4.6.519" />
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
<Usage Id="optimization.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
<Usage Id="optimization.windows_nt-x64.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
<Usage Id="optimization.windows_nt-x86.PGO.CoreCLR" Version="2.1.0-release-20180815-0105" />
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.2.0-release-20180912-0041" />
<Usage Id="optimization.PGO.CoreCLR" Version="2.2.0-release-20180912-0041" />
<Usage Id="optimization.windows_nt-x64.PGO.CoreCLR" Version="2.2.0-release-20180912-0041" />
<Usage Id="optimization.windows_nt-x86.PGO.CoreCLR" Version="2.2.0-release-20180912-0041" />
<Usage Id="Pdb2Pdb" Version="1.1.0-beta1-62316-01" />
<Usage Id="ReportGenerator" Version="3.0.1" />
<Usage Id="RoslynTools.RepoToolset" Version="1.0.0-beta2-62805-03" />
Expand Down

0 comments on commit 206293f

Please sign in to comment.