From c00fe174461f47cb5b9f51a8931732de4e0c2d8d Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 20 Apr 2022 10:40:04 -0700 Subject: [PATCH 1/5] use arcade fork that targets net7.0 --- eng/Version.Details.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ccab928b212..10842f8b8beb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + https://github.com/lbussell/arcade + bc91aae4c4442102024f0f3a48c0ffa83c8ca25e - https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + https://github.com/lbussell/arcade + bc91aae4c4442102024f0f3a48c0ffa83c8ca25e - https://github.com/dotnet/arcade - 4000024394df3049886c50e54ad0a2b903221ef0 + https://github.com/lbussell/arcade + bc91aae4c4442102024f0f3a48c0ffa83c8ca25e https://github.com/dotnet/source-build-reference-packages From 379928340424279f0d23ccdaacb4af4b2e65c468 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 20 Apr 2022 12:10:14 -0700 Subject: [PATCH 2/5] update some sb infrastructure to reference net7.0 instead of 6.0 --- src/SourceBuild/tarball/content/repos/Directory.Build.props | 2 +- src/SourceBuild/tarball/content/repos/Directory.Build.targets | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index ad4f0693a339..1178b9d653ec 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -61,7 +61,7 @@ - + diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index aadaf52c8a1e..743754f7ab99 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -126,11 +126,11 @@ See https://github.com/dotnet/source-build/issues/1914 for details. --> - logger_path="%24toolset_dir"/%24%28cd "$toolset_dir" && find . -name Microsoft.DotNet.Arcade.Sdk.dll \( -regex '.*netcoreapp2.1.*' -or -regex '.*net6.0.*' \) ) + logger_path="%24toolset_dir"/%24%28cd "$toolset_dir" && find . -name Microsoft.DotNet.Arcade.Sdk.dll \( -regex '.*netcoreapp2.1.*' -or -regex '.*net7.0.*' \) ) - logger_path="%24toolset_dir"/%24%28cd "$toolset_dir" && find . -name Microsoft.DotNet.ArcadeLogging.dll \( -regex '.*netcoreapp2.1.*' -or -regex '.*net6.0.*' \) ) + logger_path="%24toolset_dir"/%24%28cd "$toolset_dir" && find . -name Microsoft.DotNet.ArcadeLogging.dll \( -regex '.*netcoreapp2.1.*' -or -regex '.*net7.0.*' \) ) From 66b31068204438e6e8a50014aa09f96bff4a2977 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 25 Apr 2022 14:22:25 -0700 Subject: [PATCH 3/5] update arcade sha --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10842f8b8beb..b515ca3b00fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -204,7 +204,7 @@ https://github.com/lbussell/arcade - bc91aae4c4442102024f0f3a48c0ffa83c8ca25e + 1db4d433a989531551345df187f02447945e2d18 https://github.com/dotnet/source-build-reference-packages From 3a73f882c03c2944307dbe6919d445498a9df44c Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 25 Apr 2022 15:10:43 -0700 Subject: [PATCH 4/5] add patches to bootstrap arcade net7.0 tfm version --- ...assemblies-in-net6.0-artifacts-direc.patch | 22 +++++++++++++++++++ ...assemblies-in-net6.0-artifacts-direc.patch | 22 +++++++++++++++++++ ...assemblies-in-net6.0-artifacts-direc.patch | 22 +++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch create mode 100644 src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch create mode 100644 src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch diff --git a/src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch b/src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch new file mode 100644 index 000000000000..d7dff17bc27f --- /dev/null +++ b/src/SourceBuild/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Mon, 25 Apr 2022 15:07:55 -0700 +Subject: [PATCH] look for arcade assemblies in net6.0 artifacts directory + +--- + eng/common/tools.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/eng/common/tools.sh b/eng/common/tools.sh +index 17f0a365..f8852dbb 100755 +--- a/eng/common/tools.sh ++++ b/eng/common/tools.sh +@@ -435,6 +435,8 @@ function MSBuild { + possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) + possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) + possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) ++ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.ArcadeLogging.dll" ) ++ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.Arcade.Sdk.dll" ) + for path in "${possiblePaths[@]}"; do + if [[ -f $path ]]; then + selectedPath=$path diff --git a/src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch b/src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch new file mode 100644 index 000000000000..d7dff17bc27f --- /dev/null +++ b/src/SourceBuild/tarball/patches/source-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Mon, 25 Apr 2022 15:07:55 -0700 +Subject: [PATCH] look for arcade assemblies in net6.0 artifacts directory + +--- + eng/common/tools.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/eng/common/tools.sh b/eng/common/tools.sh +index 17f0a365..f8852dbb 100755 +--- a/eng/common/tools.sh ++++ b/eng/common/tools.sh +@@ -435,6 +435,8 @@ function MSBuild { + possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) + possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) + possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) ++ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.ArcadeLogging.dll" ) ++ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.Arcade.Sdk.dll" ) + for path in "${possiblePaths[@]}"; do + if [[ -f $path ]]; then + selectedPath=$path diff --git a/src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch b/src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch new file mode 100644 index 000000000000..d7dff17bc27f --- /dev/null +++ b/src/SourceBuild/tarball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Logan Bussell +Date: Mon, 25 Apr 2022 15:07:55 -0700 +Subject: [PATCH] look for arcade assemblies in net6.0 artifacts directory + +--- + eng/common/tools.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/eng/common/tools.sh b/eng/common/tools.sh +index 17f0a365..f8852dbb 100755 +--- a/eng/common/tools.sh ++++ b/eng/common/tools.sh +@@ -435,6 +435,8 @@ function MSBuild { + possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) + possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) + possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) ++ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.ArcadeLogging.dll" ) ++ possiblePaths+=( "$toolset_dir/net6.0/Microsoft.DotNet.Arcade.Sdk.dll" ) + for path in "${possiblePaths[@]}"; do + if [[ -f $path ]]; then + selectedPath=$path From 00526b7f6c34fd9d2b6b28b8d9ea2983286c9d6a Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 2 May 2022 10:36:04 -0700 Subject: [PATCH 5/5] Update arcade to use TargetFrameworkForNETSDK property. --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b515ca3b00fc..f57b7cdbe786 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,17 +194,17 @@ https://github.com/lbussell/arcade - bc91aae4c4442102024f0f3a48c0ffa83c8ca25e + 08c78486a2dd4e7ee9733b4edcee696d7ef92d79 https://github.com/lbussell/arcade - bc91aae4c4442102024f0f3a48c0ffa83c8ca25e + 08c78486a2dd4e7ee9733b4edcee696d7ef92d79 https://github.com/lbussell/arcade - 1db4d433a989531551345df187f02447945e2d18 + 08c78486a2dd4e7ee9733b4edcee696d7ef92d79 https://github.com/dotnet/source-build-reference-packages