Skip to content

Fix type forwarding for init/record workaround #895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 2, 2022
Merged

Fix type forwarding for init/record workaround #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
326da4f
Update `nuke.globaltool` to fix macOS CI
andyleejordan Nov 8, 2022
8fcfd50
Revert "disable macos builds for now"
andyleejordan Nov 8, 2022
62a9492
Fix type forwarding for `init` and `record` workaround
andyleejordan Nov 7, 2022
37d7594
Only target `net6.0` for tests
andyleejordan Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
]
},
"nuke.globaltool": {
"version": "6.0.3",
"version": "6.2.1",
"commands": [
"nuke"
]
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sample/SampleServer/SampleServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 5 additions & 8 deletions src/JsonRpc.Generators/Records.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
{
}
}
Expand Down
13 changes: 5 additions & 8 deletions src/JsonRpc/Nullable/Records.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/Client.Tests/Client.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions test/Dap.Tests/Dap.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
23 changes: 0 additions & 23 deletions test/Dap.Tests/Records.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/Generation.Tests/Generation.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
23 changes: 0 additions & 23 deletions test/Generation.Tests/Records.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/JsonRpc.Tests/JsonRpc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/Lsp.Integration.Tests/Lsp.Integration.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
23 changes: 0 additions & 23 deletions test/Lsp.Integration.Tests/Records.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/Lsp.Tests/Lsp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
23 changes: 0 additions & 23 deletions test/Lsp.Tests/Records.cs
View file
Open in desktop

This file was deleted.