diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 17d2f76a068..0c27bf842e2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -90,9 +90,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
3a25a7f1cc446b60678ed25c9d829420d6321eba
-
+
https://github.com/dotnet/arcade
- 07ee10f0dfbef32742df139f41ddc241a6b7be52
+ 469dcc0cbcba5221727c8a5b9eec4a478e24a780
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 79bb058ab02..6a59f753b5d 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 a21533fdd31..a7bbf0f1fee 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -158,10 +158,12 @@ 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
+ ${{ else }}:
+ disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
diff --git a/global.json b/global.json
index de93a435fb7..7d1b7364ff7 100644
--- a/global.json
+++ b/global.json
@@ -21,7 +21,7 @@
"rollForward": "latestPatch"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.3",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23226.4",
"Yarn.MSBuild": "1.22.10"
}
}