Skip to content

Commit

Permalink
Merged PR 26233: [internal/release/6.0.4xx] Update dependencies from …
Browse files Browse the repository at this point in the history 
…dnceng/internal/dotnet-aspnetcore dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:1963f8a1-5df7-4929-7e1e-08da65ba3032)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1963f8a1-5df7-4929-7e1e-08da65ba3032
- **Build**: 20220926.17
- **Date Produced**: September 27, 2022 2:14:59 AM UTC
- **Commit**: 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1]
  - **dotnet-user-secrets**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][1]
  - **Microsoft.AspNetCore.Authorization**: [from 6.0.10 to 6.0.10][1]
  - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.10 to 6.0.10][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 6.0.10 to 6.0.10][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1]
  - **Microsoft.AspNetCore.TestHost**: [from 6.0.10 to 6.0.10][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.10 to 6.0.10][1]
  - **Microsoft.JSInterop**: [from 6.0.10 to 6.0.10][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC9efc206&targetVersion=GC32e8c8c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1963f8a1-5df7-4929-7e1e-08da65ba3032)

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Sdk.WindowsDesktop**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 388...
  • Loading branch information
@dotnet-bot @mmitche
dotnet-bot authored and mmitche committed Sep 27, 2022
1 parent 5c32506 commit 6a37511
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 46 deletions.
12 changes: 4 additions & 8 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<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-9efc206" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-9efc206d/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-32e8c8c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-32e8c8ca/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-int-DotNet-msbuild-Trusted-5618488" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-56184888/nuget/v3/index.json" />
Expand All @@ -23,9 +23,7 @@
<add key="darc-int-dotnet-templating-32a619c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-32a619c8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-6281f2d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6281f2d8/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-6281f2d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6281f2d8-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-6281f2d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6281f2d8-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-74607da" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-74607da1/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 Down Expand Up @@ -54,15 +52,13 @@
<add key="darc-int-dotnet-templating-32a619c" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-9efc206" value="true" />
<add key="darc-int-dotnet-aspnetcore-32e8c8c" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-5a400c2" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-6281f2d-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-6281f2d-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-6281f2d" value="true" />
<add key="darc-int-dotnet-windowsdesktop-74607da" 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
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>7d8de40e2bfe5bd2546ca49177166741af4c8e07</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="6.0.10-servicing.22476.12">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="6.0.10-servicing.22476.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="6.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.3.1-rc.1">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
Expand Down Expand Up @@ -168,64 +168,64 @@
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha>
<Sha>74607da18cfa95417e1bddf02c80fb97e48c7f46</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.10-servicing.22470.9">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.10-servicing.22476.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha>
<Sha>74607da18cfa95417e1bddf02c80fb97e48c7f46</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.10-servicing.22470.9">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.10-servicing.22476.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha>
<Sha>74607da18cfa95417e1bddf02c80fb97e48c7f46</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha>
<Sha>74607da18cfa95417e1bddf02c80fb97e48c7f46</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.10-servicing.22470.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.10-servicing.22476.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>bbe6a9e6d0da0f80a57f80914177691fd1f1b97e</Sha>
<Sha>3bbc77257e3d51a2e19195523eafd262da1f5459</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.10-servicing.22476.12">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.10-servicing.22476.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.10-servicing.22476.12">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.10-servicing.22476.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.10-servicing.22476.12">
<Dependency Name="dotnet-dev-certs" Version="6.0.10-servicing.22476.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.10-servicing.22476.12">
<Dependency Name="dotnet-user-secrets" Version="6.0.10-servicing.22476.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="6.0.10-servicing.22476.12">
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="6.0.10-servicing.22476.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="6.0.10-servicing.22476.12">
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="6.0.10-servicing.22476.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="6.0.10-servicing.22476.12">
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="6.0.10-servicing.22476.17">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</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 @@ -244,19 +244,19 @@
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="6.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="3.1.0" Pinned="true">
<Uri>https://github.com/aspnet/xdt</Uri>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,23 +137,23 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.10-servicing.22476.12</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.10-servicing.22476.17</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.10</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.10-servicing.22476.12</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.10-servicing.22476.12</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.10-servicing.22476.12</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.10-servicing.22476.17</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.10-servicing.22476.17</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.10-servicing.22476.17</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>6.0.10</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>6.0.3-1.22213.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
<MicrosoftCodeAnalysisRazorToolingInternalVersion>6.0.3-1.22213.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
<MicrosoftAspNetCoreRazorSourceGeneratorToolingInternalPackageVersion>6.0.3-1.22213.1</MicrosoftAspNetCoreRazorSourceGeneratorToolingInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.10-servicing.22470.7</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.10-servicing.22476.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.10-servicing.22470.9</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.10-servicing.22476.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
Expand Down

0 comments on commit 6a37511

Please sign in to comment.