Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@ This file should be imported by eng/Versions.props
<!-- dotnet-dotnet dependencies -->
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26411.119</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26411.119</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26411.119</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26411.119</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-rc.1.26411.119</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-rc.1.26411.119</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>11.0.0-rc.1.26411.119</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26424.125</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26424.125</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26424.125</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26424.125</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>11.0.0-rc.1.26424.125</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-rc.1.26424.125</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>11.0.0-rc.1.26424.125</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-rc.1.26411.119</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-rc.1.26411.119</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>11.0.0-rc.1.26411.119</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>11.0.0-rc.1.26411.119</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>11.0.0-rc.1.26411.119</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-rc.1.26411.119</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>11.0.0-rc.1.26411.119</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-rc.1.26411.119</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-rc.1.26411.119</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-rc.1.26411.119</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-rc.1.26411.119</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-rc.1.26411.119</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>11.0.0-rc.1.26411.119</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-rc.1.26411.119</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>11.0.0-rc.1.26424.125</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>11.0.0-rc.1.26424.125</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>11.0.0-rc.1.26424.125</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>11.0.0-rc.1.26424.125</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>11.0.0-rc.1.26424.125</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>11.0.0-rc.1.26424.125</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>11.0.0-rc.1.26424.125</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>11.0.0-rc.1.26424.125</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-rc.1.26424.125</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>11.0.0-rc.1.26424.125</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>11.0.0-rc.1.26424.125</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>11.0.0-rc.1.26424.125</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>11.0.0-rc.1.26424.125</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>11.0.0-rc.1.26424.125</SystemWindowsExtensionsPackageVersion>
<!-- dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>11.0.0-preview.2.26270.1</MicrosoftDotNetWpfDncEngPackageVersion>
</PropertyGroup>
Expand Down
86 changes: 43 additions & 43 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="7cdb217445905f3342bbb0266a4497b9a014389a" BarId="326717" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="18aca855818ca5e09075637626229cd6d73011b9" BarId="328502" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-rc.1.26411.119">
<Dependency Name="Microsoft.Private.Winforms" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-rc.1.26411.119">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Windows.Extensions" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="11.0.0-preview.2.26270.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>a6da41e859712fcb3f2e5ed3474bdf86b4e5046a</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Resources.Extensions" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-rc.1.26411.119">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.CodeDom" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Configuration.ConfigurationManager" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Diagnostics.EventLog" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.DirectoryServices" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Formats.Nrbf" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.IO.Packaging" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Security.Cryptography.Xml" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Security.Permissions" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Drawing.Common" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -80,21 +80,21 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26411.119">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26411.119">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26411.119">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26411.119">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
Expand All @@ -105,9 +105,9 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
</Dependency>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-rc.1.26411.119">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="11.0.0-rc.1.26424.125">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
<Sha>18aca855818ca5e09075637626229cd6d73011b9</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
18 changes: 14 additions & 4 deletions eng/common/Get-GitHubAppToken.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,13 @@ try {
$installations = @()
$page = 1
do {
$pageInstallations = @(Invoke-RestMethod `
# Assign the response before wrapping it in @(). PowerShell otherwise
# preserves a top-level JSON array as one nested pipeline object.
$pageResponse = Invoke-RestMethod `
-Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
-Headers $headers `
-Method Get)
-Method Get
$pageInstallations = @($pageResponse)
$installations += $pageInstallations
$page++
} while ($pageInstallations.Count -eq 100)
Expand All @@ -125,12 +128,19 @@ catch {
Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
exit 1
}
$installation = $installations | Where-Object { $_.account.login -ieq $InstallationOwner } | Select-Object -First 1
if (-not $installation) {
$matchingInstallations = @($installations | Where-Object { $_.account.login -ieq $InstallationOwner })
if ($matchingInstallations.Count -eq 0) {
$found = ($installations | ForEach-Object { $_.account.login }) -join ', '
Write-PipelineTelemetryError -Category 'Build' -Message "No installation found for '$InstallationOwner'. App is installed on: $found"
exit 1
}
if ($matchingInstallations.Count -ne 1) {
$matchingIds = ($matchingInstallations | ForEach-Object { $_.id }) -join ', '
Write-PipelineTelemetryError -Category 'Build' -Message "Found multiple installations for '$InstallationOwner': $matchingIds"
exit 1
}
$installation = $matchingInstallations[0]
Write-Host "Using installation $($installation.id) for '$($installation.account.login)'."

try {
$tokenResponse = Invoke-RestMethod `
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ if ($disabledSources -ne $null) {
Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node"
EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds -Credential $feedCredential
}
$dotnetVersions = @('5','6','7','8','9','10')
$dotnetVersions = @('5','6','7','8','9','10','11')

foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ if [ "$?" == "0" ]; then
EnableMaestroInternalPackageSources
fi

DotNetVersions=('5' '6' '7' '8' '9' '10')
DotNetVersions=('5' '6' '7' '8' '9' '10' '11')

for DotNetVersion in ${DotNetVersions[@]} ; do
FeedPrefix="dotnet${DotNetVersion}";
Expand Down
13 changes: 13 additions & 0 deletions eng/common/core-templates/job/helix-job-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,15 @@ parameters:
type: boolean
default: false

# Controls per-test output attachments. Defaults to Failed.
- name: testResultAttachmentMode
type: string
default: Failed
values:
- Failed
- All
- None

# Advanced: optional pipeline artifact (produced earlier in this run) that contains the tool
# nupkg. When set, the artifact is downloaded and the tool is installed from the nupkg into
# a local tool-path; this bypasses the repo's .config/dotnet-tools.json manifest and is
Expand Down Expand Up @@ -210,6 +219,7 @@ jobs:

organization='${{ parameters.organization }}'
repository='${{ parameters.repository }}'
testResultAttachmentMode='${{ parameters.testResultAttachmentMode }}'

# Fall back to Azure DevOps-provided environment variables when the caller did not
# supply organization / repository explicitly. BUILD_REPOSITORY_NAME is typically
Expand All @@ -232,6 +242,9 @@ jobs:

if [ -n "$organization" ]; then toolArgs+=( --organization "$organization" ); fi
if [ -n "$repository" ]; then toolArgs+=( --repository "$repository" ); fi
if [ -n "$testResultAttachmentMode" ]; then
toolArgs+=( --test-result-attachment-mode "$testResultAttachmentMode" )
fi

# Build.Reason and Build.SourceBranch are required to derive the Helix source filter
# the same way the Helix SDK submitter does (PR -> 'pr', internal -> 'official',
Expand Down
Loading
Loading