diff --git a/Directory.Build.props b/Directory.Build.props
index a6ab7b17d8..6e927fe5da 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -25,10 +25,8 @@
- net462
uap10.0.16299
net6.0-windows10.0.18362.0
- net9.0
net6.0;net7.0;net8.0;net9.0
netcoreapp3.1;net6.0;net7.0;net8.0;net9.0
@@ -83,5 +81,5 @@
-
+
diff --git a/Directory.Build.targets b/Directory.Build.targets
index a64f4a9190..4220fbc3f6 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -10,11 +10,5 @@
14.0.0.0
14.0.0.0
-
-
-
- $(NetCurrent)
-
+
diff --git a/NuGet.config b/NuGet.config
index b5ce5f5511..712f79ac00 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,6 +10,7 @@
+
@@ -33,5 +34,8 @@
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 554abc7e39..d550616ca3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
-
+
https://github.com/dotnet/arcade
- 45d845e04c05fbe5da9838c454bbc3af1df6be81
+ 61b8f746424762d2e3173ebfaab19346224d591c
-
+
https://github.com/dotnet/arcade
- 45d845e04c05fbe5da9838c454bbc3af1df6be81
+ 61b8f746424762d2e3173ebfaab19346224d591c
-
+
https://github.com/dotnet/arcade
- 45d845e04c05fbe5da9838c454bbc3af1df6be81
+ 61b8f746424762d2e3173ebfaab19346224d591c
https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage
@@ -40,9 +40,9 @@
-
+
https://github.com/dotnet/arcade
- 45d845e04c05fbe5da9838c454bbc3af1df6be81
+ 61b8f746424762d2e3173ebfaab19346224d591c
diff --git a/eng/Versions.props b/eng/Versions.props
index 94a2168dad..15569ec0e6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -7,7 +7,7 @@
preview
- 10.0.0-beta.24604.4
+ 10.0.0-beta.24606.6
17.14.0-preview.25058.3
1.0.0-alpha.25058.1
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
index 4da05afe05..f9ba1625c2 100644
--- a/eng/common/core-templates/steps/source-build.yml
+++ b/eng/common/core-templates/steps/source-build.yml
@@ -78,7 +78,7 @@ steps:
portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
- portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
+ portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
fi
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 20ae8c2868..096bfe51f1 100644
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -73,8 +73,8 @@ __AlpinePackages+=" krb5-dev"
__AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"
-__FreeBSDBase="13.3-RELEASE"
-__FreeBSDPkg="1.17.0"
+__FreeBSDBase="13.4-RELEASE"
+__FreeBSDPkg="1.21.3"
__FreeBSDABI="13"
__FreeBSDPackages="libunwind"
__FreeBSDPackages+=" icu"
@@ -371,7 +371,7 @@ while :; do
;;
freebsd14)
__CodeName=freebsd
- __FreeBSDBase="14.0-RELEASE"
+ __FreeBSDBase="14.2-RELEASE"
__FreeBSDABI="14"
__SkipUnmount=1
;;
@@ -574,7 +574,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
fi
echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf
- echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
+ echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
mkdir -p "$__RootfsDir"/tmp
# get and build package manager
if [[ "$__hasWget" == 1 ]]; then
diff --git a/global.json b/global.json
index d853cca63e..6534c78b79 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "9.0.100",
+ "dotnet": "10.0.100-alpha.1.24573.1",
"runtimes": {
"dotnet": [
"3.1.32",
@@ -21,12 +21,12 @@
}
},
"sdk": {
- "version": "9.0.100",
+ "version": "10.0.100-alpha.1.24573.1",
"allowPrerelease": true,
"rollForward": "latestFeature"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4",
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6",
"MSBuild.Sdk.Extras": "3.0.44"
}
}
diff --git a/src/Package/Microsoft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj b/src/Package/Microsoft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj
index 2e52abf512..f5524c8883 100644
--- a/src/Package/Microsoft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj
+++ b/src/Package/Microsoft.Testing.Platform.DotNetTestClient/Microsoft.Testing.Platform.DotNetTestClient.csproj
@@ -1,7 +1,7 @@
- net9.0
+ $(NetCurrent)
$(TestingPlatformVersionPrefix)
@@ -37,13 +37,13 @@
-
+
-
+
@@ -51,4 +51,4 @@
-
\ No newline at end of file
+