Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/extensions (#617)
Browse files Browse the repository at this point in the history 
* Update dependencies from https://github.com/dotnet/extensions build 20241219.1

Microsoft.AspNetCore.Diagnostics.Middleware , Microsoft.Extensions.AuditReports , Microsoft.Extensions.Compliance.Abstractions , Microsoft.Extensions.Compliance.Redaction , Microsoft.Extensions.Compliance.Testing , Microsoft.Extensions.Diagnostics.ExceptionSummarization , Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.Http.Diagnostics , Microsoft.Extensions.Telemetry , Microsoft.Extensions.Telemetry.Abstractions
 From Version 8.10.0-preview.24501.2 -> To Version 9.1.0-preview.1.24619.1
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] authored Dec 20, 2024
1 parent e910d7e commit 8b72e23
Show file tree
Hide file tree
Showing 151 changed files with 3,437 additions and 4,925 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PropertyGroup>
<!-- The latest TFM we're targeting overall -->
<LatestTargetFramework>net$(MajorVersion).$(MinorVersion)</LatestTargetFramework>
<NetCoreTargetFrameworks>$(LatestTargetFramework);net6.0</NetCoreTargetFrameworks>
<NetCoreTargetFrameworks>$(LatestTargetFramework);net8.0</NetCoreTargetFrameworks>

<!-- All the .NET TFMs we're building -->
<TargetFrameworks>$(NetCoreTargetFrameworks)</TargetFrameworks>
Expand Down
12 changes: 2 additions & 10 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,10 @@
<configuration>
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-extensions -->
<!-- End: Package sources from dotnet-extensions -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- Arcade -->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<!-- Used for the Rich Navigation indexing task -->
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
</packageSources>
Expand Down
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
<Dependencies>
<ProductDependencies>
<!-- dotnet/runtime -->
<Dependency Name="Microsoft.Bcl.TimeProvider" Version="8.0.0">
<Dependency Name="Microsoft.Bcl.TimeProvider" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>488a8a3521610422e8fbe22d5cc66127f3dce3dc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.0">
<Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>488a8a3521610422e8fbe22d5cc66127f3dce3dc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics" Version="8.0.0">
<Dependency Name="Microsoft.Extensions.Diagnostics" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>488a8a3521610422e8fbe22d5cc66127f3dce3dc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>488a8a3521610422e8fbe22d5cc66127f3dce3dc</Sha>
</Dependency>
<!-- dotnet/aspnetcore -->
<!-- dotnet/extensions -->
<Dependency Name="Microsoft.AspNetCore.Diagnostics.Middleware" Version="8.10.0-preview.24501.2">
<Dependency Name="Microsoft.AspNetCore.Diagnostics.Middleware" Version="9.1.0-preview.1.24619.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>18002bee78062a2455d9a6f492695240a9a838f0</Sha>
<Sha>5a73563a9fdb9e73c6e21ef91e56de5fe36ae0cb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.AuditReports" Version="8.10.0-preview.24501.2">
<Dependency Name="Microsoft.Extensions.AuditReports" Version="9.1.0-preview.1.24619.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>18002bee78062a2455d9a6f492695240a9a838f0</Sha>
<Sha>5a73563a9fdb9e73c6e21ef91e56de5fe36ae0cb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Compliance.Abstractions" Version="8.10.0-preview.24501.2">
<Dependency Name="Microsoft.Extensions.Compliance.Abstractions" Version="9.1.0-preview.1.24619.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>18002bee78062a2455d9a6f492695240a9a838f0</Sha>
<Sha>5a73563a9fdb9e73c6e21ef91e56de5fe36ae0cb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Compliance.Redaction" Version="8.10.0-preview.24501.2">
<Dependency Name="Microsoft.Extensions.Compliance.Redaction" Version="9.1.0-preview.1.24619.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>18002bee78062a2455d9a6f492695240a9a838f0</Sha>
<Sha>5a73563a9fdb9e73c6e21ef91e56de5fe36ae0cb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Compliance.Testing" Version="8.10.0-preview.24501.2">
<Dependency Name="Microsoft.Extensions.Compliance.Testing" Version="9.1.0-preview.1.24619.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>18002bee78062a2455d9a6f492695240a9a838f0</Sha>
<Sha>5a73563a9fdb9e73c6e21ef91e56de5fe36ae0cb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.ExceptionSummarization" Version="8.10.0-preview.24501.2">
<Dependency Name="Microsoft.Extensions.Diagnostics.ExceptionSummarization" Version="9.1.0-preview.1.24619.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>18002bee78062a2455d9a6f492695240a9a838f0</Sha>
<Sha>5a73563a9fdb9e73c6e21ef91e56de5fe36ae0cb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="8.10.0-preview.24501.2">
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24619.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>18002bee78062a2455d9a6f492695240a9a838f0</Sha>
<Sha>5a73563a9fdb9e73c6e21ef91e56de5fe36ae0cb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Telemetry.Abstractions" Version="8.10.0-preview.24501.2">
<Dependency Name="Microsoft.Extensions.Telemetry.Abstractions" Version="9.1.0-preview.1.24619.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>18002bee78062a2455d9a6f492695240a9a838f0</Sha>
<Sha>5a73563a9fdb9e73c6e21ef91e56de5fe36ae0cb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Telemetry" Version="8.10.0-preview.24501.2">
<Dependency Name="Microsoft.Extensions.Telemetry" Version="9.1.0-preview.1.24619.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>18002bee78062a2455d9a6f492695240a9a838f0</Sha>
<Sha>5a73563a9fdb9e73c6e21ef91e56de5fe36ae0cb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Http.Diagnostics" Version="8.10.0-preview.24501.2">
<Dependency Name="Microsoft.Extensions.Http.Diagnostics" Version="9.1.0-preview.1.24619.1">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>18002bee78062a2455d9a6f492695240a9a838f0</Sha>
<Sha>5a73563a9fdb9e73c6e21ef91e56de5fe36ae0cb</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24570.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24570.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c7e11bf80279cde53a6251c4d0fa10e613fc739</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
35 changes: 17 additions & 18 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<Project>
<PropertyGroup Label="Version settings">
<MajorVersion>8</MajorVersion>
<MajorVersion>9</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<!-- version in our package name #.#.#-below.#####.## -->
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
<PreReleaseVersionIteration>
</PreReleaseVersionIteration>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
<ValidateBaseline>true</ValidateBaseline>
Expand All @@ -27,22 +26,22 @@
-->
<PropertyGroup Label="Automated">
<!-- dotnet/runtime -->
<MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
<MicrosoftExtensionsDiagnosticsVersion>8.0.0</MicrosoftExtensionsDiagnosticsVersion>
<MicrosoftExtensionsHostingVersion>8.0.0</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftBclTimeProviderVersion>9.0.0</MicrosoftBclTimeProviderVersion>
<MicrosoftExtensionsDiagnosticsVersion>9.0.0</MicrosoftExtensionsDiagnosticsVersion>
<MicrosoftExtensionsHostingVersion>9.0.0</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<!-- dotnet/aspnetcore -->
<!-- dotnet/extensions -->
<MicrosoftAspNetCoreDiagnosticsMiddlewareVersion>8.10.0-preview.24501.2</MicrosoftAspNetCoreDiagnosticsMiddlewareVersion>
<MicrosoftExtensionsAuditReportsVersion>8.10.0-preview.24501.2</MicrosoftExtensionsAuditReportsVersion>
<MicrosoftExtensionsComplianceAbstractionsVersion>8.10.0-preview.24501.2</MicrosoftExtensionsComplianceAbstractionsVersion>
<MicrosoftExtensionsComplianceRedactionVersion>8.10.0-preview.24501.2</MicrosoftExtensionsComplianceRedactionVersion>
<MicrosoftExtensionsComplianceTestingVersion>8.10.0-preview.24501.2</MicrosoftExtensionsComplianceTestingVersion>
<MicrosoftExtensionsDiagnosticsExceptionSummarizationVersion>8.10.0-preview.24501.2</MicrosoftExtensionsDiagnosticsExceptionSummarizationVersion>
<MicrosoftExtensionsDiagnosticsTestingVersion>8.10.0-preview.24501.2</MicrosoftExtensionsDiagnosticsTestingVersion>
<MicrosoftExtensionsHttpDiagnosticsVersion>8.10.0-preview.24501.2</MicrosoftExtensionsHttpDiagnosticsVersion>
<MicrosoftExtensionsTelemetryAbstractionsVersion>8.10.0-preview.24501.2</MicrosoftExtensionsTelemetryAbstractionsVersion>
<MicrosoftExtensionsTelemetryVersion>8.10.0-preview.24501.2</MicrosoftExtensionsTelemetryVersion>
<MicrosoftAspNetCoreDiagnosticsMiddlewareVersion>9.1.0-preview.1.24619.1</MicrosoftAspNetCoreDiagnosticsMiddlewareVersion>
<MicrosoftExtensionsAuditReportsVersion>9.1.0-preview.1.24619.1</MicrosoftExtensionsAuditReportsVersion>
<MicrosoftExtensionsComplianceAbstractionsVersion>9.1.0-preview.1.24619.1</MicrosoftExtensionsComplianceAbstractionsVersion>
<MicrosoftExtensionsComplianceRedactionVersion>9.1.0-preview.1.24619.1</MicrosoftExtensionsComplianceRedactionVersion>
<MicrosoftExtensionsComplianceTestingVersion>9.1.0-preview.1.24619.1</MicrosoftExtensionsComplianceTestingVersion>
<MicrosoftExtensionsDiagnosticsExceptionSummarizationVersion>9.1.0-preview.1.24619.1</MicrosoftExtensionsDiagnosticsExceptionSummarizationVersion>
<MicrosoftExtensionsDiagnosticsTestingVersion>9.1.0-preview.1.24619.1</MicrosoftExtensionsDiagnosticsTestingVersion>
<MicrosoftExtensionsHttpDiagnosticsVersion>9.1.0-preview.1.24619.1</MicrosoftExtensionsHttpDiagnosticsVersion>
<MicrosoftExtensionsTelemetryAbstractionsVersion>9.1.0-preview.1.24619.1</MicrosoftExtensionsTelemetryAbstractionsVersion>
<MicrosoftExtensionsTelemetryVersion>9.1.0-preview.1.24619.1</MicrosoftExtensionsTelemetryVersion>
</PropertyGroup>
<!--
Expand Down
54 changes: 29 additions & 25 deletions eng/common/SetupNugetSources.ps1
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds.
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
# disabled internal Maestro (darc-int*) feeds.
#
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
# This script needs to be called in every job that will restore packages and which the base repo has
# private AzDO feeds in the NuGet.config.
#
# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
# from the AzureDevOps-Artifact-Feeds-Pats variable group.
#
# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing
# See example call for this script below.
#
# - task: PowerShell@2
# displayName: Setup Private Feeds Credentials
Expand All @@ -21,11 +14,18 @@
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
# env:
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
#
# Note that the NuGetAuthenticate task should be called after SetupNugetSources.
# This ensures that:
# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt)
# - The credential provider is installed.
#
# This logic is also abstracted into enable-internal-sources.yml.

[CmdletBinding()]
param (
[Parameter(Mandatory = $true)][string]$ConfigFile,
[Parameter(Mandatory = $true)][string]$Password
$Password
)

$ErrorActionPreference = "Stop"
Expand All @@ -48,11 +48,17 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
else {
Write-Host "Package source $SourceName already present."
}

AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
}

# Add a credential node for the specified source
function AddCredential($creds, $source, $username, $pwd) {
# If no cred supplied, don't do anything.
if (!$pwd) {
return;
}

# Looks for credential configuration for the given SourceName. Create it if none is found.
$sourceElement = $creds.SelectSingleNode($Source)
if ($sourceElement -eq $null)
Expand Down Expand Up @@ -110,11 +116,6 @@ if (!(Test-Path $ConfigFile -PathType Leaf)) {
ExitWithExitCode 1
}

if (!$Password) {
Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT'
ExitWithExitCode 1
}

# Load NuGet.config
$doc = New-Object System.Xml.XmlDocument
$filename = (Get-Item $ConfigFile).FullName
Expand All @@ -127,11 +128,14 @@ if ($sources -eq $null) {
$doc.DocumentElement.AppendChild($sources) | Out-Null
}

# Looks for a <PackageSourceCredentials> node. Create it if none is found.
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
if ($creds -eq $null) {
$creds = $doc.CreateElement("packageSourceCredentials")
$doc.DocumentElement.AppendChild($creds) | Out-Null
$creds = $null
if ($Password) {
# Looks for a <PackageSourceCredentials> node. Create it if none is found.
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
if ($creds -eq $null) {
$creds = $doc.CreateElement("packageSourceCredentials")
$doc.DocumentElement.AppendChild($creds) | Out-Null
}
}

# Check for disabledPackageSources; we'll enable any darc-int ones we find there
Expand All @@ -153,7 +157,7 @@ if ($dotnet31Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
}

$dotnetVersions = @('5','6','7','8')
$dotnetVersions = @('5','6','7','8','9')

foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
Expand All @@ -164,4 +168,4 @@ foreach ($dotnetVersion in $dotnetVersions) {
}
}

$doc.Save($filename)
$doc.Save($filename)
Loading

0 comments on commit 8b72e23

Please sign in to comment.