From f3e8bacb851ae170683a29251054ac09fd90ed86 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 24 Feb 2023 13:29:50 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20230223.2 (#1546)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/cross/build-rootfs.sh | 25 ++++++++++++++++++++-----
eng/common/templates/job/job.yml | 2 +-
global.json | 4 ++--
4 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8119945f..d19fdcf3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
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
- c4a85adbff520f62bfade7a6132f471506c3d35a
+ 39952f0f2dbd76699158d5f84fc3644602ad08c9
-
+
https://github.com/dotnet/arcade
- c4a85adbff520f62bfade7a6132f471506c3d35a
+ 39952f0f2dbd76699158d5f84fc3644602ad08c9
https://github.com/dotnet/arcade-services
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index ffaa88eb..f027af75 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 61914a1f..b214a31d 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 021fa7aa..63c53875 100644
--- a/global.json
+++ b/global.json
@@ -3,7 +3,7 @@
"allowPrerelease": true
},
"tools": {
- "dotnet": "8.0.100-alpha.1.23061.8",
+ "dotnet": "8.0.100-preview.1.23115.2",
"runtimes": {
"dotnet": [
"6.0.0"
@@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23120.1"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23123.2"
}
}