Skip to content

Commit 527c56f

Browse files
dreddy-workdreddy-work
authored
Merge pull request #6645 from vseanreesermsft/internal-merge-5.0-2022-02-08-1023
Merging internal commits for release/5.0
2 parents 0d0bbcb + 165b1e0 commit 527c56f

File tree

4 files changed

+26
-24
lines changed

4 files changed

+26
-24
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7+
<add key="darc-int-dotnet-runtime-d5b56c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d5b56c63/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-runtime -->
89
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
910
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -15,6 +16,7 @@
1516
<disabledPackageSources>
1617
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1718
<!-- Begin: Package sources from dotnet-runtime -->
19+
<add key="darc-int-dotnet-runtime-d5b56c6" value="true" />
1820
<!-- End: Package sources from dotnet-runtime -->
1921
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2022
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
77
-->
88
<Dependencies>
99
<ProductDependencies>
10-
<Dependency Name="Microsoft.NETCore.App" Version="5.0.13-servicing.21565.16">
10+
<Dependency Name="Microsoft.NETCore.App" Version="5.0.14-servicing.22057.10">
1111
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
12-
<Sha>b3afe992253738208ccaaa058e726553889928de</Sha>
12+
<Sha>d5b56c6327f380de399a2f95ca6045f03c92a66d</Sha>
1313
</Dependency>
1414
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.4">
1515
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -51,21 +51,21 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
5151
<Uri>https://github.com/dotnet/runtime</Uri>
5252
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
5353
</Dependency>
54-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="5.0.13-servicing.21565.16">
54+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="5.0.14-servicing.22057.10">
5555
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
56-
<Sha>b3afe992253738208ccaaa058e726553889928de</Sha>
56+
<Sha>d5b56c6327f380de399a2f95ca6045f03c92a66d</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.13-servicing.21565.16">
58+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.14-servicing.22057.10">
5959
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
60-
<Sha>b3afe992253738208ccaaa058e726553889928de</Sha>
60+
<Sha>d5b56c6327f380de399a2f95ca6045f03c92a66d</Sha>
6161
</Dependency>
62-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="5.0.13-servicing.21565.16">
62+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="5.0.14-servicing.22057.10">
6363
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
64-
<Sha>b3afe992253738208ccaaa058e726553889928de</Sha>
64+
<Sha>d5b56c6327f380de399a2f95ca6045f03c92a66d</Sha>
6565
</Dependency>
66-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="5.0.13-servicing.21565.16">
66+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="5.0.14-servicing.22057.10">
6767
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
68-
<Sha>b3afe992253738208ccaaa058e726553889928de</Sha>
68+
<Sha>d5b56c6327f380de399a2f95ca6045f03c92a66d</Sha>
6969
</Dependency>
7070
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.1">
7171
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -95,13 +95,13 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
9595
<Uri>https://github.com/dotnet/runtime</Uri>
9696
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.13-servicing.21565.16">
98+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.14-servicing.22057.10">
9999
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
100-
<Sha>b3afe992253738208ccaaa058e726553889928de</Sha>
100+
<Sha>d5b56c6327f380de399a2f95ca6045f03c92a66d</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.13-servicing.21565.16">
102+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.14-servicing.22057.10">
103103
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
104-
<Sha>b3afe992253738208ccaaa058e726553889928de</Sha>
104+
<Sha>d5b56c6327f380de399a2f95ca6045f03c92a66d</Sha>
105105
</Dependency>
106106
<Dependency Name="Microsoft.NETCore.Targets" Version="5.0.0">
107107
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -147,9 +147,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
147147
<Uri>https://github.com/dotnet/runtime</Uri>
148148
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
149149
</Dependency>
150-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.13">
150+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.14">
151151
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
152-
<Sha>b3afe992253738208ccaaa058e726553889928de</Sha>
152+
<Sha>d5b56c6327f380de399a2f95ca6045f03c92a66d</Sha>
153153
</Dependency>
154154
</ProductDependencies>
155155
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
1111
<PropertyGroup>
12-
<MicrosoftNETCoreAppPackageVersion>5.0.13-servicing.21565.16</MicrosoftNETCoreAppPackageVersion>
12+
<MicrosoftNETCoreAppPackageVersion>5.0.14-servicing.22057.10</MicrosoftNETCoreAppPackageVersion>
1313
<SystemDiagnosticsEventLogPackageVersion>5.0.1</SystemDiagnosticsEventLogPackageVersion>
1414
<SystemDirectoryServicesPackageVersion>5.0.0</SystemDirectoryServicesPackageVersion>
1515
<SystemReflectionMetadataLoadContextPackageVersion>5.0.1</SystemReflectionMetadataLoadContextPackageVersion>
@@ -18,8 +18,8 @@
1818
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0</SystemSecurityPrincipalWindowsPackageVersion>
1919
<SystemIOPackagingPackageVersion>5.0.0</SystemIOPackagingPackageVersion>
2020
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
21-
<MicrosoftNETCoreILDAsmPackageVersion>5.0.13-servicing.21565.16</MicrosoftNETCoreILDAsmPackageVersion>
22-
<MicrosoftNETCoreAppInternalPackageVersion>5.0.13-servicing.21565.16</MicrosoftNETCoreAppInternalPackageVersion>
21+
<MicrosoftNETCoreILDAsmPackageVersion>5.0.14-servicing.22057.10</MicrosoftNETCoreILDAsmPackageVersion>
22+
<MicrosoftNETCoreAppInternalPackageVersion>5.0.14-servicing.22057.10</MicrosoftNETCoreAppInternalPackageVersion>
2323
<MicrosoftNETCoreTargetsPackageVersion>5.0.0</MicrosoftNETCoreTargetsPackageVersion>
2424
<SystemDiagnosticsPerformanceCounterPackageVersion>5.0.1</SystemDiagnosticsPerformanceCounterPackageVersion>
2525
<SystemIOFileSystemAccessControlPackageVersion>5.0.0</SystemIOFileSystemAccessControlPackageVersion>
@@ -31,7 +31,7 @@
3131
<SystemThreadingAccessControlPackageVersion>5.0.0</SystemThreadingAccessControlPackageVersion>
3232
<MicrosoftWin32RegistryAccessControlPackageVersion>5.0.0</MicrosoftWin32RegistryAccessControlPackageVersion>
3333
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
34-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.13</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
34+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
3535
<MicrosoftNETCorePlatformsPackageVersion>5.0.4</MicrosoftNETCorePlatformsPackageVersion>
3636
<MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
3737
<MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
@@ -43,9 +43,9 @@
4343
<SystemSecurityPermissionsPackageVersion>5.0.0</SystemSecurityPermissionsPackageVersion>
4444
<SystemWindowsExtensionsPackageVersion>5.0.0</SystemWindowsExtensionsPackageVersion>
4545
<MicrosoftNETCoreILPackageVersion>3.0.0-preview5-27616-73</MicrosoftNETCoreILPackageVersion>
46-
<MicrosoftNETCoreILAsmPackageVersion>5.0.13-servicing.21565.16</MicrosoftNETCoreILAsmPackageVersion>
47-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>5.0.13-servicing.21565.16</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
48-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>5.0.13-servicing.21565.16</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
46+
<MicrosoftNETCoreILAsmPackageVersion>5.0.14-servicing.22057.10</MicrosoftNETCoreILAsmPackageVersion>
47+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>5.0.14-servicing.22057.10</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
48+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>5.0.14-servicing.22057.10</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
4949
<!--
5050
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
5151
-->

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"Microsoft.DotNet.CMake.Sdk": "5.0.0-beta.20256.5",
1919
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.22055.3",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
21-
"Microsoft.NET.Sdk.IL": "5.0.13-servicing.21565.16"
21+
"Microsoft.NET.Sdk.IL": "5.0.14-servicing.22057.10"
2222
},
2323
"native-tools": {
2424
"cmake": "3.17.3",

0 commit comments

Comments
 (0)