From d1e1314ce0a7cb5540902e0ce779453ddc5093fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 May 2021 12:09:59 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/runtime build 20210524.1 Microsoft.NETCore.DotNetHost , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Runtime.CompilerServices.Unsafe , System.Text.Json From Version 6.0.0-preview.5.21267.1 -> To Version 6.0.0-preview.6.21274.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61fa9c05f4f470..cf4fb44ca80e47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -146,33 +146,33 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - f64f12aa83d9f2253eab10551b716d2ba09371d2 + 5a26d12c41b866731a195938bf3c162ba4a04ce2 - + https://github.com/dotnet/runtime - f64f12aa83d9f2253eab10551b716d2ba09371d2 + 5a26d12c41b866731a195938bf3c162ba4a04ce2 - + https://github.com/dotnet/runtime - f64f12aa83d9f2253eab10551b716d2ba09371d2 + 5a26d12c41b866731a195938bf3c162ba4a04ce2 - + https://github.com/dotnet/runtime - f64f12aa83d9f2253eab10551b716d2ba09371d2 + 5a26d12c41b866731a195938bf3c162ba4a04ce2 - + https://github.com/dotnet/runtime - f64f12aa83d9f2253eab10551b716d2ba09371d2 + 5a26d12c41b866731a195938bf3c162ba4a04ce2 - + https://github.com/dotnet/runtime - f64f12aa83d9f2253eab10551b716d2ba09371d2 + 5a26d12c41b866731a195938bf3c162ba4a04ce2 - + https://github.com/dotnet/runtime - f64f12aa83d9f2253eab10551b716d2ba09371d2 + 5a26d12c41b866731a195938bf3c162ba4a04ce2 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 2ad9542b08d72c..95f1ad518f3fd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,11 +68,11 @@ 5.9.0-preview.2 6.0.0-alpha.1.20612.4 - 6.0.0-preview.5.21267.1 - 6.0.0-preview.5.21267.1 + 6.0.0-preview.6.21274.1 + 6.0.0-preview.6.21274.1 3.1.0 - 6.0.0-preview.5.21267.1 + 6.0.0-preview.6.21274.1 1.2.0-beta.304 4.3.0 @@ -102,14 +102,14 @@ 4.3.1 4.7.0 4.7.0 - 6.0.0-preview.5.21267.1 - 6.0.0-preview.5.21267.1 + 6.0.0-preview.6.21274.1 + 6.0.0-preview.6.21274.1 4.3.0 4.5.4 4.5.0 1.1.1 4.3.0 - 6.0.0-preview.5.21267.1 + 6.0.0-preview.6.21274.1 6.0.0-beta.21267.1 6.0.0-beta.21267.1 diff --git a/global.json b/global.json index 1f4b469162c63b..5cd5ae3edbc6c2 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21271.3", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21267.1" + "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21274.1" } } From 824ccea0f10c2d6b4879df0e72ebc25d9546dd54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 May 2021 12:13:51 +0000 Subject: [PATCH 02/14] Update dependencies from https://github.com/dotnet/arcade build 20210524.6 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.21271.3 -> To Version 6.0.0-beta.21274.6 --- eng/Version.Details.xml | 68 +++++++++---------- eng/Versions.props | 26 +++---- eng/common/templates/job/source-build.yml | 3 + .../channels/generic-internal-channel.yml | 6 ++ .../channels/generic-public-channel.yml | 6 ++ eng/common/templates/steps/source-build.yml | 7 +- global.json | 10 +-- 7 files changed, 73 insertions(+), 53 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ed48a0004fae4..258f3ddec9cf84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness 98970876f4d21e6da5198a5c41de51ab1101089f - + https://github.com/dotnet/arcade - 50f5645789f9119c906755cb1d2549acdeb0d0b7 + f22435d0f9cc367e75e1875d93ef980be1be6b79 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ddb8015902b08a..89f1cbc7e34b58 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.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 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 + 2.5.1-beta.21274.6 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 + 6.0.0-beta.21274.6 5.9.0-preview.2 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index aad41464926c17..5023d36dcb3c5b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -15,6 +15,9 @@ parameters: # nonPortable: false # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. # container: '' # A container to use. Runs in docker. # pool: {} diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 58fa9a35b8ca94..8990dfc8c87cc3 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -40,6 +40,9 @@ stages: pool: vmImage: 'windows-2019' steps: + - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." + displayName: Warn about v2 Arcade Publishing Usage + # This is necessary whenever we want to publish/restore to an AzDO private feed - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' @@ -110,6 +113,9 @@ stages: pool: vmImage: 'windows-2019' steps: + - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." + displayName: Warn about v2 Arcade Publishing Usage + - task: DownloadBuildArtifacts@0 displayName: Download Build Assets continueOnError: true diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index b50c0b3bdb8e67..3220c6a4f92ffb 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -42,6 +42,9 @@ stages: pool: vmImage: 'windows-2019' steps: + - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." + displayName: Warn about v2 Arcade Publishing Usage + - task: DownloadBuildArtifacts@0 displayName: Download Build Assets continueOnError: true @@ -109,6 +112,9 @@ stages: pool: vmImage: 'windows-2019' steps: + - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions." + displayName: Warn about v2 Arcade Publishing Usage + - task: DownloadBuildArtifacts@0 displayName: Download Build Assets continueOnError: true diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 65ee5992bf4607..e20637ed6a177d 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -34,9 +34,14 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ - --restore --build --pack --publish -bl \ + --restore --build --pack $publishArgs -bl \ $officialBuildArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ diff --git a/global.json b/global.json index 6870704d5605d5..b339df91f14fdc 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21271.3", - "Microsoft.DotNet.PackageValidation" : "1.0.0-preview.6.21274.7", - "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.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21274.6", + "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21274.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21274.6", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21274.6", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21274.1" From ddca04fa16885c8505c7c18dc6a959dd77fa1210 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 May 2021 13:05:43 +0000 Subject: [PATCH 03/14] Update dependencies from https://github.com/dotnet/icu build 20210524.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-preview.6.21268.1 -> To Version 6.0.0-preview.6.21274.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 258f3ddec9cf84..669855458feb9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 207094bcc62a9235861af5e5a6f322f2039e71c6 + 2a47d0a1051260215d42a95583ff8a331efca4c7 diff --git a/eng/Versions.props b/eng/Versions.props index 89f1cbc7e34b58..7f1bc2f12e1841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ 6.0.100-preview.5.21267.3 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-preview.6.21268.1 + 6.0.0-preview.6.21274.1 9.0.1-alpha.1.21267.1 9.0.1-alpha.1.21267.1 From 4f2b287e2eadd95c41c42344793858c08dd4bf61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 May 2021 13:06:23 +0000 Subject: [PATCH 04/14] Update dependencies from https://github.com/dotnet/xharness build 20210524.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21271.1 -> To Version 1.0.0-prerelease.21274.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 95b0ec61f11458..6040666997f7df 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21271.1", + "version": "1.0.0-prerelease.21274.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 669855458feb9d..50f2b26bf48703 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 - 98970876f4d21e6da5198a5c41de51ab1101089f + bc1c220a6d46f8bb9146e5c2f5676238468221e5 - + https://github.com/dotnet/xharness - 98970876f4d21e6da5198a5c41de51ab1101089f + bc1c220a6d46f8bb9146e5c2f5676238468221e5 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 7f1bc2f12e1841..56f88368fb8143 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.21271.1 - 1.0.0-prerelease.21271.1 + 1.0.0-prerelease.21274.1 + 1.0.0-prerelease.21274.1 1.0.1-alpha.0.21271.1 2.4.1 2.4.2 From b7d8e403743d0ca68a9ebc68843431b001dc5d27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 May 2021 13:07:00 +0000 Subject: [PATCH 05/14] Update dependencies from https://github.com/dotnet/runtime-assets build 20210525.1 System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21267.1 -> To Version 6.0.0-beta.21275.1 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50f2b26bf48703..7e270096c366de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -74,41 +74,41 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb + 3f92f2642a176248e735f61d748ace8b9dfaa56a - + https://github.com/dotnet/runtime-assets - cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb + 3f92f2642a176248e735f61d748ace8b9dfaa56a - + https://github.com/dotnet/runtime-assets - cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb + 3f92f2642a176248e735f61d748ace8b9dfaa56a - + https://github.com/dotnet/runtime-assets - cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb + 3f92f2642a176248e735f61d748ace8b9dfaa56a - + https://github.com/dotnet/runtime-assets - cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb + 3f92f2642a176248e735f61d748ace8b9dfaa56a - + https://github.com/dotnet/runtime-assets - cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb + 3f92f2642a176248e735f61d748ace8b9dfaa56a - + https://github.com/dotnet/runtime-assets - cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb + 3f92f2642a176248e735f61d748ace8b9dfaa56a - + https://github.com/dotnet/runtime-assets - cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb + 3f92f2642a176248e735f61d748ace8b9dfaa56a - + https://github.com/dotnet/runtime-assets - cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb + 3f92f2642a176248e735f61d748ace8b9dfaa56a https://github.com/dotnet/llvm-project diff --git a/eng/Versions.props b/eng/Versions.props index 56f88368fb8143..a96922d35fb9f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,15 +111,15 @@ 4.3.0 6.0.0-preview.6.21274.1 - 6.0.0-beta.21267.1 - 6.0.0-beta.21267.1 - 6.0.0-beta.21267.1 - 6.0.0-beta.21267.1 - 6.0.0-beta.21267.1 - 6.0.0-beta.21267.1 - 6.0.0-beta.21267.1 - 6.0.0-beta.21267.1 - 6.0.0-beta.21267.1 + 6.0.0-beta.21275.1 + 6.0.0-beta.21275.1 + 6.0.0-beta.21275.1 + 6.0.0-beta.21275.1 + 6.0.0-beta.21275.1 + 6.0.0-beta.21275.1 + 6.0.0-beta.21275.1 + 6.0.0-beta.21275.1 + 6.0.0-beta.21275.1 1.0.0-prerelease.21273.4 1.0.0-prerelease.21273.4 From dccab6f02f5170827ac2b09fd038b2041fa3300b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 May 2021 13:07:38 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210524.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21271.1 -> To Version 1.0.1-alpha.0.21274.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 7e270096c366de..9196b393a2b8e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -210,9 +210,9 @@ https://github.com/dotnet/emsdk 5a2a6482a34c2fe9ed4f9f97bb787ef0a7737965 - + https://github.com/dotnet/hotreload-utils - 54f4f9773ee08a6c248fc7857684cab3ab48a82d + 810637848d6bead5b85c3ec17ffe59396830fb40 diff --git a/eng/Versions.props b/eng/Versions.props index a96922d35fb9f6..e2309da5e51012 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,7 +150,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21274.1 1.0.0-prerelease.21274.1 - 1.0.1-alpha.0.21271.1 + 1.0.1-alpha.0.21274.2 2.4.1 2.4.2 1.3.0 From 6125bf0c902abe674c1e07eca6838bfc9834cf80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 May 2021 12:13:26 +0000 Subject: [PATCH 07/14] Update dependencies from https://github.com/dotnet/arcade build 20210525.5 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.21271.3 -> To Version 6.0.0-beta.21275.5 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- eng/common/sdk-task.ps1 | 4 +-- global.json | 8 ++--- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9196b393a2b8e7..b701adf2350b43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness bc1c220a6d46f8bb9146e5c2f5676238468221e5 - + https://github.com/dotnet/arcade - f22435d0f9cc367e75e1875d93ef980be1be6b79 + 579b548c545da1a9747bc5df599f38fe86d66251 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index e2309da5e51012..cb2dcdda00a8f7 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.21274.6 - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 - 2.5.1-beta.21274.6 - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 - 6.0.0-beta.21274.6 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 + 2.5.1-beta.21275.5 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 + 6.0.0-beta.21275.5 5.9.0-preview.2 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index f55c43c6f4786a..65f1d75f3d3226 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -53,7 +53,7 @@ try { } if ($task -eq "") { - Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task '" -ForegroundColor Red + Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task '" Print-Usage ExitWithExitCode 1 } @@ -78,7 +78,7 @@ try { $taskProject = GetSdkTaskProject $task if (!(Test-Path $taskProject)) { - Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" -ForegroundColor Red + Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" ExitWithExitCode 1 } diff --git a/global.json b/global.json index b339df91f14fdc..c54ee26fba5a03 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21274.6", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21275.5", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21274.6", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21274.6", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21274.6", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21275.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21275.5", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21275.5", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21274.1" From 47b04391b412da377daa69862c722cce0d46eff6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 May 2021 13:11:02 +0000 Subject: [PATCH 08/14] Update dependencies from https://github.com/dotnet/xharness build 20210525.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21271.1 -> To Version 1.0.0-prerelease.21275.2 --- .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 6040666997f7df..c4841a249d46f1 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21274.1", + "version": "1.0.0-prerelease.21275.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b701adf2350b43..469e9d76ae1184 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 - bc1c220a6d46f8bb9146e5c2f5676238468221e5 + 3a13f3100e3a3a666ef183021a9a1820f05c32f8 - + https://github.com/dotnet/xharness - bc1c220a6d46f8bb9146e5c2f5676238468221e5 + 3a13f3100e3a3a666ef183021a9a1820f05c32f8 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index cb2dcdda00a8f7..9dbf565fdb03ce 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.21274.1 - 1.0.0-prerelease.21274.1 + 1.0.0-prerelease.21275.2 + 1.0.0-prerelease.21275.2 1.0.1-alpha.0.21274.2 2.4.1 2.4.2 From 45da4034ee3d87ce059658be24808158969b869e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 May 2021 13:12:20 +0000 Subject: [PATCH 09/14] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210525.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21271.1 -> To Version 1.0.1-alpha.0.21275.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 469e9d76ae1184..b63b4629ea5e73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -210,9 +210,9 @@ https://github.com/dotnet/emsdk 5a2a6482a34c2fe9ed4f9f97bb787ef0a7737965 - + https://github.com/dotnet/hotreload-utils - 810637848d6bead5b85c3ec17ffe59396830fb40 + bb92217f2926b4629b9cda6f58d779ea5ba4092c diff --git a/eng/Versions.props b/eng/Versions.props index 9dbf565fdb03ce..939d99a7faa7ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,7 +150,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21275.2 1.0.0-prerelease.21275.2 - 1.0.1-alpha.0.21274.2 + 1.0.1-alpha.0.21275.1 2.4.1 2.4.2 1.3.0 From bdcfb64bb8caa78a4a21b71340eb5c1c6d0db7de Mon Sep 17 00:00:00 2001 From: David Wrighton Date: Wed, 26 May 2021 17:16:17 -0700 Subject: [PATCH 10/14] Make runtime build compatible with upcoming Arcade change, in wait for a matching sdk when this change will be removed --- .../Microsoft.NETCore.App.Runtime.props | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props index 19b7ac9409546b..2489544cad8b59 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props @@ -144,4 +144,17 @@ true + + + + + + tools + + + + + + From 9233970dff0e285659c5d3133fbd9a3a08530d61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 May 2021 12:13:40 +0000 Subject: [PATCH 11/14] Update dependencies from https://github.com/dotnet/arcade build 20210526.5 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.21271.3 -> To Version 6.0.0-beta.21276.5 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- global.json | 8 ++--- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbb3dac3c4b643..ed0d445375f209 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness 3a13f3100e3a3a666ef183021a9a1820f05c32f8 - + https://github.com/dotnet/arcade - 579b548c545da1a9747bc5df599f38fe86d66251 + c2a8af3f309fc27402fa9c18bac6df757a9c41ed https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index abab9c0c027e22..ca1a3d13710ed3 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.21275.5 - 6.0.0-beta.21275.5 - 6.0.0-beta.21275.5 - 6.0.0-beta.21275.5 - 6.0.0-beta.21275.5 - 6.0.0-beta.21275.5 - 2.5.1-beta.21275.5 - 6.0.0-beta.21275.5 - 6.0.0-beta.21275.5 - 6.0.0-beta.21275.5 - 6.0.0-beta.21275.5 - 6.0.0-beta.21275.5 - 6.0.0-beta.21275.5 + 6.0.0-beta.21276.5 + 6.0.0-beta.21276.5 + 6.0.0-beta.21276.5 + 6.0.0-beta.21276.5 + 6.0.0-beta.21276.5 + 6.0.0-beta.21276.5 + 2.5.1-beta.21276.5 + 6.0.0-beta.21276.5 + 6.0.0-beta.21276.5 + 6.0.0-beta.21276.5 + 6.0.0-beta.21276.5 + 6.0.0-beta.21276.5 + 6.0.0-beta.21276.5 5.9.0-preview.2 diff --git a/global.json b/global.json index c54ee26fba5a03..d88dc48daf8daa 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21275.5", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21276.5", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21275.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21275.5", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21275.5", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21276.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21276.5", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21276.5", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21274.1" From 1965b984b01a64f8b5ef3329228aedbf588f8846 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 May 2021 13:16:21 +0000 Subject: [PATCH 12/14] Update dependencies from https://github.com/dotnet/xharness build 20210526.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21271.1 -> To Version 1.0.0-prerelease.21276.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 c4841a249d46f1..0f31b2b59a7623 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21275.2", + "version": "1.0.0-prerelease.21276.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed0d445375f209..9561830ea129f6 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 - 3a13f3100e3a3a666ef183021a9a1820f05c32f8 + fd2a4a5bb1f3e81f909cd8999eb43a1e8ff4848e - + https://github.com/dotnet/xharness - 3a13f3100e3a3a666ef183021a9a1820f05c32f8 + fd2a4a5bb1f3e81f909cd8999eb43a1e8ff4848e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index ca1a3d13710ed3..457fd96d73c7be 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.21275.2 - 1.0.0-prerelease.21275.2 + 1.0.0-prerelease.21276.1 + 1.0.0-prerelease.21276.1 1.0.1-alpha.0.21275.1 2.4.1 2.4.2 From 8dc8e4377093cf758ecbf1b5305bd4a28f68cfa8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 May 2021 13:17:34 +0000 Subject: [PATCH 13/14] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210526.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21271.1 -> To Version 1.0.1-alpha.0.21276.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 9561830ea129f6..a8aa8c1ea7bed2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -210,9 +210,9 @@ https://github.com/dotnet/emsdk 5a2a6482a34c2fe9ed4f9f97bb787ef0a7737965 - + https://github.com/dotnet/hotreload-utils - bb92217f2926b4629b9cda6f58d779ea5ba4092c + 57f47db25bed1a6d79444ab839cf7e364ea96716 diff --git a/eng/Versions.props b/eng/Versions.props index 457fd96d73c7be..3cc1cce3758025 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,7 +150,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21276.1 1.0.0-prerelease.21276.1 - 1.0.1-alpha.0.21275.1 + 1.0.1-alpha.0.21276.1 2.4.1 2.4.2 1.3.0 From c27385b48723207e7b266ea0d9e6916220fd20f6 Mon Sep 17 00:00:00 2001 From: David Wrighton Date: Thu, 27 May 2021 11:48:48 -0700 Subject: [PATCH 14/14] Adjust R2R compilation to only consider for R2R files with the .exe and .dll file extension --- src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs b/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs index 7004f1d4259904..a664a967d88931 100644 --- a/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs +++ b/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs @@ -341,6 +341,12 @@ private static bool IsNonCompositeReadyToRunImage(PEReader peReader) private static Eligibility GetInputFileEligibility(ITaskItem file, bool compositeCompile, HashSet exclusionSet, HashSet r2rCompositeExclusionSet) { // Check to see if this is a valid ILOnly image that we can compile + if (!file.ItemSpec.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) && !file.ItemSpec.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) + { + // If it isn't a dll or an exe, it certainly isn't a valid ILOnly image for compilation + return Eligibility.None; + } + using (FileStream fs = new FileStream(file.ItemSpec, FileMode.Open, FileAccess.Read)) { try