Skip to content

Commit

Permalink
Merged PR 1986: Update to 2.2.108.
Browse files Browse the repository at this point in the history
Initial update for 2.2.108.
  • Loading branch information
crummel committed Jul 10, 2019
1 parent c7101b0 commit d7506ac
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 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/20190417-03/final/index.json
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20190617-03/final/index.json
10 changes: 5 additions & 5 deletions dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
the product as version strings to be used by the SDK to fetch extra content.
-->
<PropertyGroup>
<MicrosoftAspNetCoreAllPackageVersion>2.2.5</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.2.5</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.2.6</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.2.6</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>

Expand All @@ -33,9 +33,9 @@
<PropertyGroup>
<MicrosoftNETCoreAppLatestVersion1_0>1.0.15</MicrosoftNETCoreAppLatestVersion1_0>
<MicrosoftNETCoreAppLatestVersion1_1>1.1.12</MicrosoftNETCoreAppLatestVersion1_1>
<MicrosoftNETCoreAppLatestVersion2_1>2.1.10</MicrosoftNETCoreAppLatestVersion2_1>
<MicrosoftAspNetCoreAppLatestVersion2_1>2.1.10</MicrosoftAspNetCoreAppLatestVersion2_1>
<MicrosoftAspNetCoreAllLatestVersion2_1>2.1.10</MicrosoftAspNetCoreAllLatestVersion2_1>
<MicrosoftNETCoreAppLatestVersion2_1>2.1.12</MicrosoftNETCoreAppLatestVersion2_1>
<MicrosoftAspNetCoreAppLatestVersion2_1>2.1.12</MicrosoftAspNetCoreAppLatestVersion2_1>
<MicrosoftAspNetCoreAllLatestVersion2_1>2.1.12</MicrosoftAspNetCoreAllLatestVersion2_1>
</PropertyGroup>

<!-- Build stabilization properties as passed in by ProdCon. -->
Expand Down
2 changes: 1 addition & 1 deletion src/cli
2 changes: 1 addition & 1 deletion src/corefx
Submodule corefx updated 28 files
+200 −0 .azure-ci.yml
+1 −1 BuildToolsVersion.txt
+1 −1 buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json
+1 −1 buildpipeline/DotNet-CoreFx-Trusted-Linux.json
+1 −1 buildpipeline/DotNet-CoreFx-Trusted-OSX.json
+1 −1 buildpipeline/pipeline.json
+12 −12 dependencies.props
+5 −2 external/harvestPackages/harvestPackages.props
+1 −1 pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
+1,494 −105 pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+496 −0 pkg/Microsoft.NETCore.Platforms/runtime.json
+12 −6 pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+12 −6 pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+7 −0 pkg/test/packageSettings/System.Memory/netcoreapp1.0/workaroundDowngrade.targets
+3 −3 src/System.ComponentModel.TypeConverter/src/System/ComponentModel/CultureInfoConverter.cs
+2 −1 src/System.Diagnostics.StackTrace/src/System/Diagnostics/StackTraceSymbols.CoreCLR.cs
+24 −0 src/System.Diagnostics.StackTrace/tests/StackTraceSymbolsTests.cs
+4 −1 src/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj
+1 −1 src/System.Memory/dir.props
+5 −1 src/System.Memory/pkg/System.Memory.pkgproj
+1 −1 src/System.Net.Http.WinHttpHandler/dir.props
+3 −3 src/System.Net.Primitives/tests/FunctionalTests/IPAddressParsing.cs
+1 −0 src/System.Private.Uri/tests/FunctionalTests/IriTest.cs
+8 −1 src/System.Private.Uri/tests/FunctionalTests/UriIpHostTest.cs
+2 −2 src/System.Threading.Tasks.Extensions/dir.props
+0 −3 src/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
+0 −6 src/packages.builds
+1 −1 tools-local/ILAsmVersion.txt
8 changes: 4 additions & 4 deletions tools-local/prebuilt-baseline-offline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,12 @@
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.4" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.4" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.5" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.5" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.4" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.5" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.4" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.5" Rid="linux-x64" />
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="opensuse.13.2-x64" />
<Usage Id="runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.42.1-x64" />
Expand Down
26 changes: 13 additions & 13 deletions tools-local/prebuilt-baseline-online.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,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-20181021-2140732" />
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-03130-05" IsDirectDependency="true" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.2.5" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="2.2.5" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.5" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.2.6" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="2.2.6" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.6" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
Expand All @@ -124,23 +124,23 @@
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.2.4" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.2.5" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.0.1" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.2.4" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.2.5" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.3" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.2.4" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.2.5" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.2.4" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.2.5" />
<Usage Id="Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
Expand All @@ -154,7 +154,7 @@
<Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.2.0" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.2.1" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.5" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.1.1" />
Expand Down Expand Up @@ -282,12 +282,12 @@
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.4" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.4" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.5" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.5" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.4" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.5" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.4" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.5" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
Expand Down Expand Up @@ -613,4 +613,4 @@
<Usage Id="XliffTasks" Version="0.2.0-beta-62730-03" IsDirectDependency="true" />
<Usage Id="XliffTasks" Version="0.2.0-beta-63004-01" IsDirectDependency="true" />
</Usages>
</UsageData>
</UsageData>

0 comments on commit d7506ac

Please sign in to comment.