diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9842e92d4bf5dc..e0f71c7d42a231 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,73 +92,73 @@ - + 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 - 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 - 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 - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 https://github.com/dotnet/runtime-assets @@ -288,9 +288,9 @@ https://github.com/dotnet/xharness cc6611a8c5eee02e5095d9d14a8b0c509ac46e86 - + https://github.com/dotnet/arcade - 092ad720c43c79eb081a52e129399b1980f6de41 + 469dcc0cbcba5221727c8a5b9eec4a478e24a780 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 496307005ba7a8..42b2afb9149ac0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 2.5.1-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 - 8.0.0-beta.23224.5 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 2.5.1-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 + 8.0.0-beta.23226.4 6.0.0-preview.1.102 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 79bb058ab02d28..6a59f753b5d329 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 1279a8b12b1ef4..a7bbf0f1fee52a 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 5488551bd1b46c..ec4f086b8ea82a 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.3.23178.7" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23224.5", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23224.5", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23226.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23226.4", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23226.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.4.23221.1"