Skip to content

Commit f6bd300

Browse files
AndriySvyrydAndriySvyryd
authored
Update dependencies from https://github.com/dotnet/arcade build 20240214.1 (#2210)
1 parent 422c4d0 commit f6bd300

27 files changed

+138
-90
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
<PackageLicenseExpression>MIT</PackageLicenseExpression>
77
</PropertyGroup>
88

9-
<PropertyGroup>
10-
<DefaultNetCoreTargetFramework>net8.0</DefaultNetCoreTargetFramework>
11-
</PropertyGroup>
12-
139
<PropertyGroup>
1410
<PackageTags>Microsoft;EntityFramework;EF;Database;Data;O/RM;ADO.NET</PackageTags>
1511
<Product>Microsoft Entity Framework</Product>

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23601.1">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24114.1">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>38aa367e014493c6f6ebfe94d9029bea01d072c4</Sha>
6+
<Sha>d5b02a4900c4d521cb48b8f0d7e3f28175268f7c</Sha>
77
<SourceBuildId>6471</SourceBuildId>
88
</Dependency>
99
</ToolsetDependencies>

‎eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
-->
1313
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1414
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
15+
<DefaultNetCoreTargetFramework>net9.0</DefaultNetCoreTargetFramework>
1516
</PropertyGroup>
1617
<PropertyGroup Label="Dependencies from nuget.org">
1718
<MicrosoftBuildFrameworkVersion>16.0.461</MicrosoftBuildFrameworkVersion>

‎eng/common/build.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@echo off
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*"
3+
exit /b %ErrorLevel%

‎eng/common/build.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Param(
1919
[switch] $pack,
2020
[switch] $publish,
2121
[switch] $clean,
22+
[switch] $verticalBuild,
23+
[switch][Alias('pb')]$productBuild,
2224
[switch][Alias('bl')]$binaryLog,
2325
[switch][Alias('nobl')]$excludeCIBinarylog,
2426
[switch] $ci,
@@ -58,6 +60,8 @@ function Print-Usage() {
5860
Write-Host " -sign Sign build outputs"
5961
Write-Host " -publish Publish artifacts (e.g. symbols)"
6062
Write-Host " -clean Clean the solution"
63+
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
64+
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
6165
Write-Host ""
6266

6367
Write-Host "Advanced settings:"
@@ -120,6 +124,8 @@ function Build {
120124
/p:Deploy=$deploy `
121125
/p:Test=$test `
122126
/p:Pack=$pack `
127+
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
128+
/p:ArcadeBuildVertical=$verticalBuild `
123129
/p:IntegrationTest=$integrationTest `
124130
/p:PerformanceTest=$performanceTest `
125131
/p:Sign=$sign `

‎eng/common/build.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ usage()
2222
echo " --sourceBuild Source-build the solution (short: -sb)"
2323
echo " Will additionally trigger the following actions: --restore, --build, --pack"
2424
echo " If --configuration is not set explicitly, will also set it to 'Release'"
25+
echo " --productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
26+
echo " Will additionally trigger the following actions: --restore, --build, --pack"
27+
echo " If --configuration is not set explicitly, will also set it to 'Release'"
2528
echo " --rebuild Rebuild solution"
2629
echo " --test Run all unit tests in the solution (short: -t)"
2730
echo " --integrationTest Run all integration tests in the solution"
@@ -59,6 +62,8 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
5962
restore=false
6063
build=false
6164
source_build=false
65+
vertical_build=false
66+
product_build=false
6267
rebuild=false
6368
test=false
6469
integration_test=false
@@ -126,6 +131,20 @@ while [[ $# > 0 ]]; do
126131
-sourcebuild|-sb)
127132
build=true
128133
source_build=true
134+
product_build=true
135+
restore=true
136+
pack=true
137+
;;
138+
-productBuild|-pb)
139+
build=true
140+
product_build=true
141+
restore=true
142+
pack=true
143+
;;
144+
-verticalbuild|-vb)
145+
build=true
146+
vertical_build=true
147+
product_build=true
129148
restore=true
130149
pack=true
131150
;;
@@ -219,7 +238,10 @@ function Build {
219238
/p:RepoRoot="$repo_root" \
220239
/p:Restore=$restore \
221240
/p:Build=$build \
241+
/p:DotNetBuildRepo=$product_build \
222242
/p:ArcadeBuildFromSource=$source_build \
243+
/p:DotNetBuildSourceOnly=$source_build \
244+
/p:ArcadeBuildVertical=$vertical_build \
223245
/p:Rebuild=$rebuild \
224246
/p:Test=$test \
225247
/p:Pack=$pack \

‎eng/common/cross/build-rootfs.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ usage()
88
echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
99
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
1010
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
11-
echo " for FreeBSD can be: freebsd12, freebsd13"
11+
echo " for FreeBSD can be: freebsd13, freebsd14"
1212
echo " for illumos can be: illumos"
1313
echo " for Haiku can be: haiku."
1414
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
@@ -71,9 +71,9 @@ __AlpinePackages+=" krb5-dev"
7171
__AlpinePackages+=" openssl-dev"
7272
__AlpinePackages+=" zlib-dev"
7373

74-
__FreeBSDBase="12.4-RELEASE"
74+
__FreeBSDBase="13.2-RELEASE"
7575
__FreeBSDPkg="1.17.0"
76-
__FreeBSDABI="12"
76+
__FreeBSDABI="13"
7777
__FreeBSDPackages="libunwind"
7878
__FreeBSDPackages+=" icu"
7979
__FreeBSDPackages+=" libinotify"
@@ -182,12 +182,12 @@ while :; do
182182
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
183183
__QEMUArch=riscv64
184184
__UbuntuArch=riscv64
185-
__UbuntuRepo="http://deb.debian.org/debian-ports"
185+
__UbuntuRepo="http://deb.debian.org/debian"
186186
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
187187
unset __LLDB_Package
188188

189-
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
190-
__Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
189+
if [[ -e "/usr/share/keyrings/debian-archive-keyring.gpg" ]]; then
190+
__Keyring="--keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=debian-archive-keyring"
191191
fi
192192
;;
193193
ppc64le)
@@ -334,14 +334,14 @@ while :; do
334334
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
335335
fi
336336
;;
337-
freebsd12)
337+
freebsd13)
338338
__CodeName=freebsd
339339
__SkipUnmount=1
340340
;;
341-
freebsd13)
341+
freebsd14)
342342
__CodeName=freebsd
343-
__FreeBSDBase="13.2-RELEASE"
344-
__FreeBSDABI="13"
343+
__FreeBSDBase="14.0-RELEASE"
344+
__FreeBSDABI="14"
345345
__SkipUnmount=1
346346
;;
347347
illumos)

‎eng/common/cross/riscv64/sources.list.sid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
deb http://deb.debian.org/debian-ports sid main
1+
deb http://deb.debian.org/debian sid main

‎eng/common/helixpublish.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
12
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
23

34
<PropertyGroup>

‎eng/common/internal/Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
22
<Project>
3+
34
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
5+
46
</Project>

0 commit comments

Comments
 (0)