Skip to content

Commit

Permalink
[feature/9.x] Update dependencies from dotnet/sdk (dotnet#7523)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/sdk build 20241017.5

VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0
 From Version 9.0.100-rtm.24516.6 -> To Version 9.0.100-rtm.24517.5

Dependency coherency updates

Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0
 From Version 9.0.0-rtm.24514.7 -> To Version 9.0.0 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0

* Update dependencies from https://github.com/dotnet/sdk build 20241018.7

VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0
 From Version 9.0.100-rtm.24517.5 -> To Version 9.0.100-rtm.24518.7

* Update dependencies from https://github.com/dotnet/sdk build 20241018.42

VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0
 From Version 9.0.100-rtm.24518.7 -> To Version 9.0.100-rtm.24518.42

* Update dependencies from https://github.com/dotnet/sdk build 20241020.4

VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0
 From Version 9.0.100-rtm.24518.42 -> To Version 9.0.100-rtm.24520.4

* Update dependencies from https://github.com/dotnet/sdk build 20241021.19

VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0
 From Version 9.0.100-rtm.24520.4 -> To Version 9.0.100-rtm.24521.19

* Update dependencies from https://github.com/dotnet/sdk build 20241023.3

VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0
 From Version 9.0.100-rtm.24521.19 -> To Version 9.0.100-rtm.24523.3

* Update dependencies from https://github.com/dotnet/sdk build 20241023.41

VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0
 From Version 9.0.100-rtm.24523.3 -> To Version 9.0.100-rtm.24523.41

* Update dependencies from https://github.com/dotnet/sdk build 20241024.13

VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0
 From Version 9.0.100-rtm.24516.6 -> To Version 9.0.100-rtm.24524.13

* Update dependencies from https://github.com/dotnet/sdk build 20241027.3

VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0
 From Version 9.0.100-rtm.24516.6 -> To Version 9.0.100-rtm.24527.3

* Update target sdk

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Joe Schmitt <[email protected]>
Co-authored-by: Joe Schmitt <[email protected]>
  • Loading branch information
4 people authored Oct 29, 2024
1 parent 5116d05 commit 6c6ad6e
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 21 deletions.
2 changes: 2 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-pub-dotnet-aspnetcore-1e7a7af" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-1e7a7af6/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/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="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rtm.24514.7" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>228b9ea237f21b19647f11c98e342efdb9a1f3f1</Sha>
<Sha>1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="8.0.0-preview.24528.1">
<Uri>https://github.com/dotnet/diagnostics</Uri>
Expand Down Expand Up @@ -46,21 +46,21 @@
<Uri>https://github.com/dotnet/diagnostics</Uri>
<Sha>ca2a2acfd3516444ce7b7c2ad5be0074138f4e6c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24515.9" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf1c582931dc647b8e6ca58c34fcfb20d5d07a42</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-rtm.24514.7" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-rtm.24516.19" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>228b9ea237f21b19647f11c98e342efdb9a1f3f1</Sha>
<Sha>1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0" Version="9.0.100-rtm.24516.6">
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0" Version="9.0.100-rtm.24527.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>3aa4e4a78d5256d91514bef17eb5ebe3dce6743a</Sha>
<Sha>50e04b8d1d8ff413de90383aa799e4189612f685</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-rtm.24515.9" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-rtm.24516.10" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf1c582931dc647b8e6ca58c34fcfb20d5d07a42</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24516.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24516.2</MicrosoftDotNetXUnitExtensionsVersion>
<!-- dotnet/aspnetcore references -->
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rtm.24514.7</MicrosoftAspNetCoreAppRuntimewinx64Version>
<VSRedistCommonAspNetCoreSharedFrameworkx6490Version>9.0.0-rtm.24514.7</VSRedistCommonAspNetCoreSharedFrameworkx6490Version>
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0</MicrosoftAspNetCoreAppRuntimewinx64Version>
<VSRedistCommonAspNetCoreSharedFrameworkx6490Version>9.0.0-rtm.24516.19</VSRedistCommonAspNetCoreSharedFrameworkx6490Version>
<!-- dotnet/command-line-api references -->
<SystemCommandLineVersion>2.0.0-beta4.24528.1</SystemCommandLineVersion>
<!-- dotnet/diagnostics references -->
Expand All @@ -62,10 +62,10 @@
<!-- dotnet/roslyn-analyzers -->
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24527.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!-- dotnet/runtime references -->
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24515.9</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.0-rtm.24515.9</VSRedistCommonNetCoreSharedFrameworkx6490Version>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.0-rtm.24516.10</VSRedistCommonNetCoreSharedFrameworkx6490Version>
<!-- dotnet/sdk references -->
<VSRedistCommonNetCoreSdkPlaceholderx6490Version>9.0.100-rtm.24516.6</VSRedistCommonNetCoreSdkPlaceholderx6490Version>
<VSRedistCommonNetCoreSdkPlaceholderx6490Version>9.0.100-rtm.24527.3</VSRedistCommonNetCoreSdkPlaceholderx6490Version>
<!-- dotnet/symstore references -->
<MicrosoftFileFormatsVersion>1.0.552801</MicrosoftFileFormatsVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions eng/helix/Helix.proj
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@
<AdditionalDotNetPackage Include="$(MicrosoftAspNetCoreApp80Version)">
<PackageType>aspnetcore-runtime</PackageType>
</AdditionalDotNetPackage>
<AdditionalDotNetPackage Include="$(MicrosoftAspNetCoreApp90Version)">
<AdditionalDotNetPackage Include="$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)">
<PackageType>aspnetcore-runtime</PackageType>
</AdditionalDotNetPackage>
</ItemGroup>
</ItemGroup>

<!-- Correlation Paylod: Node -->
<ItemGroup Condition="Exists('$(HelixNodejsPayloadPath)')">
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
"$(MicrosoftAspNetCoreApp60Version)",
"$(MicrosoftAspNetCoreApp70Version)",
"$(MicrosoftAspNetCoreApp80Version)",
"$(MicrosoftAspNetCoreApp90Version)"
"$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)"
],
"aspnetcore/x86": [
"$(MicrosoftAspNetCoreApp60Version)",
"$(MicrosoftAspNetCoreApp70Version)",
"$(MicrosoftAspNetCoreApp80Version)",
"$(MicrosoftAspNetCoreApp90Version)"
"$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)"
],
"dotnet": [
"$(MicrosoftNETCoreApp60Version)",
"$(MicrosoftNETCoreApp70Version)",
"$(MicrosoftNETCoreApp80Version)",
"$(MicrosoftNETCoreApp90Version)"
"$(VSRedistCommonNetCoreSharedFrameworkx6490Version)"
],
"dotnet/x86": [
"$(MicrosoftNETCoreApp60Version)",
"$(MicrosoftNETCoreApp70Version)",
"$(MicrosoftNETCoreApp80Version)",
"$(MicrosoftNETCoreApp90Version)"
"$(VSRedistCommonNetCoreSharedFrameworkx6490Version)"
]
},
"xcopy-msbuild": "17.8.5"
Expand Down

0 comments on commit 6c6ad6e

Please sign in to comment.