Remove backported source-build patches
This commit is contained in:
Michael Simons
parent
724bff0f26
commit
f30bcdfc0a
2 changed files with 0 additions and 143 deletions
|
|
@ -1,96 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Wed, 31 May 2023 16:04:51 +0000
|
||||
Subject: [PATCH] Target net8.0 for source-build
|
||||
|
||||
Backport: https://github.com/NuGet/NuGet.Client/pull/5193
|
||||
---
|
||||
build/common.project.props | 8 ++++----
|
||||
build/common.targets | 2 +-
|
||||
eng/source-build/global.json | 2 +-
|
||||
.../NuGet.Configuration/NuGet.Configuration.csproj | 2 +-
|
||||
.../NuGet.PackageManagement.csproj | 2 +-
|
||||
5 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/build/common.project.props b/build/common.project.props
|
||||
index 0e32eb737..de8b07140 100644
|
||||
--- a/build/common.project.props
|
||||
+++ b/build/common.project.props
|
||||
@@ -12,7 +12,7 @@
|
||||
<NETFXTargetFrameworkVersion>v4.7.2</NETFXTargetFrameworkVersion>
|
||||
<NETFXTargetFramework>net472</NETFXTargetFramework>
|
||||
<NETCoreTargetFramework>netcoreapp3.1</NETCoreTargetFramework>
|
||||
- <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net7.0</NETCoreTargetFramework>
|
||||
+ <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0</NETCoreTargetFramework>
|
||||
<NETCoreTestTargetFrameworks>net7.0</NETCoreTestTargetFrameworks>
|
||||
<NETCoreTestTargetFrameworks Condition=" ('$(CI)' == 'true' AND '$(BUILD_NET8)' != 'false') OR '$(BUILD_NET8)' == 'true' ">net7.0;net8.0</NETCoreTestTargetFrameworks>
|
||||
<NetStandardVersion>netstandard2.0</NetStandardVersion>
|
||||
@@ -20,14 +20,14 @@
|
||||
<TargetFrameworksExe Condition="'$(IsXPlat)' == 'true'">$(NETCoreTargetFramework)</TargetFrameworksExe>
|
||||
<TargetFrameworksExeForSigning>$(TargetFrameworksExe);netcoreapp5.0</TargetFrameworksExeForSigning>
|
||||
<TargetFrameworksExeForSigning Condition=" '$(IsXPlat)' == 'true' ">$(NETCoreTargetFramework);netcoreapp5.0</TargetFrameworksExeForSigning>
|
||||
- <TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe);net7.0</TargetFrameworksExeForSigning>
|
||||
+ <TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe)</TargetFrameworksExeForSigning>
|
||||
<MinimalTargetFrameworksExeSigning>$(NETFXTargetFramework);netcoreapp5.0</MinimalTargetFrameworksExeSigning>
|
||||
<MinimalTargetFrameworksExeSigning Condition=" '$(IsXPlat)' == 'true' ">netcoreapp5.0</MinimalTargetFrameworksExeSigning>
|
||||
- <MinimalTargetFrameworksExeSigning Condition="'$(DotNetBuildFromSource)' == 'true'">net7.0</MinimalTargetFrameworksExeSigning>
|
||||
+ <MinimalTargetFrameworksExeSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework)</MinimalTargetFrameworksExeSigning>
|
||||
<TargetFrameworksLibrary>$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
|
||||
<TargetFrameworksLibrary Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
|
||||
<TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);netcoreapp5.0</TargetFrameworksLibraryForSigning>
|
||||
- <TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksLibrary);net7.0</TargetFrameworksLibraryForSigning>
|
||||
+ <TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksLibrary)</TargetFrameworksLibraryForSigning>
|
||||
<TargetFrameworksLibraryForCrossVerificationTests>$(NETFXTargetFramework);$(NETCoreTestTargetFrameworks)</TargetFrameworksLibraryForCrossVerificationTests>
|
||||
<RepositoryRootDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\</RepositoryRootDirectory>
|
||||
<BuildCommonDirectory>$(RepositoryRootDirectory)build\</BuildCommonDirectory>
|
||||
diff --git a/build/common.targets b/build/common.targets
|
||||
index 51b38ba04..dc53d7557 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')) OR $(TargetFramework.StartsWith('net7')) ">
|
||||
+ <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) OR $(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('net6')) OR $(TargetFramework.StartsWith('net7')) OR $(TargetFramework.StartsWith('net8')) ">
|
||||
<DefineConstants>$(DefineConstants);IS_CORECLR</DefineConstants>
|
||||
<IsCore>true</IsCore>
|
||||
</PropertyGroup>
|
||||
diff --git a/eng/source-build/global.json b/eng/source-build/global.json
|
||||
index ba3ce2cfc..43d452859 100644
|
||||
--- a/eng/source-build/global.json
|
||||
+++ b/eng/source-build/global.json
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"tools": {
|
||||
- "dotnet": "7.0.100"
|
||||
+ "dotnet": "8.0.100-preview.3.23178.7"
|
||||
},
|
||||
"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 a246feeb9..eea152eb6 100644
|
||||
--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
|
||||
+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
|
||||
@@ -26,7 +26,7 @@
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
</ItemGroup>
|
||||
|
||||
- <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' ">
|
||||
+ <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' ">
|
||||
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
|
||||
</ItemGroup>
|
||||
|
||||
diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
|
||||
index be1727a5b..38658b221 100644
|
||||
--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
|
||||
+++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
|
||||
@@ -32,7 +32,7 @@
|
||||
<Reference Include="System.Net.Http" />
|
||||
</ItemGroup>
|
||||
|
||||
- <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' ">
|
||||
+ <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' ">
|
||||
<PackageReference Include="System.ComponentModel.Composition" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Wed, 7 Jun 2023 03:03:22 +0000
|
||||
Subject: [PATCH] Add dependencies for PVP flow
|
||||
|
||||
Backport: https://github.com/NuGet/NuGet.Client/pull/5207
|
||||
---
|
||||
eng/Version.Details.xml | 27 +++++++++++++++++++++++++++
|
||||
1 file changed, 27 insertions(+)
|
||||
|
||||
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
|
||||
index ff6bc71b5..bbadad4c0 100644
|
||||
--- a/eng/Version.Details.xml
|
||||
+++ b/eng/Version.Details.xml
|
||||
@@ -5,4 +5,31 @@
|
||||
See https://github.com/dotnet/arcade/issues/2396 for details.
|
||||
See https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#details-file for schema.
|
||||
-->
|
||||
+
|
||||
+ <!--
|
||||
+ Following dependencies are required for PVP flow.
|
||||
+ PVP flow infra will automatically bump the version to the latest live one.
|
||||
+ -->
|
||||
+ <ProductDependencies>
|
||||
+ <Dependency Name="Microsoft.Build" Version="17.3.1">
|
||||
+ <Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
+ <Sha>80f618ad45d38475773fd1a6eaa059f118a0ad5a</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0">
|
||||
+ <Uri>https://github.com/dotnet/runtime</Uri>
|
||||
+ <Sha>8470979eb44c2218025515234d3e01138bd74afb</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0">
|
||||
+ <Uri>https://github.com/dotnet/runtime</Uri>
|
||||
+ <Sha>8470979eb44c2218025515234d3e01138bd74afb</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="Microsoft.Web.Xdt" Version="3.0.0">
|
||||
+ <Uri>https://github.com/aspnet/xdt</Uri>
|
||||
+ <Sha>d4d088b6a9c793525b1a27a119cb66ba4587bb39</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="System.ComponentModel.Composition" Version="4.5.0">
|
||||
+ <Uri>https://github.com/dotnet/corefx</Uri>
|
||||
+ <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha>
|
||||
+ </Dependency>
|
||||
+ </ProductDependencies>
|
||||
</Dependencies>
|
||||
\ No newline at end of file
|
||||
Loading…
Reference in a new issue