diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 06805544e4e..92448aa3840 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.26055.114 - 11.0.0-beta.26055.114 - 11.0.0-beta.26055.114 - 11.0.0-beta.26055.114 - 11.0.0-beta.26055.114 - 11.0.0-beta.26055.114 - 11.0.0-beta.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 - 11.0.0-alpha.1.26055.114 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-beta.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 + 11.0.0-alpha.1.26057.107 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81a8b53a7e3..9b8b8b0ef17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p And you can check these with "darc get-dependencies target-repo "winforms" --> - + - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c - + https://github.com/dotnet/dotnet - 67ecf9e85940271afc2728753b09789c64bfecf2 + 896160ec9eb0fdb1c019f698b39fa0923c9a316c diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml index b9e0143ee92..da22beb3f60 100644 --- a/eng/common/core-templates/steps/install-microbuild-impl.yml +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -18,7 +18,7 @@ parameters: type: boolean steps: -- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}: +- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}: - task: MicroBuildSigningPluginPreview@4 displayName: Install Preview MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index ac019e2d033..3ad83b8c307 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -14,8 +14,8 @@ steps: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: "Source Index: Download netsourceindex Tools" # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 64b87d0bcc3..11f81cbd40d 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -27,7 +27,7 @@ case "$os" in libssl-dev libkrb5-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then + elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio elif [ "$ID" = "amzn" ]; then diff --git a/global.json b/global.json index 541a4c3621d..9d3646e61f4 100644 --- a/global.json +++ b/global.json @@ -24,11 +24,11 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26055.114", - "Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.26055.114", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26055.114", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26057.107", + "Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.26057.107", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26057.107", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.26055.114" + "Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.26057.107" }, "native-tools": { "cmake": "latest"