Resolve source-build patch conflicts
This commit is contained in:
parent
66cf442402
commit
5be2aa75c6
3 changed files with 1 additions and 398 deletions
|
@ -1,268 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Logan Bussell <loganbussell@microsoft.com>
|
|
||||||
Date: Tue, 19 Jul 2022 14:47:28 -0700
|
|
||||||
Subject: [PATCH] Update projects to net7.0 TFM with shared property, Only enable trimming for .NET Core
|
|
||||||
|
|
||||||
Backport PR: https://github.com/dotnet/command-line-api/pull/1803
|
|
||||||
---
|
|
||||||
Directory.Build.props | 1 +
|
|
||||||
global.json | 7 ++++---
|
|
||||||
.../System.CommandLine.ApiCompatibility.Tests.csproj | 2 +-
|
|
||||||
.../System.CommandLine.Benchmarks.csproj | 4 ++--
|
|
||||||
.../System.CommandLine.DragonFruit.Tests.csproj | 2 +-
|
|
||||||
.../System.CommandLine.Generator.Tests.csproj | 2 +-
|
|
||||||
.../System.CommandLine.Hosting.Tests.csproj | 2 +-
|
|
||||||
.../System.CommandLine.NamingConventionBinder.Tests.csproj | 2 +-
|
|
||||||
.../System.CommandLine.Rendering.Tests.csproj | 2 +-
|
|
||||||
.../EndToEndTestApp/EndToEndTestApp.csproj | 2 +-
|
|
||||||
.../dotnet-suggest.Tests.csproj | 2 +-
|
|
||||||
src/System.CommandLine.Suggest/dotnet-suggest.csproj | 2 +-
|
|
||||||
.../System.CommandLine.Tests.csproj | 2 +-
|
|
||||||
.../TestApps/NativeAOT/NativeAOT.csproj | 4 ++--
|
|
||||||
.../TestApps/Trimming/Trimming.csproj | 4 ++--
|
|
||||||
src/System.CommandLine/System.CommandLine.csproj | 7 +++++--
|
|
||||||
16 files changed, 26 insertions(+), 21 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Directory.Build.props b/Directory.Build.props
|
|
||||||
index c0c5f79a..901c57c7 100644
|
|
||||||
--- a/Directory.Build.props
|
|
||||||
+++ b/Directory.Build.props
|
|
||||||
@@ -9,6 +9,7 @@
|
|
||||||
<NoWarn Condition=" '$(DotnetBuildFromSource)' == 'true' ">$(NoWarn);CS8714;CS8765;CS8600;CS8601;CS8602;CS8603;CS8604</NoWarn>
|
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
|
||||||
<LangVersion>10.0</LangVersion>
|
|
||||||
+ <TargetFrameworkForNETSDK>net7.0</TargetFrameworkForNETSDK>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
diff --git a/global.json b/global.json
|
|
||||||
index 1c6fd268..f5bec611 100644
|
|
||||||
--- a/global.json
|
|
||||||
+++ b/global.json
|
|
||||||
@@ -1,12 +1,13 @@
|
|
||||||
{
|
|
||||||
"tools": {
|
|
||||||
- "dotnet": "6.0.100",
|
|
||||||
+ "dotnet": "7.0.100-preview.6.22352.1",
|
|
||||||
"runtimes": {
|
|
||||||
"dotnet": [
|
|
||||||
- "5.0.10"
|
|
||||||
+ "5.0.17",
|
|
||||||
+ "6.0.7"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
- "xcopy-msbuild": "16.10.0-preview2"
|
|
||||||
+ "xcopy-msbuild": "17.1.0"
|
|
||||||
},
|
|
||||||
"msbuild-sdks": {
|
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22168.2"
|
|
||||||
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
|
|
||||||
index 30bcd139..4cc48fde 100644
|
|
||||||
--- a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
|
|
||||||
+++ b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
- <TargetFramework>net6.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
|
|
||||||
index e54aabc4..185ba62a 100644
|
|
||||||
--- a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj
|
|
||||||
+++ b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj
|
|
||||||
@@ -9,8 +9,8 @@
|
|
||||||
<UseSharedCompilation>false</UseSharedCompilation>
|
|
||||||
|
|
||||||
<!-- Supported target frameworks -->
|
|
||||||
- <TargetFrameworks Condition="'$(TargetFrameworks)' == '' AND '$(OS)' == 'Windows_NT'">net461;net5.0;net6.0;</TargetFrameworks>
|
|
||||||
- <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net5.0;net6.0;</TargetFrameworks>
|
|
||||||
+ <TargetFrameworks Condition="'$(TargetFrameworks)' == '' AND '$(OS)' == 'Windows_NT'">net461;net5.0;net6.0;net7.0</TargetFrameworks>
|
|
||||||
+ <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net5.0;net6.0;net7.0</TargetFrameworks>
|
|
||||||
|
|
||||||
<!-- 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
|
|
||||||
index 7eee0b38..e504f7e8 100644
|
|
||||||
--- 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>net6.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
|
|
||||||
index a423eb1e..20f0f410 100644
|
|
||||||
--- 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>net6.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
|
|
||||||
index 328b4e12..8e2cd6ea 100644
|
|
||||||
--- 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>net6.0</TargetFrameworks>
|
|
||||||
+ <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
|
|
||||||
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
|
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
</PropertyGroup>
|
|
||||||
diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj
|
|
||||||
index 43eb7c29..7bff1796 100644
|
|
||||||
--- a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj
|
|
||||||
+++ b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
<PropertyGroup>
|
|
||||||
- <TargetFrameworks>net6.0</TargetFrameworks>
|
|
||||||
+ <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
|
|
||||||
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
|
|
||||||
<LangVersion>10</LangVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
diff --git a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj
|
|
||||||
index 1c116508..afd6dc6a 100644
|
|
||||||
--- 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>net6.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
|
|
||||||
index 9a3eb54d..76add0d5 100644
|
|
||||||
--- 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>net6.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
|
|
||||||
index da6abedf..f1711a10 100644
|
|
||||||
--- 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>net6.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
|
|
||||||
index fd825008..ce4bda1d 100644
|
|
||||||
--- 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>net6.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
|
|
||||||
index c1988ec4..44b5c9fc 100644
|
|
||||||
--- 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>net6.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
|
|
||||||
index b0036ed0..cc306fea 100644
|
|
||||||
--- 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>net6.0</TargetFramework>
|
|
||||||
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
|
|
||||||
<!-- producing more detailed log output -->
|
|
||||||
<TrimmerSingleWarn>false</TrimmerSingleWarn>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
- <SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\net6.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
|
|
||||||
index 6dcf8892..615b0764 100644
|
|
||||||
--- a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj
|
|
||||||
+++ b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<OutputType>Exe</OutputType>
|
|
||||||
- <TargetFramework>net6.0</TargetFramework>
|
|
||||||
+ <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<PublishTrimmed>true</PublishTrimmed>
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
- <SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\net6.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
|
|
||||||
index 424053a6..37115d70 100644
|
|
||||||
--- 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>net6.0;netstandard2.0</TargetFrameworks>
|
|
||||||
+ <TargetFrameworks>$(TargetFrameworkForNETSDK);netstandard2.0</TargetFrameworks>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
|
||||||
<LangVersion>10</LangVersion>
|
|
||||||
@@ -15,9 +15,12 @@
|
|
||||||
* Test and debug support
|
|
||||||
</Description>
|
|
||||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
|
||||||
+ <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
|
|
||||||
+ </PropertyGroup>
|
|
||||||
+
|
|
||||||
+ <PropertyGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkForNETSDK)'">
|
|
||||||
<IsTrimmable>true</IsTrimmable>
|
|
||||||
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
|
|
||||||
- <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
|
|
@ -1,129 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Logan Bussell <loganbussell@microsoft.com>
|
|
||||||
Date: Mon, 1 Aug 2022 15:31:27 -0700
|
|
||||||
Subject: [PATCH] Update TFM to net7.0 for source-build
|
|
||||||
|
|
||||||
---
|
|
||||||
build/common.project.props | 6 +++---
|
|
||||||
build/common.targets | 2 +-
|
|
||||||
eng/source-build/global.json | 2 +-
|
|
||||||
.../NuGet.Configuration/NuGet.Configuration.csproj | 2 +-
|
|
||||||
src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs | 2 ++
|
|
||||||
src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs | 6 ++++++
|
|
||||||
.../NuGet.PackageManagement/NuGet.PackageManagement.csproj | 2 +-
|
|
||||||
7 files changed, 15 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/build/common.project.props b/build/common.project.props
|
|
||||||
index 93287fdde..059adfa51 100644
|
|
||||||
--- a/build/common.project.props
|
|
||||||
+++ b/build/common.project.props
|
|
||||||
@@ -14,18 +14,18 @@
|
|
||||||
<NETFXTargetFrameworkVersion>v4.7.2</NETFXTargetFrameworkVersion>
|
|
||||||
<NETFXTargetFramework>net472</NETFXTargetFramework>
|
|
||||||
<NETCoreTargetFramework>netcoreapp3.1</NETCoreTargetFramework>
|
|
||||||
- <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</NETCoreTargetFramework>
|
|
||||||
+ <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net7.0</NETCoreTargetFramework>
|
|
||||||
<NETCoreTestTargetFramework>net6.0</NETCoreTestTargetFramework>
|
|
||||||
<NetStandardVersion>netstandard2.0</NetStandardVersion>
|
|
||||||
<TargetFrameworksExe>$(NETFXTargetFramework);$(NETCoreTargetFramework)</TargetFrameworksExe>
|
|
||||||
<TargetFrameworksExe Condition="'$(IsXPlat)' == 'true'">$(NETCoreTargetFramework)</TargetFrameworksExe>
|
|
||||||
<TargetFrameworksExeForSigning>$(TargetFrameworksExe);netcoreapp5.0</TargetFrameworksExeForSigning>
|
|
||||||
<TargetFrameworksExeForSigning Condition=" '$(IsXPlat)' == 'true' ">$(NETCoreTargetFramework);netcoreapp5.0</TargetFrameworksExeForSigning>
|
|
||||||
- <TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe);net6.0</TargetFrameworksExeForSigning>
|
|
||||||
+ <TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe);net7.0</TargetFrameworksExeForSigning>
|
|
||||||
<TargetFrameworksLibrary>$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
|
|
||||||
<TargetFrameworksLibrary Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework);$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
|
|
||||||
<TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);netcoreapp5.0</TargetFrameworksLibraryForSigning>
|
|
||||||
- <TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksLibrary);net6.0</TargetFrameworksLibraryForSigning>
|
|
||||||
+ <TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksLibrary);net7.0</TargetFrameworksLibraryForSigning>
|
|
||||||
<TargetFrameworksLibraryForCrossVerificationTests>$(NETFXTargetFramework);net6.0</TargetFrameworksLibraryForCrossVerificationTests>
|
|
||||||
<RepositoryRootDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\</RepositoryRootDirectory>
|
|
||||||
<BuildCommonDirectory>$(RepositoryRootDirectory)build\</BuildCommonDirectory>
|
|
||||||
diff --git a/build/common.targets b/build/common.targets
|
|
||||||
index 69c72499b..01ec1b568 100644
|
|
||||||
--- a/build/common.targets
|
|
||||||
+++ b/build/common.targets
|
|
||||||
@@ -6,7 +6,7 @@
|
|
||||||
<IsDesktop>true</IsDesktop>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
- <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) OR $(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('net6')) ">
|
|
||||||
+ <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) OR $(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('net6')) OR $(TargetFramework.StartsWith('net7')) ">
|
|
||||||
<DefineConstants>$(DefineConstants);IS_CORECLR</DefineConstants>
|
|
||||||
<IsCore>true</IsCore>
|
|
||||||
</PropertyGroup>
|
|
||||||
diff --git a/eng/source-build/global.json b/eng/source-build/global.json
|
|
||||||
index 2b9604572..d4d319b20 100644
|
|
||||||
--- a/eng/source-build/global.json
|
|
||||||
+++ b/eng/source-build/global.json
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
{
|
|
||||||
"tools": {
|
|
||||||
- "dotnet": "6.0.100-preview.7.21379.14"
|
|
||||||
+ "dotnet": "7.0.100-preview.6.22352.1"
|
|
||||||
},
|
|
||||||
"msbuild-sdks": {
|
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21309.7"
|
|
||||||
diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
|
|
||||||
index 53e500248..5edbc8281 100644
|
|
||||||
--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
|
|
||||||
+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
|
|
||||||
@@ -29,7 +29,7 @@
|
|
||||||
<Reference Include="System.Xml.Linq" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
- <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net6.0' ">
|
|
||||||
+ <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' ">
|
|
||||||
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
diff --git a/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs b/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs
|
|
||||||
index 6ec51bdd2..4839a2952 100644
|
|
||||||
--- a/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs
|
|
||||||
+++ b/src/NuGet.Core/NuGet.Frameworks/FrameworkConstants.cs
|
|
||||||
@@ -12,6 +12,7 @@ public static class FrameworkConstants
|
|
||||||
public static readonly Version MaxVersion = new Version(int.MaxValue, 0, 0, 0);
|
|
||||||
public static readonly Version Version5 = new Version(5, 0, 0, 0);
|
|
||||||
public static readonly Version Version6 = new Version(6, 0, 0, 0);
|
|
||||||
+ public static readonly Version Version7 = new Version(7, 0, 0, 0);
|
|
||||||
public static readonly Version Version10 = new Version(10, 0, 0, 0);
|
|
||||||
public static readonly FrameworkRange DotNetAll = new FrameworkRange(
|
|
||||||
new NuGetFramework(FrameworkIdentifiers.NetPlatform, FrameworkConstants.EmptyVersion),
|
|
||||||
@@ -186,6 +187,7 @@ public static class CommonFrameworks
|
|
||||||
// .NET 5.0 and later has NetCoreApp identifier
|
|
||||||
public static readonly NuGetFramework Net50 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version5);
|
|
||||||
public static readonly NuGetFramework Net60 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6);
|
|
||||||
+ public static readonly NuGetFramework Net70 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7);
|
|
||||||
|
|
||||||
public static readonly NuGetFramework Native = new NuGetFramework(FrameworkIdentifiers.Native, new Version(0, 0, 0, 0));
|
|
||||||
}
|
|
||||||
diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs b/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs
|
|
||||||
index cbbb3af0c..67a355cc8 100644
|
|
||||||
--- a/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs
|
|
||||||
+++ b/src/NuGet.Core/NuGet.Frameworks/NuGetFrameworkFactory.cs
|
|
||||||
@@ -686,6 +686,12 @@ private static bool TryParseCommonFramework(string frameworkString, out NuGetFra
|
|
||||||
case "net60":
|
|
||||||
framework = FrameworkConstants.CommonFrameworks.Net60;
|
|
||||||
break;
|
|
||||||
+ case "netcoreapp7.0":
|
|
||||||
+ case "netcoreapp70":
|
|
||||||
+ case "net7.0":
|
|
||||||
+ case "net70":
|
|
||||||
+ framework = FrameworkConstants.CommonFrameworks.Net70;
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return framework != null;
|
|
||||||
diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
|
|
||||||
index 8a9bc1778..01e0a0221 100644
|
|
||||||
--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
|
|
||||||
+++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
|
|
||||||
@@ -35,7 +35,7 @@
|
|
||||||
<Reference Include="System.Net.Http" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
- <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net6.0' ">
|
|
||||||
+ <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' ">
|
|
||||||
<PackageReference Include="System.ComponentModel.Composition" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
|
@ -46,7 +46,7 @@ index 2de17ce715..32e6580920 100644
|
||||||
--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
|
--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
|
||||||
+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
|
+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
|
||||||
@@ -1,7 +1,7 @@
|
@@ -1,7 +1,7 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
- <TargetFramework>net6.0</TargetFramework>
|
- <TargetFramework>net6.0</TargetFramework>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue