Move Omnisharp fix to the correct place. (#12297)
* Move Omnisharp fix to the correct place. We had some crossed PRs and this got added while the other patches were being moved. This moves it to the correct place. * Update patch to apply to new hash. * Another project dependency.
This commit is contained in:
Chris Rummel
GitHub
parent
b10c4f72cd
commit
e15beac0f6
2 changed files with 106 additions and 61 deletions
|
|
@ -1,61 +0,0 @@
|
|||
From 93de82c03ff71f897599db2824b959d020b877bd Mon Sep 17 00:00:00 2001
|
||||
From: Chris Rummel <crummel@microsoft.com>
|
||||
Date: Thu, 30 Sep 2021 16:08:28 -0500
|
||||
Subject: [PATCH 1/2] Fix Omnisharp: Add needed extra TFMs.
|
||||
|
||||
Omnisharp requires the net46 TFMs of this files explictly and we don't build them by default. This patch adds net46 to the relevant projects. The original issue for this was https://github.com/OmniSharp/omnisharp-vscode/issues/4610 and the long-term fix of switching to net>4 TFM is tracked in https://github.com/OmniSharp/omnisharp-vscode/issues/4360.
|
||||
|
||||
---
|
||||
src/libraries/Directory.Build.props | 2 +-
|
||||
.../ref/System.Resources.Extensions.csproj | 4 ++--
|
||||
.../src/System.Resources.Extensions.csproj | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
|
||||
index 4d39fad397e..649c669517e 100644
|
||||
--- a/src/libraries/Directory.Build.props
|
||||
+++ b/src/libraries/Directory.Build.props
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- Build all .NET Framework configurations when net48 is passed in. This is for convenience. -->
|
||||
- <AdditionalBuildTargetFrameworks Condition="'$(BuildTargetFramework)' == 'net48'">net461;net462;net47;net471;net472</AdditionalBuildTargetFrameworks>
|
||||
+ <AdditionalBuildTargetFrameworks Condition="'$(BuildTargetFramework)' == 'net48'">net46;net461;net462;net47;net471;net472</AdditionalBuildTargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Define test projects and companions -->
|
||||
diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj
|
||||
index 99037ae459c..848be41690c 100644
|
||||
--- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj
|
||||
+++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
- <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
|
||||
+ <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net46;net461</TargetFrameworks>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -11,4 +11,4 @@
|
||||
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)System.Resources.Writer\ref\System.Resources.Writer.csproj" />
|
||||
</ItemGroup>
|
||||
-</Project>
|
||||
\ No newline at end of file
|
||||
+</Project>
|
||||
diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
|
||||
index adacc9b977e..38d4c145352 100644
|
||||
--- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
|
||||
+++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
- <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
|
||||
+ <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net46;net461</TargetFrameworks>
|
||||
<DefineConstants>$(DefineConstants);RESOURCES_EXTENSIONS</DefineConstants>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -0,0 +1,106 @@
|
|||
From 827f1e036db2082b56b003f870f5ff8dabc9b1ed Mon Sep 17 00:00:00 2001
|
||||
From: Chris Rummel <crummel@microsoft.com>
|
||||
Date: Tue, 12 Oct 2021 14:04:27 -0500
|
||||
Subject: [PATCH] Fix Omnisharp: Add needed extra TFMs.
|
||||
|
||||
Omnisharp requires the net46 TFMs of this files explictly and we don't build them by default. This patch adds net46 to the relevant projects. The original issue for this was https://github.com/OmniSharp/omnisharp-vscode/issues/4610 and the long-term fix of switching to net>4 TFM is tracked in https://github.com/OmniSharp/omnisharp-vscode/issues/4360.
|
||||
|
||||
---
|
||||
src/libraries/Directory.Build.props | 2 +-
|
||||
.../ref/System.Resources.Extensions.csproj | 4 ++--
|
||||
.../src/System.Resources.Extensions.csproj | 2 +-
|
||||
.../ref/System.Runtime.CompilerServices.Unsafe.csproj | 4 ++--
|
||||
.../src/System.Runtime.CompilerServices.Unsafe.ilproj | 6 +++++-
|
||||
5 files changed, 11 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
|
||||
index a03b334346a..30418e38a2a 100644
|
||||
--- a/src/libraries/Directory.Build.props
|
||||
+++ b/src/libraries/Directory.Build.props
|
||||
@@ -20,7 +20,7 @@
|
||||
<ShouldUnsetParentConfigurationAndPlatform>false</ShouldUnsetParentConfigurationAndPlatform>
|
||||
<GeneratePlatformNotSupportedAssemblyHeaderFile>$(RepositoryEngineeringDir)LicenseHeader.txt</GeneratePlatformNotSupportedAssemblyHeaderFile>
|
||||
<!-- Build all .NET Framework configurations when net48 is passed in. This is for convenience. -->
|
||||
- <AdditionalBuildTargetFrameworks Condition="'$(BuildTargetFramework)' == 'net48'">net461;net462;net47;net471;net472</AdditionalBuildTargetFrameworks>
|
||||
+ <AdditionalBuildTargetFrameworks Condition="'$(BuildTargetFramework)' == 'net48'">net46;net461;net462;net47;net471;net472</AdditionalBuildTargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Sdk="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Project="Sdk.props" Condition="'$(UseTargetFrameworkSDK)' != 'false'" />
|
||||
diff --git a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj
|
||||
index 99037ae459c..848be41690c 100644
|
||||
--- a/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj
|
||||
+++ b/src/libraries/System.Resources.Extensions/ref/System.Resources.Extensions.csproj
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
- <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
|
||||
+ <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net46;net461</TargetFrameworks>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -11,4 +11,4 @@
|
||||
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
|
||||
<ProjectReference Include="$(LibrariesProjectRoot)System.Resources.Writer\ref\System.Resources.Writer.csproj" />
|
||||
</ItemGroup>
|
||||
-</Project>
|
||||
\ No newline at end of file
|
||||
+</Project>
|
||||
diff --git a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
|
||||
index a0a79e45adf..29c9b123ce5 100644
|
||||
--- a/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
|
||||
+++ b/src/libraries/System.Resources.Extensions/src/System.Resources.Extensions.csproj
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
- <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
|
||||
+ <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net46;net461</TargetFrameworks>
|
||||
<DefineConstants>$(DefineConstants);RESOURCES_EXTENSIONS</DefineConstants>
|
||||
<Nullable>enable</Nullable>
|
||||
<IsPackable>true</IsPackable>
|
||||
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj
|
||||
index 766ea9a8ae7..5324c85404b 100644
|
||||
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj
|
||||
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/ref/System.Runtime.CompilerServices.Unsafe.csproj
|
||||
@@ -3,7 +3,7 @@
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<CLSCompliant>false</CLSCompliant>
|
||||
<Nullable>enable</Nullable>
|
||||
- <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
|
||||
+ <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.1;netstandard2.0;net46;net461</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="System.Runtime.CompilerServices.Unsafe.cs" />
|
||||
@@ -14,4 +14,4 @@
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
|
||||
<Reference Include="System.Runtime" />
|
||||
</ItemGroup>
|
||||
-</Project>
|
||||
\ No newline at end of file
|
||||
+</Project>
|
||||
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
|
||||
index a9e3de0c454..75467734292 100644
|
||||
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
|
||||
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.IL">
|
||||
<PropertyGroup>
|
||||
- <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
|
||||
+ <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net46;net461</TargetFrameworks>
|
||||
<!-- Make sure that the DebuggableAttribute is set properly. -->
|
||||
<DebugOptimization>IMPL</DebugOptimization>
|
||||
<DebugOptimization Condition="'$(Configuration)' == 'Release'">OPT</DebugOptimization>
|
||||
@@ -20,6 +20,10 @@ System.Runtime.CompilerServices.Unsafe</PackageDescription>
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
|
||||
<CoreAssembly>netstandard</CoreAssembly>
|
||||
</PropertyGroup>
|
||||
+ <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
|
||||
+ <CoreAssembly>mscorlib</CoreAssembly>
|
||||
+ <ExtraMacros>#define $(TargetFramework)</ExtraMacros>
|
||||
+ </PropertyGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
|
||||
<CoreAssembly>mscorlib</CoreAssembly>
|
||||
<ExtraMacros>#define $(TargetFramework)</ExtraMacros>
|
||||
--
|
||||
2.18.0
|
||||
|
||||
Loading…
Add table
Reference in a new issue