Skip to content

Commit

Permalink
Merged PR 38310: [internal/release/7.0] Update dependencies from dnce…
Browse files Browse the repository at this point in the history 
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:25f6e48a-ea28-4cf9-40e5-08da7ef5fc68)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 25f6e48a-ea28-4cf9-40e5-08da7ef5fc68
- **Build**:
- **Date Produced**: March 20, 2024 2:38:13 AM UTC
- **Commit**: 544c7e6eb3d5525c6f85341f51217d81d7c8ed80
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1]
  - **Microsoft.NET.Sdk.IL**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.18 to 7.0.18][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.18 to 7.0.18][1]
  - **Microsoft.NETCore.ILAsm**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1]
  - **Microsoft.NETCore.ILDAsm**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1]
  - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1]
  - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.18-servicing.24163.20 to 7.0.18-servicing.24169.14][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe963835596dce0e4258709f53167661b91728a62&targetVersion=GC544c7e6eb3d5525c6f85341f51217d81d7c8ed80&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:25f6e48a-ea28-4cf9-40e5-08da7ef5fc68)
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Mar 20, 2024
2 parents 825dfb8 + 4bc875b commit 1a5db9a
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 32 deletions.
12 changes: 2 additions & 10 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-e963835" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e9638355/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-dff486f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-dff486f-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-dff486f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-dff486f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-544c7e6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-544c7e6e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -23,11 +19,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-dff486f-1" value="true" />
<add key="darc-int-dotnet-runtime-dff486f-2" value="true" />
<add key="darc-int-dotnet-runtime-dff486f-3" value="true" />
<add key="darc-int-dotnet-runtime-dff486f" value="true" />
<add key="darc-int-dotnet-runtime-e963835" value="true" />
<add key="darc-int-dotnet-runtime-544c7e6" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.18-servicing.24163.20">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.18-servicing.24169.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -47,21 +47,21 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.18-servicing.24163.20">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.18-servicing.24169.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24163.20">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24169.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24163.20">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24169.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24163.20">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="7.0.18-servicing.24169.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -83,9 +83,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="7.0.18-servicing.24163.20">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="7.0.18-servicing.24169.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -117,15 +117,15 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.18-servicing.24163.20">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.18-servicing.24169.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e963835596dce0e4258709f53167661b91728a62</Sha>
<Sha>544c7e6eb3d5525c6f85341f51217d81d7c8ed80</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.18-servicing.24163.20</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.18-servicing.24169.14</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<SystemDiagnosticsEventLogPackageVersion>7.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>7.0.1</SystemDirectoryServicesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>7.0.0</SystemReflectionMetadataLoadContextPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>7.0.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemIOPackagingPackageVersion>7.0.0</SystemIOPackagingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>7.0.18-servicing.24163.20</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>7.0.18-servicing.24169.14</MicrosoftNETCoreILDAsmPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>7.0.0</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>7.0.2</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.1</SystemSecurityCryptographyProtectedDataPackageVersion>
Expand All @@ -39,9 +39,9 @@
<SystemResourcesExtensionsPackageVersion>7.0.0</SystemResourcesExtensionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>7.0.0</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>7.0.0</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24163.20</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24163.20</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24163.20</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24169.14</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24169.14</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>7.0.18-servicing.24169.14</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<!--
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
-->
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24114.4",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "7.0.18-servicing.24163.20"
"Microsoft.NET.Sdk.IL": "7.0.18-servicing.24169.14"
},
"native-tools": {
"cmake": "3"
Expand Down

0 comments on commit 1a5db9a

Please sign in to comment.