Skip to content

Commit ff9e8f7

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#1854)
* Update dependencies from https://github.com/dotnet/arcade build 20220906.4 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22168.2 -> To Version 8.0.0-beta.22456.4 * Update dependencies from https://github.com/dotnet/arcade build 20220916.3 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22168.2 -> To Version 8.0.0-beta.22466.3 * Update dependencies from https://github.com/dotnet/arcade build 20220923.1 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22168.2 -> To Version 8.0.0-beta.22473.1 * Update dependencies from https://github.com/dotnet/arcade build 20220930.2 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22168.2 -> To Version 8.0.0-beta.22480.2 * Update dependencies from https://github.com/dotnet/arcade build 20221003.1 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22168.2 -> To Version 8.0.0-beta.22503.1 * Update dependencies from https://github.com/dotnet/arcade build 20221013.2 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22168.2 -> To Version 8.0.0-beta.22513.2 * Update dependencies from https://github.com/dotnet/arcade build 20221020.1 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22168.2 -> To Version 8.0.0-beta.22520.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 605dd1d commit ff9e8f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+949
-485
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22168.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22520.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>bafd55901b50d6fc3507c8ed96a7777fcca1796f</Sha>
8+
<Sha>7e27c0ab0fc92ec636c26442fd1663dc5714aa4b</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
1111
</ToolsetDependencies>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,22 +146,22 @@ $userName = "dn-bot"
146146
# Insert credential nodes for Maestro's private feeds
147147
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
148148

149+
# 3.1 uses a different feed url format so it's handled differently here
149150
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
150151
if ($dotnet31Source -ne $null) {
151152
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
152153
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
153154
}
154155

155-
$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']")
156-
if ($dotnet5Source -ne $null) {
157-
AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
158-
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
159-
}
156+
$dotnetVersions = @('5','6','7')
160157

161-
$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']")
162-
if ($dotnet6Source -ne $null) {
163-
AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
164-
AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
158+
foreach ($dotnetVersion in $dotnetVersions) {
159+
$feedPrefix = "dotnet" + $dotnetVersion;
160+
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
161+
if ($dotnetSource -ne $null) {
162+
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
163+
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
164+
}
165165
}
166166

167167
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh‎

Lines changed: 24 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -105,53 +105,33 @@ if [ "$?" == "0" ]; then
105105
PackageSources+=('dotnet3.1-internal-transport')
106106
fi
107107

108-
# Ensure dotnet5-internal and dotnet5-internal-transport are in the packageSources if the public dotnet5 feeds are present
109-
grep -i "<add key=\"dotnet5\"" $ConfigFile
110-
if [ "$?" == "0" ]; then
111-
grep -i "<add key=\"dotnet5-internal\"" $ConfigFile
112-
if [ "$?" != "0" ]; then
113-
echo "Adding dotnet5-internal to the packageSources."
114-
PackageSourcesNodeFooter="</packageSources>"
115-
PackageSourceTemplate="${TB}<add key=\"dotnet5-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2\" />"
116-
117-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
118-
fi
119-
PackageSources+=('dotnet5-internal')
120-
121-
grep -i "<add key=\"dotnet5-internal-transport\">" $ConfigFile
122-
if [ "$?" != "0" ]; then
123-
echo "Adding dotnet5-internal-transport to the packageSources."
124-
PackageSourcesNodeFooter="</packageSources>"
125-
PackageSourceTemplate="${TB}<add key=\"dotnet5-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2\" />"
126-
127-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
128-
fi
129-
PackageSources+=('dotnet5-internal-transport')
130-
fi
131-
132-
# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present
133-
grep -i "<add key=\"dotnet6\"" $ConfigFile
134-
if [ "$?" == "0" ]; then
135-
grep -i "<add key=\"dotnet6-internal\"" $ConfigFile
136-
if [ "$?" != "0" ]; then
137-
echo "Adding dotnet6-internal to the packageSources."
138-
PackageSourcesNodeFooter="</packageSources>"
139-
PackageSourceTemplate="${TB}<add key=\"dotnet6-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2\" />"
108+
DotNetVersions=('5' '6' '7')
109+
110+
for DotNetVersion in ${DotNetVersions[@]} ; do
111+
FeedPrefix="dotnet${DotNetVersion}";
112+
grep -i "<add key=\"$FeedPrefix\"" $ConfigFile
113+
if [ "$?" == "0" ]; then
114+
grep -i "<add key=\"$FeedPrefix-internal\"" $ConfigFile
115+
if [ "$?" != "0" ]; then
116+
echo "Adding $FeedPrefix-internal to the packageSources."
117+
PackageSourcesNodeFooter="</packageSources>"
118+
PackageSourceTemplate="${TB}<add key=\"$FeedPrefix-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/v2\" />"
119+
120+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
121+
fi
122+
PackageSources+=("$FeedPrefix-internal")
140123

141-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
142-
fi
143-
PackageSources+=('dotnet6-internal')
124+
grep -i "<add key=\"$FeedPrefix-internal-transport\">" $ConfigFile
125+
if [ "$?" != "0" ]; then
126+
echo "Adding $FeedPrefix-internal-transport to the packageSources."
127+
PackageSourcesNodeFooter="</packageSources>"
128+
PackageSourceTemplate="${TB}<add key=\"$FeedPrefix-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/v2\" />"
144129

145-
grep -i "<add key=\"dotnet6-internal-transport\">" $ConfigFile
146-
if [ "$?" != "0" ]; then
147-
echo "Adding dotnet6-internal-transport to the packageSources."
148-
PackageSourcesNodeFooter="</packageSources>"
149-
PackageSourceTemplate="${TB}<add key=\"dotnet6-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2\" />"
150-
151-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
130+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
131+
fi
132+
PackageSources+=("$FeedPrefix-internal-transport")
152133
fi
153-
PackageSources+=('dotnet6-internal-transport')
154-
fi
134+
done
155135

156136
# I want things split line by line
157137
PrevIFS=$IFS

‎eng/common/build.ps1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Param(
2626
[string] $runtimeSourceFeed = '',
2727
[string] $runtimeSourceFeedKey = '',
2828
[switch] $excludePrereleaseVS,
29+
[switch] $nativeToolsOnMachine,
2930
[switch] $help,
3031
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3132
)
@@ -67,6 +68,7 @@ function Print-Usage() {
6768
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6869
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
6970
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
71+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7072
Write-Host ""
7173

7274
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
146148
$nodeReuse = $false
147149
}
148150

151+
if ($nativeToolsOnMachine) {
152+
$env:NativeToolsOnMachine = $true
153+
}
149154
if ($restore) {
150155
InitializeNativeTools
151156
}

‎eng/common/build.sh‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ usage()
1919
echo "Actions:"
2020
echo " --restore Restore dependencies (short: -r)"
2121
echo " --build Build solution (short: -b)"
22+
echo " --sourceBuild Source-build the solution (short: -sb)"
23+
echo " Will additionally trigger the following actions: --restore, --build, --pack"
24+
echo " If --configuration is not set explicitly, will also set it to 'Release'"
2225
echo " --rebuild Rebuild solution"
2326
echo " --test Run all unit tests in the solution (short: -t)"
2427
echo " --integrationTest Run all integration tests in the solution"
@@ -55,6 +58,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
5558

5659
restore=false
5760
build=false
61+
source_build=false
5862
rebuild=false
5963
test=false
6064
integration_test=false
@@ -73,7 +77,7 @@ exclude_ci_binary_log=false
7377
pipelines_log=false
7478

7579
projects=''
76-
configuration='Debug'
80+
configuration=''
7781
prepare_machine=false
7882
verbosity='minimal'
7983
runtime_source_feed=''
@@ -119,6 +123,12 @@ while [[ $# > 0 ]]; do
119123
-pack)
120124
pack=true
121125
;;
126+
-sourcebuild|-sb)
127+
build=true
128+
source_build=true
129+
restore=true
130+
pack=true
131+
;;
122132
-test|-t)
123133
test=true
124134
;;
@@ -168,6 +178,10 @@ while [[ $# > 0 ]]; do
168178
shift
169179
done
170180

181+
if [[ -z "$configuration" ]]; then
182+
if [[ "$source_build" = true ]]; then configuration="Release"; else configuration="Debug"; fi
183+
fi
184+
171185
if [[ "$ci" == true ]]; then
172186
pipelines_log=true
173187
node_reuse=false
@@ -205,6 +219,7 @@ function Build {
205219
/p:RepoRoot="$repo_root" \
206220
/p:Restore=$restore \
207221
/p:Build=$build \
222+
/p:ArcadeBuildFromSource=$source_build \
208223
/p:Rebuild=$rebuild \
209224
/p:Test=$test \
210225
/p:Pack=$pack \

‎eng/common/cross/arm/sources.list.focal‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse

‎eng/common/cross/arm/sources.list.jammy‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse

‎eng/common/cross/arm/tizen-fetch.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
5151
mkdir -p $TMPDIR
5252
fi
5353

54-
TIZEN_URL=http://download.tizen.org/snapshots/tizen
54+
TIZEN_URL=http://download.tizen.org/snapshots/TIZEN/Tizen
5555
BUILD_XML=build.xml
5656
REPOMD_XML=repomd.xml
5757
PRIMARY_XML=primary.xml
@@ -155,7 +155,7 @@ fetch_tizen_pkgs()
155155
}
156156

157157
Inform "Initialize arm base"
158-
fetch_tizen_pkgs_init standard base
158+
fetch_tizen_pkgs_init standard Tizen-Base
159159
Inform "fetch common packages"
160160
fetch_tizen_pkgs armv7hl gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
@@ -164,7 +164,7 @@ Inform "fetch corefx packages"
164164
fetch_tizen_pkgs armv7hl libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
165165

166166
Inform "Initialize standard unified"
167-
fetch_tizen_pkgs_init standard unified
167+
fetch_tizen_pkgs_init standard Tizen-Unified
168168
Inform "fetch corefx packages"
169169
fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release
170170

‎eng/common/cross/arm64/sources.list.focal‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse

‎eng/common/cross/arm64/sources.list.jammy‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse

0 commit comments

Comments
 (0)