From 93f50035321e3e215d81ebf906e02cca42f0936d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Aug 2021 07:49:59 +0000 Subject: [PATCH 01/15] Update dependencies from https://github.com/dotnet/arcade build 20210817.1 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , 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.21413.4 -> To Version 6.0.0-beta.21417.1 --- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 28 ++++---- .../templates/job/source-index-stage1.yml | 9 ++- global.json | 8 +-- 4 files changed, 61 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ebd09b7378e75..b49ebe5440b225 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 https://github.com/microsoft/vstest @@ -202,9 +202,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 9b7027ba718462aa6410cef61a8be5a4283e7528 + df04f7bfcf0bdd315d5468e158a8cf6696760190 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 77ca34e1f663ee..6fd57ca422e7b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,20 +55,20 @@ 1.0.0-rc.1.21404.21 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 2.5.1-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 - 6.0.0-beta.21413.4 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 + 2.5.1-beta.21417.1 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 + 6.0.0-beta.21417.1 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index e60fdbccc9ec18..b58d42364b9e77 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -35,8 +35,10 @@ jobs: packageType: sdk version: 3.1.x - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository + - task: UseDotNet@2 + displayName: Use .NET Core sdk + inputs: + useGlobalJson: true - script: | dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools @@ -44,6 +46,9 @@ jobs: echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools displayName: Download Tools + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln env: diff --git a/global.json b/global.json index e3425ab9bdd9de..6b3a87dd1d633b 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.21413.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21413.4", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21413.4", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21413.4", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21417.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21417.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21417.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21417.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" From 99b8a2d69ef576660130f23c4bb9489f827aca5a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 18 Aug 2021 09:51:17 +0200 Subject: [PATCH 02/15] Removed pinned compiler --- eng/Versions.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6fd57ca422e7b8..2bda59a7aa806b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,6 @@ release true - - 4.0.0-3.21376.12 true false false From ee0f804d9626f233a6de0f6860a2e811675253e0 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 18 Aug 2021 09:52:34 +0200 Subject: [PATCH 03/15] Update source-index-stage1.yml --- eng/common/templates/job/source-index-stage1.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b58d42364b9e77..e60fdbccc9ec18 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -35,10 +35,8 @@ jobs: packageType: sdk version: 3.1.x - - task: UseDotNet@2 - displayName: Use .NET Core sdk - inputs: - useGlobalJson: true + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository - script: | dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools @@ -46,9 +44,6 @@ jobs: echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools displayName: Download Tools - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln env: From 5c88dcbdc308533896fd9f6d318472baa50bc77e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Aug 2021 12:13:44 +0000 Subject: [PATCH 04/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210817.5 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21416.5 -> To Version 1.0.0-prerelease.21417.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b49ebe5440b225..9b0089f5023198 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,21 +206,21 @@ https://github.com/dotnet/arcade df04f7bfcf0bdd315d5468e158a8cf6696760190 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d50065944d8b41d804448a7056351481d583ad3d + 20ef9a7fd6b1d4a22cd5c60da469b3ef96121c56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d50065944d8b41d804448a7056351481d583ad3d + 20ef9a7fd6b1d4a22cd5c60da469b3ef96121c56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d50065944d8b41d804448a7056351481d583ad3d + 20ef9a7fd6b1d4a22cd5c60da469b3ef96121c56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d50065944d8b41d804448a7056351481d583ad3d + 20ef9a7fd6b1d4a22cd5c60da469b3ef96121c56 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index 2bda59a7aa806b..c2503f90270679 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,10 +127,10 @@ 6.0.0-beta.21416.1 6.0.0-beta.21416.1 - 1.0.0-prerelease.21416.5 - 1.0.0-prerelease.21416.5 - 1.0.0-prerelease.21416.5 - 1.0.0-prerelease.21416.5 + 1.0.0-prerelease.21417.5 + 1.0.0-prerelease.21417.5 + 1.0.0-prerelease.21417.5 + 1.0.0-prerelease.21417.5 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 985446af910f280917769221191b9d26da60fb69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Aug 2021 12:15:07 +0000 Subject: [PATCH 05/15] Update dependencies from https://github.com/dotnet/arcade build 20210817.1 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , 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.21413.4 -> To Version 6.0.0-beta.21417.1 --- eng/common/templates/job/source-index-stage1.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index e60fdbccc9ec18..b58d42364b9e77 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -35,8 +35,10 @@ jobs: packageType: sdk version: 3.1.x - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository + - task: UseDotNet@2 + displayName: Use .NET Core sdk + inputs: + useGlobalJson: true - script: | dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools @@ -44,6 +46,9 @@ jobs: echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools displayName: Download Tools + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln env: From fc015e247a73098dde3f48955f2ccdf585d8a0b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Aug 2021 12:22:20 +0000 Subject: [PATCH 06/15] Update dependencies from https://github.com/dotnet/runtime-assets build 20210818.1 Microsoft.DotNet.CilStrip.Sources , 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.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21416.1 -> To Version 7.0.0-beta.21418.1 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b0089f5023198..7131400535fa91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,45 +86,45 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 https://github.com/dotnet/llvm-project @@ -226,9 +226,9 @@ https://github.com/dotnet/hotreload-utils 802e79f0cf423249d54bfaafca2da4a272f4ca07 - + https://github.com/dotnet/runtime-assets - 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 + 51f281e84ff15e3b1fd3e8cc86649c666fc581b4 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index c2503f90270679..72e6772c22e18f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,17 +115,17 @@ 4.5.0 6.0.0-rc.1.21415.6 - 6.0.0-beta.21416.1 - 6.0.0-beta.21416.1 - 6.0.0-beta.21416.1 - 6.0.0-beta.21416.1 - 6.0.0-beta.21416.1 - 6.0.0-beta.21416.1 - 6.0.0-beta.21416.1 - 6.0.0-beta.21416.1 - 6.0.0-beta.21416.1 - 6.0.0-beta.21416.1 - 6.0.0-beta.21416.1 + 7.0.0-beta.21418.1 + 7.0.0-beta.21418.1 + 7.0.0-beta.21418.1 + 7.0.0-beta.21418.1 + 7.0.0-beta.21418.1 + 7.0.0-beta.21418.1 + 7.0.0-beta.21418.1 + 7.0.0-beta.21418.1 + 7.0.0-beta.21418.1 + 7.0.0-beta.21418.1 + 7.0.0-beta.21418.1 1.0.0-prerelease.21417.5 1.0.0-prerelease.21417.5 From c9f3648717aac6573a8dc6f7789597fd7387a855 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Aug 2021 12:30:53 +0000 Subject: [PATCH 07/15] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210817.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21413.1 -> To Version 1.0.2-alpha.0.21417.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 7131400535fa91..c6fd36da8d02b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -222,9 +222,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 20ef9a7fd6b1d4a22cd5c60da469b3ef96121c56 - + https://github.com/dotnet/hotreload-utils - 802e79f0cf423249d54bfaafca2da4a272f4ca07 + 1e0233c8f1c07b9bb1534bb613575f7714f6b3d3 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 72e6772c22e18f..fda8ee387f3ce9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,7 +156,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21404.1 1.0.0-prerelease.21404.1 - 1.0.2-alpha.0.21413.1 + 1.0.2-alpha.0.21417.1 2.4.1 2.4.2 1.3.0 From bf220d0028729888832583787f3fe1fdf96ce3b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Aug 2021 07:56:37 +0000 Subject: [PATCH 08/15] Update dependencies from https://github.com/dotnet/arcade build 20210818.12 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , 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.21413.4 -> To Version 6.0.0-beta.21418.12 --- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 28 ++++---- eng/common/build.sh | 1 + .../post-build/sourcelink-validation.ps1 | 17 +++-- eng/common/sdk-task.ps1 | 1 + .../templates/job/source-index-stage1.yml | 21 +++--- eng/common/tools.ps1 | 21 ++++++ eng/common/tools.sh | 7 ++ global.json | 8 +-- 9 files changed, 104 insertions(+), 72 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6fd36da8d02b0..6177ed62fb1318 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 https://github.com/microsoft/vstest @@ -202,9 +202,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - df04f7bfcf0bdd315d5468e158a8cf6696760190 + ac8b7514ca8bcac1d071a16b7a92cb52f7058871 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index fda8ee387f3ce9..89f3ab0e2cf44e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,20 +53,20 @@ 1.0.0-rc.1.21404.21 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 - 2.5.1-beta.21417.1 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 - 6.0.0-beta.21417.1 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 2.5.1-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 + 6.0.0-beta.21418.12 6.0.0-preview.1.102 diff --git a/eng/common/build.sh b/eng/common/build.sh index 55b298f16ccd1f..9d3042a943e4cf 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -187,6 +187,7 @@ function InitializeCustomToolset { } function Build { + TryLogClientIpAddress InitializeToolset InitializeCustomToolset diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 85c89861719ada..3b6fc953337362 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -17,6 +17,7 @@ $global:RepoFiles = @{} $MaxParallelJobs = 16 $MaxRetries = 5 +$RetryWaitTimeInSeconds = 30 # Wait time between check for system load $SecondsBetweenLoadChecks = 10 @@ -99,9 +100,9 @@ $ValidatePackage = { $Status = 200 $Cache = $using:RepoFiles - $totalRetries = 0 + $attempts = 0 - while ($totalRetries -lt $using:MaxRetries) { + while ($attempts -lt $using:MaxRetries) { if ( !($Cache.ContainsKey($FilePath)) ) { try { $Uri = $Link -as [System.URI] @@ -113,7 +114,7 @@ $ValidatePackage = { else { # If it's not a github link, we want to break out of the loop and not retry. $Status = 0 - $totalRetries = $using:MaxRetries + $attempts = $using:MaxRetries } } catch { @@ -123,9 +124,15 @@ $ValidatePackage = { } if ($Status -ne 200) { - $totalRetries++ + $attempts++ - if ($totalRetries -ge $using:MaxRetries) { + if ($attempts -lt $using:MaxRetries) + { + $attemptsLeft = $using:MaxRetries - $attempts + Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds" + Start-Sleep -Seconds $using:RetryWaitTimeInSeconds + } + else { if ($NumFailedLinks -eq 0) { if ($FailedFiles.Value -eq 0) { Write-Host diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b1bca63ab1d82c..7ffa3591e9ca0c 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -83,6 +83,7 @@ try { } if ($restore) { + Try-LogClientIpAddress Build 'Restore' } diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b58d42364b9e77..1cc0c29e4fdabc 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -34,29 +34,24 @@ jobs: inputs: packageType: sdk version: 3.1.x - - - task: UseDotNet@2 - displayName: Use .NET Core sdk - inputs: - useGlobalJson: true + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) - script: | - dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools - dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools - echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download 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) - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - env: - DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) displayName: Upload stage1 artifacts to source index env: BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) - DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5d526c74d518ce..e607aa43697623 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -154,6 +154,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { return $global:_DotNetInstallDir } + # In case of network error, try to log the current IP for reference + Try-LogClientIpAddress + # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism $env:DOTNET_MULTILEVEL_LOOKUP=0 @@ -872,3 +875,21 @@ if (!$disableConfigureToolsetImport) { } } } + +function Try-LogClientIpAddress() +{ + Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" + try + { + $result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing + $lines = $result.Content.Split([Environment]::NewLine) + $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" + Write-Host $socketIp + $clientIp = $lines | Select-String -Pattern "^Client IP:.*" + Write-Host $clientIp + } + catch + { + Write-Host "Unable to get this machine's effective IP address for logging: $_" + } +} diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 828119be411b3d..3c5f3a12c0a6ed 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -399,6 +399,13 @@ function StopProcesses { return 0 } +function TryLogClientIpAddress () { + echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' + if command -v curl > /dev/null; then + curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' + fi +} + function MSBuild { local args=$@ if [[ "$pipelines_log" == true ]]; then diff --git a/global.json b/global.json index 6b3a87dd1d633b..194c494ce541c0 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.21417.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21417.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21417.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21417.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21418.12", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21418.12", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21418.12", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21418.12", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" From 34a857ebcd7643a72eb26d76713466525b89ab2d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 19 Aug 2021 09:59:08 +0200 Subject: [PATCH 09/15] Add dotnet7 feeds --- NuGet.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NuGet.config b/NuGet.config index f39fab9df8ec4f..adaae358566b0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,9 @@ + + + From a7ff0f7f270023cc449031e89a08e70caad11d5b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 19 Aug 2021 09:59:36 +0200 Subject: [PATCH 10/15] Update NuGet.config --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index adaae358566b0c..f74e0c4a70248a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,8 +20,6 @@ - - From e32af9fae3cb8e4421ae676a0831320df78b1fc3 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 19 Aug 2021 10:01:26 +0200 Subject: [PATCH 11/15] Delete source-index.yml --- eng/pipelines/source-index.yml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 eng/pipelines/source-index.yml diff --git a/eng/pipelines/source-index.yml b/eng/pipelines/source-index.yml deleted file mode 100644 index 201e84d4ef3295..00000000000000 --- a/eng/pipelines/source-index.yml +++ /dev/null @@ -1,10 +0,0 @@ -jobs: -# -# Source Index Build -# -- template: /eng/common/templates/job/source-index-stage1.yml - parameters: - sourceIndexBuildCommand: build.cmd -subset libs.ref+libs.src -binarylog -os Linux -ci - preSteps: - - script: | - rename dotnet.cmd dotnet.cmd.go-away From 69b84553e52afe101c421d0cd11a55e610eef1f8 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 19 Aug 2021 10:06:20 +0200 Subject: [PATCH 12/15] Update source-index template addition --- eng/pipelines/runtime-official.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 5cb49dafbd9eea..88a3b09e1cf0f5 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -54,7 +54,9 @@ stages: # # Source Index Build # - - template: ./source-index.yml + - template: /eng/common/templates/job/source-index-stage1.yml + parameters: + sourceIndexBuildCommand: build.cmd -subset libs.ref+libs.src -binarylog -os Linux -ci # # Build CoreCLR From 7a2b17fb58c2b5a66c6a779e54c751f66e02ee0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 19 Aug 2021 12:17:28 +0200 Subject: [PATCH 13/15] Fix Cmake warning about mismatching arguments --- eng/native/configurecompiler.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index 496384c35a70ea..2ca8276a32b7d5 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -573,7 +573,7 @@ if (MSVC) set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /guard:ehcont") add_linker_flag(/guard:ehcont) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /CETCOMPAT") - endif (CLR_CMAKE_HOST_ARCH_AMD64) + endif (CLR_CMAKE_HOST_ARCH_AMD64 AND NOT CLR_CMAKE_RUNTIME_MONO) # Statically linked CRT (libcmt[d].lib, libvcruntime[d].lib and libucrt[d].lib) by default. This is done to avoid # linking in VCRUNTIME140.DLL for a simplified xcopy experience by reducing the dependency on VC REDIST. From 0a82ef6796b0c07c50b503c46cadf787a4921b00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Aug 2021 12:10:56 +0000 Subject: [PATCH 14/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210818.4 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21416.5 -> To Version 1.0.0-prerelease.21418.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6177ed62fb1318..9090f694e1c94d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,21 +206,21 @@ https://github.com/dotnet/arcade ac8b7514ca8bcac1d071a16b7a92cb52f7058871 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 20ef9a7fd6b1d4a22cd5c60da469b3ef96121c56 + 747a1f61b231b347b12175be594c4ee0f1a34996 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 20ef9a7fd6b1d4a22cd5c60da469b3ef96121c56 + 747a1f61b231b347b12175be594c4ee0f1a34996 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 20ef9a7fd6b1d4a22cd5c60da469b3ef96121c56 + 747a1f61b231b347b12175be594c4ee0f1a34996 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 20ef9a7fd6b1d4a22cd5c60da469b3ef96121c56 + 747a1f61b231b347b12175be594c4ee0f1a34996 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index 89f3ab0e2cf44e..9ceca97773814a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,10 +127,10 @@ 7.0.0-beta.21418.1 7.0.0-beta.21418.1 - 1.0.0-prerelease.21417.5 - 1.0.0-prerelease.21417.5 - 1.0.0-prerelease.21417.5 - 1.0.0-prerelease.21417.5 + 1.0.0-prerelease.21418.4 + 1.0.0-prerelease.21418.4 + 1.0.0-prerelease.21418.4 + 1.0.0-prerelease.21418.4 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 64a02c6ecf17d33886a230af02e98adff0972761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 19 Aug 2021 14:19:47 +0200 Subject: [PATCH 15/15] Fix extracting string in IJW.cmake The InitializeDotNetCli function now prints additional messages which means we need to only extract the string we want from getRefPackFolderFromSdk.ps1 --- src/tests/Interop/IJW/IJW.cmake | 8 +++++--- src/tests/Interop/IJW/getRefPackFolderFromArtifacts.ps1 | 2 +- src/tests/Interop/IJW/getRefPackFolderFromSdk.ps1 | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/tests/Interop/IJW/IJW.cmake b/src/tests/Interop/IJW/IJW.cmake index 1ba007427185c2..0e94553450b0d3 100644 --- a/src/tests/Interop/IJW/IJW.cmake +++ b/src/tests/Interop/IJW/IJW.cmake @@ -32,7 +32,7 @@ if (CLR_CMAKE_HOST_WIN32) string(REPLACE "/GR-" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") endif() - set(CLR_SDK_REF_PACK "") + set(CLR_SDK_REF_PACK_OUTPUT "") set(CLR_SDK_REF_PACK_DISCOVERY_ERROR "") set(CLR_SDK_REF_PACK_DISCOVERY_RESULT 0) @@ -40,14 +40,14 @@ if (CLR_CMAKE_HOST_WIN32) message("Using live-built ref assemblies for C++/CLI runtime tests.") execute_process( COMMAND powershell -ExecutionPolicy ByPass -NoProfile "${CMAKE_CURRENT_LIST_DIR}/getRefPackFolderFromArtifacts.ps1" - OUTPUT_VARIABLE CLR_SDK_REF_PACK + OUTPUT_VARIABLE CLR_SDK_REF_PACK_OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE CLR_SDK_REF_PACK_DISCOVERY_ERROR RESULT_VARIABLE CLR_SDK_REF_PACK_DISCOVERY_RESULT) else() execute_process( COMMAND powershell -ExecutionPolicy ByPass -NoProfile "${CMAKE_CURRENT_LIST_DIR}/getRefPackFolderFromSdk.ps1" - OUTPUT_VARIABLE CLR_SDK_REF_PACK + OUTPUT_VARIABLE CLR_SDK_REF_PACK_OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE CLR_SDK_REF_PACK_DISCOVERY_ERROR RESULT_VARIABLE CLR_SDK_REF_PACK_DISCOVERY_RESULT) @@ -57,6 +57,8 @@ if (CLR_CMAKE_HOST_WIN32) message(FATAL_ERROR "Unable to find reference assemblies: ${CLR_SDK_REF_PACK_DISCOVERY_ERROR}") endif() + string(REGEX REPLACE ".*refPackPath=(.*)" "\\1" CLR_SDK_REF_PACK ${CLR_SDK_REF_PACK_OUTPUT}) + add_compile_options(/AI${CLR_SDK_REF_PACK}) list(APPEND LINK_LIBRARIES_ADDITIONAL ijwhost) diff --git a/src/tests/Interop/IJW/getRefPackFolderFromArtifacts.ps1 b/src/tests/Interop/IJW/getRefPackFolderFromArtifacts.ps1 index aaf5e93661ae3a..98242949f440b4 100644 --- a/src/tests/Interop/IJW/getRefPackFolderFromArtifacts.ps1 +++ b/src/tests/Interop/IJW/getRefPackFolderFromArtifacts.ps1 @@ -18,4 +18,4 @@ if (-not (Test-Path $refPackPath)) return 1 } -Write-Output $refPackPath +Write-Output "refPackPath=$refPackPath" diff --git a/src/tests/Interop/IJW/getRefPackFolderFromSdk.ps1 b/src/tests/Interop/IJW/getRefPackFolderFromSdk.ps1 index bb2404d27a6265..0b94bca5e10721 100644 --- a/src/tests/Interop/IJW/getRefPackFolderFromSdk.ps1 +++ b/src/tests/Interop/IJW/getRefPackFolderFromSdk.ps1 @@ -25,4 +25,4 @@ if (-not (Test-Path $refPackPath)) return 1 } -Write-Output $refPackPath +Write-Output "refPackPath=$refPackPath"