Fix type forwarding for init/record workaround (#895)

* Update `nuke.globaltool` to fix macOS CI * Revert "disable macos builds for now" This reverts commit 82934b6 and commit 9b583ba. * Fix type forwarding for `init` and `record` workaround * Only target `net6.0` for tests So they don't need `IsExternalInit` defined too.
OmniSharp · Dec 2, 2022 · aac9b59 · aac9b59
1 parent 7fd2219
commit aac9b59
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 124 deletions.
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -63,9 +63,9 @@ jobs:
         Linux:
           BuildName: 'Linux'
           ImageName: 'ubuntu-latest'
-        # macOS:
-        #   BuildName: 'macOS'
-        #   ImageName: 'macOS-latest'
+        macOS:
+          BuildName: 'macOS'
+          ImageName: 'macOS-latest'
     pool:
       vmImage: $(ImageName)
     steps:

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -21,7 +21,7 @@
             ]
         },
         "nuke.globaltool": {
-            "version": "6.0.3",
+            "version": "6.2.1",
             "commands": [
                 "nuke"
             ]

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,10 +75,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          # - macOS-latest
-          - windows-latest
-          - ubuntu-latest
+        os: [macOS-latest, windows-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout

diff --git a/sample/SampleServer/SampleServer.csproj b/sample/SampleServer/SampleServer.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <IsPackable>false</IsPackable>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>

diff --git a/src/JsonRpc.Generators/Records.cs b/src/JsonRpc.Generators/Records.cs
@@ -1,6 +1,8 @@
 #pragma warning disable MA0048 // File name must match type name
-#define INTERNAL_RECORD_ATTRIBUTES
-#if NETSTANDARD2_0 ||  NETSTANDARD2_1 ||  NETCOREAPP2_0 ||  NETCOREAPP2_1 ||  NETCOREAPP2_2 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48
+#if NET5_0_OR_GREATER
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.IsExternalInit))]
+#else
+
 using System.ComponentModel;
 
 // ReSharper disable once CheckNamespace
@@ -11,12 +13,7 @@ namespace System.Runtime.CompilerServices
     /// This class should not be used by developers in source code.
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-#if INTERNAL_RECORD_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        static class IsExternalInit
+    internal static class IsExternalInit
     {
     }
 }

diff --git a/src/JsonRpc/Nullable/Records.cs b/src/JsonRpc/Nullable/Records.cs
@@ -1,6 +1,8 @@
 #pragma warning disable MA0048 // File name must match type name
-#define INTERNAL_RECORD_ATTRIBUTES
-#if NETSTANDARD || NETCOREAPP
+#if NET5_0_OR_GREATER
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.IsExternalInit))]
+#else
+
 using System.ComponentModel;
 
 // ReSharper disable once CheckNamespace
@@ -11,12 +13,7 @@ namespace System.Runtime.CompilerServices
     /// This class should not be used by developers in source code.
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-#if INTERNAL_RECORD_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        static class IsExternalInit
+    internal static class IsExternalInit
     {
     }
 }

diff --git a/test/Client.Tests/Client.Tests.csproj b/test/Client.Tests/Client.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
         <AssemblyName>OmniSharp.Extensions.LanguageClient.Tests</AssemblyName>
         <RootNamespace>OmniSharp.Extensions.LanguageServer.Client.Tests</RootNamespace>
     </PropertyGroup>

diff --git a/test/Dap.Tests/Dap.Tests.csproj b/test/Dap.Tests/Dap.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
         <WarningsAsErrors>true</WarningsAsErrors>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>
@@ -16,6 +16,6 @@
         <ProjectReference Include="..\..\src\JsonRpc.Generators\JsonRpc.Generators.csproj" IncludeAssets="analyzers" ExcludeAssets="compile;runtime;native" PrivateAssets="contentfiles;build;buildMultitargeting;buildTransitive" OutputItemType="Analyzer" />
     </ItemGroup>
     <ItemGroup>
-        <Folder Include="obj\Release\netcoreapp3.1\" />
+        <Folder Include="obj\Release\net6.0\" />
     </ItemGroup>
 </Project>
diff --git a/test/Dap.Tests/Records.cs b/test/Dap.Tests/Records.cs
diff --git a/test/Generation.Tests/Generation.Tests.csproj b/test/Generation.Tests/Generation.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
         <WarningsAsErrors>true</WarningsAsErrors>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>

diff --git a/test/Generation.Tests/Records.cs b/test/Generation.Tests/Records.cs
diff --git a/test/JsonRpc.Tests/JsonRpc.Tests.csproj b/test/JsonRpc.Tests/JsonRpc.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
         <WarningsAsErrors>true</WarningsAsErrors>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>

diff --git a/test/Lsp.Integration.Tests/Lsp.Integration.Tests.csproj b/test/Lsp.Integration.Tests/Lsp.Integration.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
         <WarningsAsErrors>true</WarningsAsErrors>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>

diff --git a/test/Lsp.Integration.Tests/Records.cs b/test/Lsp.Integration.Tests/Records.cs
diff --git a/test/Lsp.Tests/Lsp.Tests.csproj b/test/Lsp.Tests/Lsp.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0</TargetFrameworks>
         <WarningsAsErrors>true</WarningsAsErrors>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>

diff --git a/test/Lsp.Tests/Records.cs b/test/Lsp.Tests/Records.cs