From 8ce220b8e71dd37430607eb133346812dc3c44b1 Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Mon, 2 Jan 2023 15:10:16 +0100 Subject: [PATCH 01/11] add pre-build detection --- NuGet.config | 1 + azure-pipelines.yml | 2 +- eng/SourceBuildPrebuiltBaseline.xml | 25 +++++++++++++++++-- eng/Version.Details.xml | 24 ++++++++++++++++++ .../Microsoft.SourceLink.Tools.Package.csproj | 1 + .../dotnet-sourcelink.csproj | 1 + 6 files changed, 51 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7ba2e9d2..eacb0a1c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2faf5574..e34f76c3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -145,7 +145,7 @@ stages: steps: - checkout: self clean: true - - script: eng/cibuild.sh --configuration $(_BuildConfig) --prepareMachine + - script: eng/cibuild.sh --configuration $(_BuildConfig) --prepareMachine /p:SourceBuildIntermediateNupkgRid='linux-x64' displayName: Build and Test - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index c1b6dfbf..35c3456d 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,5 +1,26 @@ + - + - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66ac77b0..12370b8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,17 +12,41 @@ https://github.com/dotnet/command-line-api 209b724a3c843253d3071e8348c353b297b0b8b5 + + https://github.com/dotnet/runtime + a6f84d42529494b3539684ed993fa554281215b7 + + + + https://github.com/dotnet/msbuild + a6f6699d1f70bf79db82030938d2c5e52d1e4d2e + + + + https://github.com/dotnet/msbuild + a6f6699d1f70bf79db82030938d2c5e52d1e4d2e https://github.com/dotnet/arcade 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 + https://github.com/dotnet/source-build-reference-packages d76c30028584fb1d02d9b27dc48e65ad87f4ecfe + + https://github.com/dotnet/sourcelink + d047202874ad79d72c75b6354c0f8a9a12d1b054 + + + + https://github.com/dotnet/xliff-tasks + c9b8a539c59158e189e4a6b9ebcf29b748dcb843 + + diff --git a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj index 9584bb98..a7fad55c 100644 --- a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj +++ b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj @@ -4,6 +4,7 @@ false none false + true true diff --git a/src/dotnet-sourcelink/dotnet-sourcelink.csproj b/src/dotnet-sourcelink/dotnet-sourcelink.csproj index 42f00bbb..a21d0b61 100644 --- a/src/dotnet-sourcelink/dotnet-sourcelink.csproj +++ b/src/dotnet-sourcelink/dotnet-sourcelink.csproj @@ -4,6 +4,7 @@ $(NetCurrent) Major + true true From bcc159d34fb241eb5c974962605391526098fcfe Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Tue, 3 Jan 2023 13:55:54 +0100 Subject: [PATCH 02/11] downgrade MSBuild to 16.8 --- eng/SourceBuildPrebuiltBaseline.xml | 20 -------------------- eng/Version.Details.xml | 6 +++--- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 35c3456d..ab9318d1 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -3,24 +3,4 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12370b8f..ba3fe3a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,12 +17,12 @@ a6f84d42529494b3539684ed993fa554281215b7 - + + https://github.com/dotnet/msbuild a6f6699d1f70bf79db82030938d2c5e52d1e4d2e - - + https://github.com/dotnet/msbuild a6f6699d1f70bf79db82030938d2c5e52d1e4d2e From 583813e70a04de1f4061e72ac57490680d2b2b29 Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Tue, 10 Jan 2023 13:22:49 +0100 Subject: [PATCH 03/11] add clarifying comments; move source-build RID prop in CI --- azure-pipelines.yml | 2 +- eng/cibuild.sh | 3 ++- src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e34f76c3..2faf5574 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -145,7 +145,7 @@ stages: steps: - checkout: self clean: true - - script: eng/cibuild.sh --configuration $(_BuildConfig) --prepareMachine /p:SourceBuildIntermediateNupkgRid='linux-x64' + - script: eng/cibuild.sh --configuration $(_BuildConfig) --prepareMachine displayName: Build and Test - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/cibuild.sh b/eng/cibuild.sh index cf8a5cd5..45aab5bf 100755 --- a/eng/cibuild.sh +++ b/eng/cibuild.sh @@ -13,4 +13,5 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci $@ +# SourceBuildIntermediateNupkgRid indicates to source-build that portable intermediates should be restored (required for runtime dependency) +. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci /p:SourceBuildIntermediateNupkgRid="linux-x64" "$@" diff --git a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj index a7fad55c..ea1d6938 100644 --- a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj +++ b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj @@ -4,7 +4,8 @@ false none false - true + + true true From 8218b06c491fe07e8fa0edb7f38aa8932bec272b Mon Sep 17 00:00:00 2001 From: "Oleksandr.Didyk" Date: Wed, 11 Jan 2023 11:43:50 +0100 Subject: [PATCH 04/11] fixup sbrp definition; fixup invalid msbuild version prop --- eng/Version.Details.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba3fe3a3..f365df75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,6 +26,11 @@ https://github.com/dotnet/msbuild a6f6699d1f70bf79db82030938d2c5e52d1e4d2e + + https://github.com/dotnet/source-build-reference-packages + a7d9aec195d309a8d25022553a43561441a599a8 + + From db472d5fb6b279a28b03d859b5272836a002ad83 Mon Sep 17 00:00:00 2001 From: Oleksandr Didyk Date: Tue, 11 Apr 2023 10:49:40 +0000 Subject: [PATCH 05/11] update changes made --- NuGet.config | 4 +++- eng/SourceBuildPrebuiltBaseline.xml | 7 +++++- eng/Version.Details.xml | 22 +++++++++++-------- .../Microsoft.SourceLink.Tools.Package.csproj | 2 -- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index eacb0a1c..ff54fef9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,8 +5,10 @@ - + + + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index ab9318d1..51e9bc32 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,6 +1,11 @@ - + + + + + + \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f365df75..5585d66e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,12 +12,16 @@ https://github.com/dotnet/command-line-api 209b724a3c843253d3071e8348c353b297b0b8b5 - + + + https://github.com/dotnet/command-line-api + 209b724a3c843253d3071e8348c353b297b0b8b5 + + https://github.com/dotnet/runtime - a6f84d42529494b3539684ed993fa554281215b7 + 7ebb8886920be7ed2e5f1c8784e4cea516d118d7 - https://github.com/dotnet/msbuild a6f6699d1f70bf79db82030938d2c5e52d1e4d2e @@ -26,9 +30,9 @@ https://github.com/dotnet/msbuild a6f6699d1f70bf79db82030938d2c5e52d1e4d2e - + https://github.com/dotnet/source-build-reference-packages - a7d9aec195d309a8d25022553a43561441a599a8 + c053ca210364dfa4904006b811249f14743e853e @@ -43,14 +47,14 @@ d76c30028584fb1d02d9b27dc48e65ad87f4ecfe - + https://github.com/dotnet/sourcelink - d047202874ad79d72c75b6354c0f8a9a12d1b054 + 955e79b0b955a9f57078b2399a782fcde44a9261 - + https://github.com/dotnet/xliff-tasks - c9b8a539c59158e189e4a6b9ebcf29b748dcb843 + 69157952aba0f08738249af4454b045b553614c4 diff --git a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj index ea1d6938..9584bb98 100644 --- a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj +++ b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj @@ -4,8 +4,6 @@ false none false - - true true From 05bc0df6b48d66a8eec2f6cce628a9679cc0bb51 Mon Sep 17 00:00:00 2001 From: Oleksandr Didyk Date: Tue, 11 Apr 2023 10:52:31 +0000 Subject: [PATCH 06/11] remove redundant CI arg --- eng/cibuild.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/cibuild.sh b/eng/cibuild.sh index 45aab5bf..533d14c1 100755 --- a/eng/cibuild.sh +++ b/eng/cibuild.sh @@ -13,5 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -# SourceBuildIntermediateNupkgRid indicates to source-build that portable intermediates should be restored (required for runtime dependency) -. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci /p:SourceBuildIntermediateNupkgRid="linux-x64" "$@" +. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci "$@" From 89694bc8336961cb5957aa03e79f3f0c9eba204f Mon Sep 17 00:00:00 2001 From: Oleksandr Didyk Date: Thu, 13 Apr 2023 09:33:50 +0000 Subject: [PATCH 07/11] add missing sb attribute; bump arcade dep versions --- eng/Version.Details.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5585d66e..bf371583 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,10 @@ - + https://github.com/dotnet/command-line-api 209b724a3c843253d3071e8348c353b297b0b8b5 + https://github.com/dotnet/command-line-api @@ -47,14 +48,14 @@ d76c30028584fb1d02d9b27dc48e65ad87f4ecfe - + https://github.com/dotnet/sourcelink - 955e79b0b955a9f57078b2399a782fcde44a9261 + 759f344923a0859f3fae83431d0ba1cc62108118 - + https://github.com/dotnet/xliff-tasks - 69157952aba0f08738249af4454b045b553614c4 + 519d565b45c46ac452fe5a77ab63295138992e07 From b8fef1f5f378c11aa75bf6cddef961958b3e8741 Mon Sep 17 00:00:00 2001 From: Oleksandr Didyk Date: Thu, 4 May 2023 14:27:15 +0000 Subject: [PATCH 08/11] remove obsolete pre-built exclusions; fixup dep versions --- NuGet.config | 2 +- eng/SourceBuildPrebuiltBaseline.xml | 5 ----- eng/Version.Details.xml | 21 ++++----------------- eng/cibuild.sh | 2 +- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index ff54fef9..7b5adef9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,9 +6,9 @@ + - diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 51e9bc32..b820875a 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -3,9 +3,4 @@ - - - - - \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf371583..78069ccc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,7 +1,7 @@ - + https://github.com/dotnet/command-line-api 209b724a3c843253d3071e8348c353b297b0b8b5 @@ -18,20 +18,7 @@ https://github.com/dotnet/command-line-api 209b724a3c843253d3071e8348c353b297b0b8b5 - - https://github.com/dotnet/runtime - 7ebb8886920be7ed2e5f1c8784e4cea516d118d7 - - - - https://github.com/dotnet/msbuild - a6f6699d1f70bf79db82030938d2c5e52d1e4d2e - - - https://github.com/dotnet/msbuild - a6f6699d1f70bf79db82030938d2c5e52d1e4d2e - - + https://github.com/dotnet/source-build-reference-packages c053ca210364dfa4904006b811249f14743e853e @@ -48,12 +35,12 @@ d76c30028584fb1d02d9b27dc48e65ad87f4ecfe - + https://github.com/dotnet/sourcelink 759f344923a0859f3fae83431d0ba1cc62108118 - + https://github.com/dotnet/xliff-tasks 519d565b45c46ac452fe5a77ab63295138992e07 diff --git a/eng/cibuild.sh b/eng/cibuild.sh index 533d14c1..cf8a5cd5 100755 --- a/eng/cibuild.sh +++ b/eng/cibuild.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci "$@" +. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci $@ From 81716f5bb00abd792edaee61bfe380c8b8dc3001 Mon Sep 17 00:00:00 2001 From: Oleksandr Didyk Date: Thu, 4 May 2023 18:21:13 +0000 Subject: [PATCH 09/11] remove obsolete nuget source; fixup sourcebuild metadata --- NuGet.config | 3 +-- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7b5adef9..d8bb4177 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78069ccc..084dadf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,7 +4,6 @@ https://github.com/dotnet/command-line-api 209b724a3c843253d3071e8348c353b297b0b8b5 - https://github.com/dotnet/command-line-api @@ -17,6 +16,7 @@ https://github.com/dotnet/command-line-api 209b724a3c843253d3071e8348c353b297b0b8b5 + https://github.com/dotnet/source-build-reference-packages From c6ba83365c002673b8e7d7e74c13b3dc4956ffbf Mon Sep 17 00:00:00 2001 From: Oleksandr Didyk Date: Mon, 15 May 2023 16:13:24 +0000 Subject: [PATCH 10/11] fixup duplicate dependency declaration --- eng/Version.Details.xml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 084dadf7..7b828538 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ 209b724a3c843253d3071e8348c353b297b0b8b5 - + https://github.com/dotnet/source-build-reference-packages - c053ca210364dfa4904006b811249f14743e853e + d76c30028584fb1d02d9b27dc48e65ad87f4ecfe @@ -30,17 +30,12 @@ 1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4 - - https://github.com/dotnet/source-build-reference-packages - d76c30028584fb1d02d9b27dc48e65ad87f4ecfe - - https://github.com/dotnet/sourcelink 759f344923a0859f3fae83431d0ba1cc62108118 - + https://github.com/dotnet/xliff-tasks 519d565b45c46ac452fe5a77ab63295138992e07 From 0b09480f4d192fd608a0c1073e0324535ec2931e Mon Sep 17 00:00:00 2001 From: Oleksandr Didyk Date: Tue, 16 May 2023 17:07:44 +0000 Subject: [PATCH 11/11] add explanation for dotnet-sourcelink exclusion --- src/dotnet-sourcelink/dotnet-sourcelink.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dotnet-sourcelink/dotnet-sourcelink.csproj b/src/dotnet-sourcelink/dotnet-sourcelink.csproj index a21d0b61..6e0bd5f0 100644 --- a/src/dotnet-sourcelink/dotnet-sourcelink.csproj +++ b/src/dotnet-sourcelink/dotnet-sourcelink.csproj @@ -4,6 +4,7 @@ $(NetCurrent) Major + true