From 24b32064505c8332aff9ac4c1b40ab9464abeb6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 May 2021 12:11:45 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/icu build 20210518.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-preview.5.21267.1 -> To Version 6.0.0-preview.6.21268.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a910eb67683c1..2f7cc5fd2f9516 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 39013b42331e508a2fd4752a3336285ba35cb82f + 207094bcc62a9235861af5e5a6f322f2039e71c6 diff --git a/eng/Versions.props b/eng/Versions.props index f78583f8d51aaa..e42856d7c3f59d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -163,7 +163,7 @@ 6.0.100-preview.5.21267.3 - 6.0.0-preview.5.21267.1 + 6.0.0-preview.6.21268.1 9.0.1-alpha.1.21267.1 9.0.1-alpha.1.21267.1 From fc1452aff1d952f334355e561755acb0afee1355 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 May 2021 13:29:31 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210518.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21267.1 -> To Version 1.0.1-alpha.0.21268.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f7cc5fd2f9516..baea2bef0ab7d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -210,9 +210,9 @@ https://github.com/dotnet/emsdk 8c4c21d02d68241859c7c26d33316ca5c5091092 - + https://github.com/dotnet/hotreload-utils - 53cf59cd8a221289d1d138ac6a8097ea457e4252 + 990be1fda78aa97981d8e40c6393910bfcb9fcc4 diff --git a/eng/Versions.props b/eng/Versions.props index e42856d7c3f59d..e749ac2ed700a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,7 +150,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21268.1 1.0.0-prerelease.21268.1 - 1.0.1-alpha.0.21267.1 + 1.0.1-alpha.0.21268.2 2.4.1 2.4.2 1.3.0 From 1b988a7a8a7b22372181927435ac154e7f2b074c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 May 2021 12:10:27 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/xharness build 20210519.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21268.1 -> To Version 1.0.0-prerelease.21269.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5e71f900433913..8955a27ee178dc 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21268.1", + "version": "1.0.0-prerelease.21269.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index baea2bef0ab7d1..394e07ad50c42f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -178,13 +178,13 @@ https://github.com/mono/linker a621b9a630950026f5508c8089a59c0e825bd6e0 - + https://github.com/dotnet/xharness - 769fd62b966f20a44d0800cdfeecb7d86e10f348 + 31d6c34afd0d3555a7454957e25709ed8efe732b - + https://github.com/dotnet/xharness - 769fd62b966f20a44d0800cdfeecb7d86e10f348 + 31d6c34afd0d3555a7454957e25709ed8efe732b https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e749ac2ed700a7..a443487c2c5f8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,8 +148,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21268.1 - 1.0.0-prerelease.21268.1 + 1.0.0-prerelease.21269.1 + 1.0.0-prerelease.21269.1 1.0.1-alpha.0.21268.2 2.4.1 2.4.2 From d53ff0eb0e7adc6306c0990a21e5265f30f89c4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 May 2021 13:13:42 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210519.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21267.1 -> To Version 1.0.1-alpha.0.21269.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 394e07ad50c42f..c636cb22ad799d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -210,9 +210,9 @@ https://github.com/dotnet/emsdk 8c4c21d02d68241859c7c26d33316ca5c5091092 - + https://github.com/dotnet/hotreload-utils - 990be1fda78aa97981d8e40c6393910bfcb9fcc4 + 0f06e83184252cd49bce48a99bb510550653bf4f diff --git a/eng/Versions.props b/eng/Versions.props index a443487c2c5f8e..2021d98839fd1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,7 +150,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21269.1 1.0.0-prerelease.21269.1 - 1.0.1-alpha.0.21268.2 + 1.0.1-alpha.0.21269.1 2.4.1 2.4.2 1.3.0 From cb67dda5f628835be934908113bb471f2732d05d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 May 2021 12:09:51 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/xharness build 20210521.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21268.1 -> To Version 1.0.0-prerelease.21271.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8955a27ee178dc..95b0ec61f11458 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21269.1", + "version": "1.0.0-prerelease.21271.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c636cb22ad799d..301e492065de40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -178,13 +178,13 @@ https://github.com/mono/linker a621b9a630950026f5508c8089a59c0e825bd6e0 - + https://github.com/dotnet/xharness - 31d6c34afd0d3555a7454957e25709ed8efe732b + 98970876f4d21e6da5198a5c41de51ab1101089f - + https://github.com/dotnet/xharness - 31d6c34afd0d3555a7454957e25709ed8efe732b + 98970876f4d21e6da5198a5c41de51ab1101089f https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2021d98839fd1e..f36c590b6e15eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,8 +148,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21269.1 - 1.0.0-prerelease.21269.1 + 1.0.0-prerelease.21271.1 + 1.0.0-prerelease.21271.1 1.0.1-alpha.0.21269.1 2.4.1 2.4.2 From 84f410d6b69908772011f740bd07609b23966ef0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 May 2021 12:50:50 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210520.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21267.1 -> To Version 1.0.1-alpha.0.21270.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 301e492065de40..15a8c6e4105e30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -210,9 +210,9 @@ https://github.com/dotnet/emsdk 8c4c21d02d68241859c7c26d33316ca5c5091092 - + https://github.com/dotnet/hotreload-utils - 0f06e83184252cd49bce48a99bb510550653bf4f + 6a82938e7b952f014a08816e871e06741feabb14 diff --git a/eng/Versions.props b/eng/Versions.props index f36c590b6e15eb..526acb378cf94f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,7 +150,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21271.1 1.0.0-prerelease.21271.1 - 1.0.1-alpha.0.21269.1 + 1.0.1-alpha.0.21270.1 2.4.1 2.4.2 1.3.0 From 0e5ac4ca1c5675fd4319f6f8b72b6040501bde76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 May 2021 12:13:07 +0000 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/arcade build 20210521.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21264.2 -> To Version 6.0.0-beta.21271.3 --- eng/Version.Details.xml | 68 ++++++++++++------------ eng/Versions.props | 26 ++++----- eng/common/generate-locproject.ps1 | 12 ++--- eng/common/templates/job/onelocbuild.yml | 4 +- global.json | 8 +-- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15a8c6e4105e30..621825389c1bde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness 98970876f4d21e6da5198a5c41de51ab1101089f - + https://github.com/dotnet/arcade - 42de78a825b575a1ddeb73020a01fb8cd9311d09 + 50f5645789f9119c906755cb1d2549acdeb0d0b7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 526acb378cf94f..3318405f17e629 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 2.5.1-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 - 6.0.0-beta.21264.2 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 2.5.1-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 + 6.0.0-beta.21271.3 5.9.0-preview.2 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 24c00b5be98b01..de348a2e225c08 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -14,7 +14,7 @@ $ErrorActionPreference = "Stop" Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') -$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json" +$exclusionsFilePath = "$SourcesDirectory\eng\Localize\LocExclusions.json" $exclusions = @{ Exclusions = @() } if (Test-Path -Path $exclusionsFilePath) { @@ -92,14 +92,14 @@ Write-Host "LocProject.json generated:`n`n$json`n`n" Pop-Location if (!$UseCheckedInLocProjectJson) { - New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\Localize\LocProject.json" $json + New-Item "$SourcesDirectory\eng\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\eng\Localize\LocProject.json" $json } else { - New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created - Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json + New-Item "$SourcesDirectory\eng\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\eng\Localize\LocProject-generated.json" $json - if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) { + if ((Get-FileHash "$SourcesDirectory\eng\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\eng\Localize\LocProject.json").Hash) { Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." exit 1 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 958db4064cf024..2acdd5256dd83c 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -53,7 +53,7 @@ jobs: env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) inputs: - locProj: Localize/LocProject.json + locProj: eng/Localize/LocProject.json outDir: $(Build.ArtifactStagingDirectory) lclSource: ${{ parameters.LclSource }} lclPackageId: ${{ parameters.LclPackageId }} @@ -79,7 +79,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish LocProject.json inputs: - PathtoPublish: '$(Build.SourcesDirectory)/Localize/' + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' PublishLocation: Container ArtifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/global.json b/global.json index e14e03eaa98a82..f9c89139743782 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21264.2", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21264.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21271.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21271.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21271.3", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21267.1"