diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 699656db..b821bffc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 https://github.com/dotnet/arcade-services diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 79bb058a..6a59f753 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -330,7 +330,7 @@ while :; do ;; freebsd13) __CodeName=freebsd - __FreeBSDBase="13.0-RELEASE" + __FreeBSDBase="13.2-RELEASE" __FreeBSDABI="13" __SkipUnmount=1 ;; diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 1279a8b1..a7bbf0f1 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -158,7 +158,7 @@ jobs: - template: /eng/common/templates/steps/component-governance.yml parameters: ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: disableComponentGovernance: false ${{ else }}: disableComponentGovernance: true diff --git a/global.json b/global.json index 938d7ed2..c6629ed1 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23226.4" } }