Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #296

Open
wants to merge 63 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
e414d1e
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 6, 2023
6d447fd
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 9, 2023
a463d46
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 16, 2023
b5d232a
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 23, 2023
0b571b3
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 30, 2023
66ddf2f
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Feb 6, 2023
0119239
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Feb 13, 2023
c23316e
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Feb 20, 2023
a439cb8
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Feb 27, 2023
727c07a
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Mar 6, 2023
f90f4c9
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Mar 13, 2023
ec3fa34
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Mar 20, 2023
9925edf
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Apr 12, 2023
9a56314
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Apr 18, 2023
fe68583
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Apr 24, 2023
4209bf7
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] May 1, 2023
26ebb1b
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] May 8, 2023
0ab7ec6
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] May 15, 2023
7dc8f71
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] May 22, 2023
5d58c8c
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] May 29, 2023
d2fd652
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 5, 2023
0f50bbd
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 12, 2023
6e6ff5e
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 19, 2023
cc4ba9e
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 26, 2023
0d4a8b3
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 3, 2023
92b0813
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 10, 2023
80381ee
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 17, 2023
98b27bf
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 24, 2023
b8500a9
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 31, 2023
45b7802
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 7, 2023
b21b4ee
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 14, 2023
68c4adb
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 21, 2023
d8b0ba4
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 28, 2023
88a8f4f
Update TFMs
tmat Sep 2, 2023
1060d29
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 4, 2023
81560f3
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 11, 2023
73a72c6
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 18, 2023
0902adb
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 25, 2023
57c124c
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Oct 2, 2023
fa70a09
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 9, 2023
f410e47
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 16, 2023
10278e5
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 23, 2023
cc647d6
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 30, 2023
ba536b8
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 6, 2023
3e0dc11
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 13, 2023
b38e4da
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 20, 2023
9218eb9
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 27, 2023
d6fc5ad
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 4, 2023
df6d58d
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 11, 2023
3ae1634
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 15, 2023
f52dc78
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 18, 2023
405e8d0
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 25, 2023
3f93490
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Jan 1, 2024
5fbf438
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jan 15, 2024
abb345f
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jan 17, 2024
bf8f33c
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jan 22, 2024
ff07e8b
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jan 29, 2024
cb862ee
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Feb 5, 2024
a45b3ae
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Feb 12, 2024
2438161
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Feb 19, 2024
d6bafc3
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Feb 26, 2024
e57b49c
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Mar 4, 2024
e2ec280
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Mar 11, 2024
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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22630.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24159.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
<Sha>f4538b1f8ff5ceb197aea509f3f61872b217b09e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
28 changes: 14 additions & 14 deletions eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0
. $PSScriptRoot\tools.ps1

# Add source entry to PackageSources
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")

if ($packageSource -eq $null)
Expand All @@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
else {
Write-Host "Package source $SourceName already present."
}

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

# Add a credential node for the specified source
function AddCredential($creds, $source, $username, $password) {
function AddCredential($creds, $source, $username, $pwd) {
# 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 @@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) {
$passwordElement.SetAttribute("key", "ClearTextPassword")
$sourceElement.AppendChild($passwordElement) | Out-Null
}
$passwordElement.SetAttribute("value", $Password)

$passwordElement.SetAttribute("value", $pwd)
}

function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")

Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."

ForEach ($PackageSource in $maestroPrivateSources) {
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
}
}

Expand Down Expand Up @@ -144,24 +144,24 @@ if ($disabledSources -ne $null) {
$userName = "dn-bot"

# Insert credential nodes for Maestro's private feeds
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password

# 3.1 uses a different feed url format so it's handled differently here
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
if ($dotnet31Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
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 -Password $Password
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
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')
$dotnetVersions = @('5','6','7','8')

foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
if ($dotnetSource -ne $null) {
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
}
}

$doc.Save($filename)
$doc.Save($filename)
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then
PackageSources+=('dotnet3.1-internal-transport')
fi

DotNetVersions=('5' '6' '7')
DotNetVersions=('5' '6' '7' '8')

for DotNetVersion in ${DotNetVersions[@]} ; do
FeedPrefix="dotnet${DotNetVersion}";
Expand Down
3 changes: 3 additions & 0 deletions eng/common/build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*"
exit /b %ErrorLevel%
5 changes: 5 additions & 0 deletions eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Param(
[switch] $pack,
[switch] $publish,
[switch] $clean,
[switch] $verticalBuild,
[switch][Alias('pb')]$productBuild,
[switch][Alias('bl')]$binaryLog,
[switch][Alias('nobl')]$excludeCIBinarylog,
[switch] $ci,
Expand Down Expand Up @@ -58,6 +60,8 @@ function Print-Usage() {
Write-Host " -sign Sign build outputs"
Write-Host " -publish Publish artifacts (e.g. symbols)"
Write-Host " -clean Clean the solution"
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
Write-Host ""

Write-Host "Advanced settings:"
Expand Down Expand Up @@ -120,6 +124,7 @@ function Build {
/p:Deploy=$deploy `
/p:Test=$test `
/p:Pack=$pack `
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
/p:IntegrationTest=$integrationTest `
/p:PerformanceTest=$performanceTest `
/p:Sign=$sign `
Expand Down
23 changes: 22 additions & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ usage()
echo " --sourceBuild Source-build the solution (short: -sb)"
echo " Will additionally trigger the following actions: --restore, --build, --pack"
echo " If --configuration is not set explicitly, will also set it to 'Release'"
echo " --productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
echo " Will additionally trigger the following actions: --restore, --build, --pack"
echo " If --configuration is not set explicitly, will also set it to 'Release'"
echo " --rebuild Rebuild solution"
echo " --test Run all unit tests in the solution (short: -t)"
echo " --integrationTest Run all integration tests in the solution"
Expand Down Expand Up @@ -59,6 +62,8 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
restore=false
build=false
source_build=false
vertical_build=false
product_build=false
rebuild=false
test=false
integration_test=false
Expand Down Expand Up @@ -105,7 +110,7 @@ while [[ $# > 0 ]]; do
-binarylog|-bl)
binary_log=true
;;
-excludeCIBinarylog|-nobl)
-excludecibinarylog|-nobl)
exclude_ci_binary_log=true
;;
-pipelineslog|-pl)
Expand All @@ -126,6 +131,20 @@ while [[ $# > 0 ]]; do
-sourcebuild|-sb)
build=true
source_build=true
product_build=true
restore=true
pack=true
;;
-productBuild|-pb)
build=true
product_build=true
restore=true
pack=true
;;
-verticalbuild|-vb)
build=true
vertical_build=true
product_build=true
restore=true
pack=true
;;
Expand Down Expand Up @@ -219,7 +238,9 @@ function Build {
/p:RepoRoot="$repo_root" \
/p:Restore=$restore \
/p:Build=$build \
/p:DotNetBuildRepo=$product_build \
/p:ArcadeBuildFromSource=$source_build \
/p:DotNetBuildSourceOnly=$source_build \
/p:Rebuild=$rebuild \
/p:Test=$test \
/p:Pack=$pack \
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.xenial
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted

deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.xenial
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted

deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
Loading
Loading