[main] Add patch that retargets arcade projects to net7.0 (#13874)
* Add patch that retargets arcade projects to net7.0 * add patches to bootstrap arcade net7.0 tfm version * Replace net6.0 references with 7.0 in source build
This commit is contained in:
parent
0241501797
commit
c571d5ea85
6 changed files with 1208 additions and 3 deletions
|
@ -61,7 +61,7 @@
|
||||||
<EnvironmentVariables Include="_InitializeDotNetCli=$(DotNetCliToolDir)" />
|
<EnvironmentVariables Include="_InitializeDotNetCli=$(DotNetCliToolDir)" />
|
||||||
<EnvironmentVariables Include="_DotNetInstallDir=$(DotNetCliToolDir)" />
|
<EnvironmentVariables Include="_DotNetInstallDir=$(DotNetCliToolDir)" />
|
||||||
<EnvironmentVariables Include="_InitializeToolset=$(ProjectDir)Tools/source-built/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj" Condition="'$(UseBootstrapArcade)' != 'true'" />
|
<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" />
|
<EnvironmentVariables Include="DotNetUseShippingVersions=true" />
|
||||||
|
|
||||||
|
|
|
@ -127,11 +127,11 @@
|
||||||
See https://github.com/dotnet/source-build/issues/1914 for details. -->
|
See https://github.com/dotnet/source-build/issues/1914 for details. -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ArcadeSdkReplacementText>
|
<ArcadeSdkReplacementText>
|
||||||
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.*' \) )
|
||||||
</ArcadeSdkReplacementText>
|
</ArcadeSdkReplacementText>
|
||||||
|
|
||||||
<ArcadeLoggingReplacementText>
|
<ArcadeLoggingReplacementText>
|
||||||
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.*' \) )
|
||||||
</ArcadeLoggingReplacementText>
|
</ArcadeLoggingReplacementText>
|
||||||
|
|
||||||
<LoggerPathReplacementText>
|
<LoggerPathReplacementText>
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -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
|
|
@ -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
|
|
@ -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
|
Loading…
Add table
Add a link
Reference in a new issue