Skip to content

[main] Use arcade version that targets net7.0 #13676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lbussell wants to merge 5 commits into from
Closed

[main] Use arcade version that targets net7.0 #13676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c00fe17
use arcade fork that targets net7.0
lbussell Apr 20, 2022
3799283
update some sb infrastructure to reference net7.0 instead of 6.0
lbussell Apr 20, 2022
66b3106
update arcade sha
lbussell Apr 25, 2022
3a73f88
add patches to bootstrap arcade net7.0 tfm version
lbussell Apr 25, 2022
00526b7
Update arcade to use TargetFrameworkForNETSDK property.
lbussell May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,18 +193,18 @@
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22215.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
<Uri>https://github.com/lbussell/arcade</Uri>
<Sha>08c78486a2dd4e7ee9733b4edcee696d7ef92d79</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22215.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
<Uri>https://github.com/lbussell/arcade</Uri>
<Sha>08c78486a2dd4e7ee9733b4edcee696d7ef92d79</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22215.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
<Uri>https://github.com/lbussell/arcade</Uri>
<Sha>08c78486a2dd4e7ee9733b4edcee696d7ef92d79</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22215.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/tarball/content/repos/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<EnvironmentVariables Include="_InitializeDotNetCli=$(DotNetCliToolDir)" />
<EnvironmentVariables Include="_DotNetInstallDir=$(DotNetCliToolDir)" />
<EnvironmentVariables Include="_InitializeToolset=$(ProjectDir)Tools/source-built/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj" Condition="'$(UseBootstrapArcade)' != 'true'" />
<EnvironmentVariables Include="_OverrideArcadeInitializeBuildToolFramework=net6.0" />
<EnvironmentVariables Include="_OverrideArcadeInitializeBuildToolFramework=net7.0" />

<EnvironmentVariables Include="DotNetUseShippingVersions=true" />

Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/tarball/content/repos/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@
See https://github.com/dotnet/source-build/issues/1914 for details. -->
<PropertyGroup>
<ArcadeSdkReplacementText>
logger_path=&quot;%24toolset_dir&quot;/%24%28cd &quot;$toolset_dir&quot; &amp;&amp; find . -name Microsoft.DotNet.Arcade.Sdk.dll \( -regex &apos;.*netcoreapp2.1.*&apos; -or -regex &apos;.*net6.0.*&apos; \) )
logger_path=&quot;%24toolset_dir&quot;/%24%28cd &quot;$toolset_dir&quot; &amp;&amp; find . -name Microsoft.DotNet.Arcade.Sdk.dll \( -regex &apos;.*netcoreapp2.1.*&apos; -or -regex &apos;.*net7.0.*&apos; \) )
</ArcadeSdkReplacementText>

<ArcadeLoggingReplacementText>
logger_path=&quot;%24toolset_dir&quot;/%24%28cd &quot;$toolset_dir&quot; &amp;&amp; find . -name Microsoft.DotNet.ArcadeLogging.dll \( -regex &apos;.*netcoreapp2.1.*&apos; -or -regex &apos;.*net6.0.*&apos; \) )
logger_path=&quot;%24toolset_dir&quot;/%24%28cd &quot;$toolset_dir&quot; &amp;&amp; find . -name Microsoft.DotNet.ArcadeLogging.dll \( -regex &apos;.*netcoreapp2.1.*&apos; -or -regex &apos;.*net7.0.*&apos; \) )
</ArcadeLoggingReplacementText>

<LoggerPathReplacementText>
Expand Down
22 changes: 22 additions & 0 deletions ...ld/tarball/patches/arcade/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
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
22 changes: 22 additions & 0 deletions ...-build-reference-packages/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
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
22 changes: 22 additions & 0 deletions ...arball/patches/sourcelink/0001-look-for-arcade-assemblies-in-net6.0-artifacts-direc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Logan Bussell <loganbussell@microsoft.com>
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