Skip to content

Commit

Permalink
Merging internal commits for release/3.1 (#28636)
Browse files Browse the repository at this point in the history 
* [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-extensions

* [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-extensions
- Coherency Updates:
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Internal: from 3.1.27-servicing.22315.13 to 3.1.28-servicing.22362.2 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.27 to 3.1.28 (parent: Microsoft.Extensions.Logging)

* [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-extensions

* Merged PR 24093: [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-extensions

This pull request updates the following dependencies

[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.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Internal**: from 3.1.28-servicing.22362.2 to 3.1.28-servicing.22363.6 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.28 to 3.1.28 (parent: Microsoft.Extensions.Logging)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:866e0d8e-b549-4674-92fd-08d795576dcc)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-extensions
- **Subscription**: 866e0d8e-b549-4674-92fd-08d795576dcc
- **Build**: 20220712.8
- **Date Produced**: July 13, 2022 4:23:24 AM UTC
- **Commit**: 9aa9f8d3b194c4878540db64e2561d5e9d8c6002
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Internal.AspNetCore.Analyzers**: [from 3.1.28-servicing.22362.4 to 3.1.28-servicing.22362.8][1]
  - **Microsoft.AspNetCore.Analyzer.Testing**: [from 3.1.28-servicing.22362.4 to 3.1.28-servicing.22362.8][1]
  - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: [from 3.1.28-servicing.22362.4 to 3.1.28-servicing.22362.8][1]
  - **Microsoft.AspNetCore.Testing**: [from 3.1.28-servicing.22362.4 to 3.1.28-servicing.22362.8][1]
  - **M...

* [release/3.1] Update SDK version

Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
  • Loading branch information
@vseanreesermsft @dotnet-bot @dougbu
4 people committed Aug 9, 2022
1 parent 131da85 commit d039bdd
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 136 deletions.
12 changes: 9 additions & 3 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<!-- Begin: Package sources from dotnet-corefx -->
<!-- End: Package sources from dotnet-corefx -->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-2d4bb96" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-2d4bb962/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-ce3350c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-ce3350c1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-core-setup -->
<!-- Begin: Package sources from dotnet-extensions -->
<add key="darc-int-dotnet-extensions-06a95a7" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-06a95a71/nuget/v3/index.json" />
<add key="darc-int-dotnet-extensions-bf06962" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-bf069624/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-extensions -->
<!--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 @@ -24,12 +24,18 @@
<!-- Begin: Package sources from dotnet-corefx -->
<!-- End: Package sources from dotnet-corefx -->
<!-- Begin: Package sources from dotnet-extensions -->
<add key="darc-int-dotnet-extensions-06a95a7" value="true" />
<add key="darc-int-dotnet-extensions-bf06962" value="true" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
<!-- End: Package sources from dotnet-extensions -->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-ce3350c" value="true" />
<add key="darc-int-dotnet-core-setup-857ba38" value="true" />
<add key="darc-int-dotnet-core-setup-59a12ca" value="true" />
<add key="darc-int-dotnet-core-setup-aed122f" value="true" />
<add key="darc-int-dotnet-core-setup-aed122f" value="true" />
<add key="darc-int-dotnet-core-setup-2d4bb96" value="true" />
<add key="darc-int-dotnet-core-setup-2d4bb96" value="true" />
<add key="darc-int-dotnet-core-setup-26e3b2b" value="true" />
<add key="darc-int-dotnet-core-setup-c1f9aa1" value="true" />
Expand Down

0 comments on commit d039bdd

Please sign in to comment.