Use net8.0 TFM when building with source-build (#2150)

* Use net8.0 TFM when building with source-build * Revert changes to sample projects
dotnet · Apr 19, 2023 · 87704ce · 87704ce
1 parent d0af5a7
commit 87704ce
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 22 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,11 +11,11 @@
  <LangVersion>10.0</LangVersion>
  </PropertyGroup>
 
- <PropertyGroup Condition="'$(DisableArcade)' == '1'">
- <TargetFrameworkForNETSDK>net7.0</TargetFrameworkForNETSDK>
+ <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+ <TargetFrameworkForNETSDK>$(NetCurrent)</TargetFrameworkForNETSDK>
  </PropertyGroup>
 
- <PropertyGroup Condition="'$(DisableArcade)' != '1'">
+ <PropertyGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
  <TargetFrameworkForNETSDK>net7.0</TargetFrameworkForNETSDK>
  </PropertyGroup>
 

diff --git a/...ystem.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/...ystem.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
  <IsPackable>false</IsPackable>
  </PropertyGroup>
 

diff --git a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj
@@ -9,7 +9,7 @@
  <UseSharedCompilation>false</UseSharedCompilation>
 
  <!-- Supported target frameworks -->
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
 
  <!-- This repo does not produce any libraries, therefore generating docs is disabled -->
  <GenerateDocumentationFile>False</GenerateDocumentationFile>

diff --git a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
  <StartupObject>AutoGeneratedProgram</StartupObject>
  <!-- Ensure that an XML doc file is emitted to supply command line help -->
  <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>net7.0</TargetFrameworks>
+ <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
  <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
  <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
  <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>

diff --git a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net7.0</TargetFrameworks>
+ <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
  <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
  <IsPackable>false</IsPackable>
  </PropertyGroup>

diff --git a/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj b/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj
@@ -2,7 +2,7 @@
 
  <PropertyGroup>
  <IsPackable>true</IsPackable>
- <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netstandard2.1;$(TargetFrameworkForNETSDK)</TargetFrameworks>
  <Description>This package provides support for using System.CommandLine with Microsoft.Extensions.Hosting.</Description>
  </PropertyGroup>
 

diff --git a/...dLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj b/...dLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>net7.0</TargetFrameworks>
+ <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
  <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
  <LangVersion>10</LangVersion>
  </PropertyGroup>

diff --git a/...ystem.CommandLine.NamingConventionBinder/System.CommandLine.NamingConventionBinder.csproj b/...ystem.CommandLine.NamingConventionBinder/System.CommandLine.NamingConventionBinder.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
  <IsPackable>true</IsPackable>
  <PackageId>System.CommandLine.NamingConventionBinder</PackageId>
- <TargetFrameworks>net7.0;netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>$(TargetFrameworkForNETSDK);netstandard2.0</TargetFrameworks>
  <LangVersion>10</LangVersion>
  <Nullable>enable</Nullable>
  <Description>This package provides command handler support for System.CommandLine performs parameter and model binding by matching option and argument names to parameter and property names.</Description>

diff --git a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
  <IsPackable>false</IsPackable>
  </PropertyGroup>
 

diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj
@@ -6,7 +6,7 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
  </PropertyGroup>
 
 </Project>
diff --git a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
  <IsPackable>true</IsPackable>
  <PackAsTool>true</PackAsTool>
  <PackageId>dotnet-suggest</PackageId>

diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>net7.0</TargetFrameworks>
+ <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
  <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
  <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>

diff --git a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj
@@ -2,13 +2,13 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
  <!-- producing more detailed log output -->
  <TrimmerSingleWarn>false</TrimmerSingleWarn>
  </PropertyGroup>
 
  <PropertyGroup>
- <SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\net7.0\System.CommandLine.dll</SystemCommandLineDllPath>
+ <SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj
@@ -2,15 +2,15 @@
 
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>enable</Nullable>
  <PublishTrimmed>true</PublishTrimmed>
  <TrimmerSingleWarn>false</TrimmerSingleWarn>
  </PropertyGroup>
 
  <PropertyGroup>
- <SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\net7.0\System.CommandLine.dll</SystemCommandLineDllPath>
+ <SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
  <IsPackable>true</IsPackable>
  <PackageId>System.CommandLine</PackageId>
- <TargetFrameworks>net7.0;netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>$(TargetFrameworkForNETSDK);netstandard2.0</TargetFrameworks>
  <Nullable>enable</Nullable>
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <LangVersion>10</LangVersion>
@@ -18,7 +18,7 @@
  <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
  </PropertyGroup>
 
- <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
+ <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkForNETSDK)'">
  <IsTrimmable>true</IsTrimmable>
  <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
  </PropertyGroup>