diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75e62c214..95d62c2e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + 39952f0f2dbd76699158d5f84fc3644602ad08c9 https://github.com/dotnet/arcade-services @@ -225,14 +225,14 @@ 71ff04ed77c685b62f0b377ccdd4c17b8b6c15e6 - + https://github.com/dotnet/sourcelink - 955e79b0b955a9f57078b2399a782fcde44a9261 + 401652e13a35e7f139d0df71ef75a7a737272959 - + https://github.com/dotnet/xliff-tasks - 69157952aba0f08738249af4454b045b553614c4 + c92d29d251f88bc3a9fa958efaad048bdabbf8a9 diff --git a/eng/Versions.props b/eng/Versions.props index 58e882e12..95bcd747d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23120.1 + 8.0.0-beta.23123.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index ffaa88eb0..f027af759 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -260,25 +260,40 @@ while :; do ;; jessie) # Debian 8 __CodeName=jessie - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; stretch) # Debian 9 __CodeName=stretch - __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; buster) # Debian 10 __CodeName=buster - __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; bullseye) # Debian 11 __CodeName=bullseye - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; sid) # Debian sid __CodeName=sid - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; tizen) __CodeName= diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 61914a1fb..b214a31db 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -101,7 +101,7 @@ jobs: # handle key-value variable syntax. # example: # - [key]: [value] - - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: - ${{ each pair in variable }}: - name: ${{ pair.key }} value: ${{ pair.value }} diff --git a/global.json b/global.json index e48079a73..f70c64842 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.23061.8", + "dotnet": "8.0.100-preview.1.23115.2", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23120.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23120.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23123.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23123.2" } }