Resolve source-build patch conflicts
This commit is contained in:
parent
c2a5ae411a
commit
6bc0743927
2 changed files with 1 additions and 26 deletions
|
@ -1,25 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <loganbussell@microsoft.com>
|
||||
Date: Fri, 24 Jun 2022 14:57:53 -0700
|
||||
Subject: [PATCH] Update System.Memory to 4.5.5
|
||||
|
||||
Prevents package downgrade error.
|
||||
|
||||
Backport: https://github.com/dotnet/fsharp/pull/13394
|
||||
---
|
||||
eng/Versions.props | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index 6571c5fb2..aa3b4e11f 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -93,7 +93,7 @@
|
||||
<SystemIoCompressionVersion>4.3.0</SystemIoCompressionVersion>
|
||||
<SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>
|
||||
<SystemLinqQueryableVersion>4.3.0</SystemLinqQueryableVersion>
|
||||
- <SystemMemoryVersion>4.5.4</SystemMemoryVersion>
|
||||
+ <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
|
||||
<SystemNetRequestsVersion>4.3.0</SystemNetRequestsVersion>
|
||||
<SystemNetSecurityVersion>4.3.1</SystemNetSecurityVersion>
|
||||
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>
|
|
@ -219,7 +219,7 @@ index fe90e93ca..01b64e055 100644
|
|||
+++ b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<NonShipping>true</NonShipping>
|
||||
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
||||
</PropertyGroup>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue