diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 086504f703..f1b085e6cc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -7,25 +7,25 @@
-
+
https://github.com/dotnet/arcade
- d731f58a502086842739a358ab490bec08fdb8a7
+ abddd0bd5145578246dcadda264c7557f2a935a9
-
+
https://github.com/dotnet/arcade
- d731f58a502086842739a358ab490bec08fdb8a7
+ abddd0bd5145578246dcadda264c7557f2a935a9
-
+
https://github.com/dotnet/arcade
- d731f58a502086842739a358ab490bec08fdb8a7
+ abddd0bd5145578246dcadda264c7557f2a935a9
-
+
https://github.com/dotnet/arcade
- d731f58a502086842739a358ab490bec08fdb8a7
+ abddd0bd5145578246dcadda264c7557f2a935a9
-
+
https://github.com/dotnet/arcade
- d731f58a502086842739a358ab490bec08fdb8a7
+ abddd0bd5145578246dcadda264c7557f2a935a9
https://github.com/dotnet/arcade-services
@@ -39,9 +39,9 @@
https://github.com/dotnet/xharness
89cb4b1d368e0f15b4df8e02a176dd1f1c33958b
-
+
https://github.com/dotnet/arcade
- d731f58a502086842739a358ab490bec08fdb8a7
+ abddd0bd5145578246dcadda264c7557f2a935a9
https://github.com/dotnet/roslyn
@@ -63,9 +63,9 @@
https://github.com/dotnet/symreader-converter
c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0
-
+
https://github.com/dotnet/arcade
- d731f58a502086842739a358ab490bec08fdb8a7
+ abddd0bd5145578246dcadda264c7557f2a935a9
diff --git a/eng/Versions.props b/eng/Versions.props
index 3afb44aab2..5607c21664 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -81,7 +81,7 @@
8.0.1
5.10.2
1.1.2-beta1.23431.1
- 9.0.0-beta.24062.5
+ 9.0.0-beta.24069.2
2.1.0
3.0.1
0.0.6-test
@@ -91,7 +91,6 @@
4.8.5
1.0.118
1.2.7
- 2.6.3
false
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 066044f62f..510458eb35 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -20,6 +20,7 @@ Param(
[switch] $publish,
[switch] $clean,
[switch] $verticalBuild,
+ [switch][Alias('pb')]$productBuild,
[switch][Alias('bl')]$binaryLog,
[switch][Alias('nobl')]$excludeCIBinarylog,
[switch] $ci,
@@ -60,6 +61,7 @@ function Print-Usage() {
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:"
@@ -122,6 +124,7 @@ function Build {
/p:Deploy=$deploy `
/p:Test=$test `
/p:Pack=$pack `
+ /p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
/p:ArcadeBuildVertical=$verticalBuild `
/p:IntegrationTest=$integrationTest `
/p:PerformanceTest=$performanceTest `
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 5ce01dd161..2dfb32f2ec 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -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"
@@ -60,6 +63,7 @@ restore=false
build=false
source_build=false
vertical_build=false
+product_build=false
rebuild=false
test=false
integration_test=false
@@ -127,12 +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
;;
@@ -226,6 +238,7 @@ function Build {
/p:RepoRoot="$repo_root" \
/p:Restore=$restore \
/p:Build=$build \
+ /p:DotNetBuildRepo=$product_build \
/p:ArcadeBuildFromSource=$source_build \
/p:ArcadeBuildVertical=$vertical_build \
/p:Rebuild=$rebuild \
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 9b2791cf56..9fa764e78b 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -8,7 +8,7 @@ usage()
echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
- echo " for FreeBSD can be: freebsd12, freebsd13"
+ echo " for FreeBSD can be: freebsd13, freebsd14"
echo " for illumos can be: illumos"
echo " for Haiku can be: haiku."
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"
__AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"
-__FreeBSDBase="12.4-RELEASE"
-__FreeBSDPkg="1.17.0"
-__FreeBSDABI="12"
+__FreeBSDBase="13.2-RELEASE"
+__FreeBSDPkg="1.20.0"
+__FreeBSDABI="13"
__FreeBSDPackages="libunwind"
__FreeBSDPackages+=" icu"
__FreeBSDPackages+=" libinotify"
@@ -334,14 +334,14 @@ while :; do
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
fi
;;
- freebsd12)
+ freebsd13)
__CodeName=freebsd
__SkipUnmount=1
;;
- freebsd13)
+ freebsd14)
__CodeName=freebsd
- __FreeBSDBase="13.2-RELEASE"
- __FreeBSDABI="13"
+ __FreeBSDBase="14.0-RELEASE"
+ __FreeBSDABI="14"
__SkipUnmount=1
;;
illumos)
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index d7bf5c6e35..b9ede10bf0 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -18,7 +18,7 @@ variables:
- name: SymbolToolVersion
value: 1.0.1
- name: BinlogToolVersion
- value: 1.0.9
+ value: 1.0.11
- name: runCodesignValidationInjection
value: false
diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml
index 835e527512..80861297dd 100644
--- a/eng/common/templates/steps/publish-logs.yml
+++ b/eng/common/templates/steps/publish-logs.yml
@@ -3,7 +3,7 @@ parameters:
JobLabel: ''
CustomSensitiveDataList: ''
# A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed
- BinlogToolVersion: '1.0.9'
+ BinlogToolVersion: '1.0.11'
steps:
- task: Powershell@2
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 1d79797363..1793eb6beb 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -94,6 +94,7 @@ steps:
$baseOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true \
+ /p:DotNetBuildRepo=true \
/p:AssetManifestFileName=$assetManifestFileName
displayName: Build
diff --git a/global.json b/global.json
index 4ce45e24e1..0e25af54bf 100644
--- a/global.json
+++ b/global.json
@@ -13,8 +13,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24062.5",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24062.5",
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24069.2",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24069.2",
"Microsoft.Build.Traversal": "3.2.0",
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"