Skip to content

Commit

Permalink
Merging internal commits for release/6.0.4xx (#42076)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcpopMSFT authored Jul 10, 2024
2 parents 5de1f4e + e75ea81 commit d75c706
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 88 deletions.
8 changes: 8 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-fedc545" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fedc545c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-89f5155" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-89f5155b/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef2ca68f/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand All @@ -34,12 +38,16 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-89f5155" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-fedc545" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
140 changes: 70 additions & 70 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.422-rtm.24229.7">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.424-rtm.24314.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>086db5520af132ac32dcf8cce8ad4d561b868363</Sha>
<Sha>89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="6.0.422">
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="6.0.424">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>086db5520af132ac32dcf8cce8ad4d561b868363</Sha>
<Sha>89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="6.0.422">
<Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="6.0.424">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>086db5520af132ac32dcf8cce8ad4d561b868363</Sha>
<Sha>89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Utils" Version="6.0.422">
<Dependency Name="Microsoft.TemplateEngine.Utils" Version="6.0.424">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>086db5520af132ac32dcf8cce8ad4d561b868363</Sha>
<Sha>89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateSearch.Common" Version="6.0.422">
<Dependency Name="Microsoft.TemplateSearch.Common" Version="6.0.424">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>086db5520af132ac32dcf8cce8ad4d561b868363</Sha>
<Sha>89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.422">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.424">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>086db5520af132ac32dcf8cce8ad4d561b868363</Sha>
<Sha>89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.422">
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.424">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>086db5520af132ac32dcf8cce8ad4d561b868363</Sha>
<Sha>89f5155bcd844b1a02d2be6b17caa0fb2dcf17bc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.30">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.30-servicing.24215.25">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.32-servicing.24314.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.30-servicing.24215.25">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.32-servicing.24314.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.30">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.30">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.13">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.30-servicing.24215.25">
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.32-servicing.24314.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.30">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.3.4">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -113,13 +113,13 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>41a5af9d2c459a06c0795bf21a1c046200f375bf</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="6.0.30-servicing.24216.19">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="6.0.32-servicing.24314.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="6.0.30">
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.3.4-rc.2">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
Expand Down Expand Up @@ -170,66 +170,66 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.30">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>d0dfc3119d2aa9f601fcbdc56717b2f49781898e</Sha>
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.30-servicing.24217.3">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.32-servicing.24314.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>d0dfc3119d2aa9f601fcbdc56717b2f49781898e</Sha>
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.30-servicing.24217.3">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.32-servicing.24314.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>d0dfc3119d2aa9f601fcbdc56717b2f49781898e</Sha>
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.30">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>d0dfc3119d2aa9f601fcbdc56717b2f49781898e</Sha>
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.30-servicing.24216.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.32-servicing.24314.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>dee47a1e2958aa9b97d3c5edf9433312cc5a4634</Sha>
<Sha>798cc6d4922db482f84fb72a8244f0da898bc5d6</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.30">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.30-servicing.24216.19">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.32-servicing.24314.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.30">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.30-servicing.24216.19">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.32-servicing.24314.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.30-servicing.24216.19">
<Dependency Name="dotnet-dev-certs" Version="6.0.32-servicing.24314.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.30-servicing.24216.19">
<Dependency Name="dotnet-user-secrets" Version="6.0.32-servicing.24314.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="6.0.30-servicing.24216.19">
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="6.0.32-servicing.24314.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.30">
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="6.0.30-servicing.24216.19">
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="6.0.32-servicing.24314.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="6.0.30-servicing.24216.19">
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="6.0.32-servicing.24314.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="6.0.3-1.22181.2">
<Uri>https://github.com/dotnet/razor-compiler</Uri>
Expand All @@ -246,21 +246,21 @@
<Sha>503deb302b09bbd0ee3cb64e46117fa2d31af442</Sha>
<SourceBuild RepoName="razor-compiler" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.30">
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.30">
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.30">
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="6.0.30">
<Dependency Name="Microsoft.JSInterop" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>1d696053fcd6735aaac1902afdb0b92edbf43e71</Sha>
<Sha>fedc545ce86467b7d3413d906f1ab02fb3db12ff</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="3.1.0" Pinned="true">
<Uri>https://github.com/aspnet/xdt</Uri>
Expand Down
Loading

0 comments on commit d75c706

Please sign in to comment.