Skip to content

Commit 6d33c53

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#85)
[main] Update dependencies from dotnet/arcade - Update default-build.yml
1 parent 5552361 commit 6d33c53

File tree

92 files changed

+2960
-3084
lines changed

Some content is hidden

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

92 files changed

+2960
-3084
lines changed

‎.azure/default-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
enableTelemetry: true
2525
pool:
2626
${{ if eq(parameters.agentOs, 'macOS') }}:
27-
vmImage: macOS-10.15
27+
vmImage: macOS-11
2828
${{ if eq(parameters.agentOs, 'Linux') }}:
2929
vmImage: ubuntu-18.04
3030
${{ if eq(parameters.agentOs, 'Windows') }}:

‎NuGet.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
77
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
88
</packageSources>
9+
<disabledPackageSources />
910
</configuration>

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19576.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22456.4">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>e1f099bf18a14e8ef5dc50f1a90078839aa102c8</Sha>
8+
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19576.2">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22456.4">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>e1f099bf18a14e8ef5dc50f1a90078839aa102c8</Sha>
12+
<Sha>4f864b2841b3317bdfc516ead0ba6e7856fab575</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +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
156+
$dotnetVersions = @('5','6','7')
157+
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+
}
159165
}
160166

161167
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -105,29 +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\" />"
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")
116123

117-
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
118-
fi
119-
PackageSources+=('dotnet5-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\" />"
120129

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
130+
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
131+
fi
132+
PackageSources+=("$FeedPrefix-internal-transport")
128133
fi
129-
PackageSources+=('dotnet5-internal-transport')
130-
fi
134+
done
131135

132136
# I want things split line by line
133137
PrevIFS=$IFS

‎eng/common/build.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Param(
2525
[switch] $prepareMachine,
2626
[string] $runtimeSourceFeed = '',
2727
[string] $runtimeSourceFeedKey = '',
28+
[switch] $excludePrereleaseVS,
2829
[switch] $help,
2930
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3031
)
@@ -65,6 +66,7 @@ function Print-Usage() {
6566
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6667
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6768
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
69+
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
6870
Write-Host ""
6971

7072
Write-Host "Command line arguments not listed above are passed thru to msbuild."

‎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/sources.list.trusty‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)