Skip to content

Commit c7101b0

Browse files
dotnet-botdseefeld
dotnet-bot
authored and
dseefeld
committed
Merged PR 1038: Update to ProdCon 20190417-03 (internal/release/2.2)
2 parents 5576aa3 + 56ee7dc commit c7101b0

11 files changed

+28
-27
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-2/20190321-02/final/index.json
1+
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20190417-03/final/index.json

‎dependencies.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.2.4</MicrosoftAspNetCoreAllPackageVersion>
26-
<MicrosoftAspNetCoreAppPackageVersion>2.2.4</MicrosoftAspNetCoreAppPackageVersion>
25+
<MicrosoftAspNetCoreAllPackageVersion>2.2.5</MicrosoftAspNetCoreAllPackageVersion>
26+
<MicrosoftAspNetCoreAppPackageVersion>2.2.5</MicrosoftAspNetCoreAppPackageVersion>
2727
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
2828
</PropertyGroup>
2929

‎repos/core-setup.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
2323
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
2424

25-
<OfficialBuildId>20190322-01</OfficialBuildId>
25+
<OfficialBuildId>20190418-02</OfficialBuildId>
2626

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

‎repos/coreclr.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
1919

2020
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
21-
<OfficialBuildId>20190321-02</OfficialBuildId>
21+
<OfficialBuildId>20190417-05</OfficialBuildId>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

‎repos/corefx.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
2626
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
27-
<OfficialBuildId>20190321-01</OfficialBuildId>
27+
<OfficialBuildId>20190418-01</OfficialBuildId>
2828
</PropertyGroup>
2929

3030
<ItemGroup>

‎src/cli

‎src/core-setup

‎src/coreclr

‎src/corefx

Submodule corefx updated 26 files

‎tools-local/prebuilt-baseline-offline.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<UsageData>
2-
<CreatedByRid>rhel.7-x64</CreatedByRid>
2+
<CreatedByRid>centos.7-x64</CreatedByRid>
33
<ProjectDirectories>
44
<Dir>src/application-insights/</Dir>
55
<Dir>src/arcade/</Dir>
@@ -224,12 +224,12 @@
224224
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
225225
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
226226
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
227-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.3" Rid="linux-x64" />
228-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.3" Rid="linux-x64" />
227+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.4" Rid="linux-x64" />
228+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.4" Rid="linux-x64" />
229229
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
230-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.3" Rid="linux-x64" />
230+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.4" Rid="linux-x64" />
231231
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
232-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.3" Rid="linux-x64" />
232+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.4" Rid="linux-x64" />
233233
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
234234
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="opensuse.13.2-x64" />
235235
<Usage Id="runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.42.1-x64" />

‎tools-local/prebuilt-baseline-online.xml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<UsageData>
2-
<CreatedByRid>rhel.7-x64</CreatedByRid>
2+
<CreatedByRid>centos.7-x64</CreatedByRid>
33
<ProjectDirectories>
44
<Dir>src/application-insights/</Dir>
55
<Dir>src/arcade/</Dir>
@@ -97,9 +97,9 @@
9797
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
9898
<Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.2" Version="1.0.2-beta4-20181021-2140732" />
9999
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-03130-05" IsDirectDependency="true" />
100-
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.2.4" />
101-
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="2.2.4" />
102-
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.4" />
100+
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.2.5" />
101+
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="2.2.5" />
102+
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.5" />
103103
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
104104
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
105105
<Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
@@ -124,23 +124,23 @@
124124
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
125125
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
126126
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
127-
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.2.3" />
127+
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.2.4" />
128128
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.0.1" />
129129
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.1.0" />
130-
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.2.3" IsDirectDependency="true" />
130+
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.2.4" IsDirectDependency="true" />
131131
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.3" />
132132
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" />
133133
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
134134
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
135135
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
136136
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
137-
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.2.3" IsDirectDependency="true" />
137+
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.2.4" IsDirectDependency="true" />
138138
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
139139
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
140140
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
141141
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
142142
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
143-
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.2.3" />
143+
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.2.4" />
144144
<Usage Id="Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" IsDirectDependency="true" />
145145
<Usage Id="Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" IsDirectDependency="true" />
146146
<Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
@@ -154,6 +154,7 @@
154154
<Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
155155
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
156156
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" />
157+
<Usage Id="Microsoft.NETCore.Platforms" Version="2.2.0" IsDirectDependency="true" />
157158
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.5" />
158159
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" />
159160
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.1.1" />
@@ -281,12 +282,12 @@
281282
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
282283
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" Rid="linux-x64" />
283284
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
284-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.3" Rid="linux-x64" />
285-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.3" Rid="linux-x64" />
285+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.4" Rid="linux-x64" />
286+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.4" Rid="linux-x64" />
286287
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
287-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.3" Rid="linux-x64" />
288+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.4" Rid="linux-x64" />
288289
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
289-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.3" Rid="linux-x64" />
290+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.4" Rid="linux-x64" />
290291
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
291292
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
292293
<Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />

0 commit comments

Comments
 (0)