diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8db278337a2..955ce13838e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,25 +95,25 @@ - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 - + https://github.com/dotnet/arcade - e9fd640e1ec1890489ea66ad0f59e733448056da + 0cfaf935894a4c98ff7445c903f1b4c32990b127 diff --git a/eng/Versions.props b/eng/Versions.props index 6be6615a6cb..2871aaf6737 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 - 6.0.0-beta.21253.2 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 + 6.0.0-beta.21254.3 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 81e641a57b5..df0dfa5781c 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -78,6 +78,10 @@ __IllumosPackages+=" openssl-1.1.1e" __IllumosPackages+=" zlib-1.2.11" __IllumosPackages+=" openldap-client-2.4.49" +# ML.NET dependencies +__UbuntuPackages+=" libomp5" +__UbuntuPackages+=" libomp-dev" + __UseMirror=0 __UnprocessedBuildArgs= diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index b27d6faf303..958db4064cf 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -12,6 +12,7 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true AutoCompletePr: false + UseLfLineEndings: true UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo @@ -59,6 +60,7 @@ jobs: isCreatePrSelected: ${{ parameters.CreatePr }} ${{ if eq(parameters.CreatePr, true) }}: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: diff --git a/global.json b/global.json index 789e885cb1d..fb645c0911a 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21253.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21253.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21254.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21254.3" }, "sdk": { "version": "6.0.100-preview.1.21103.13"