Skip to content

Commit 4ce1c68

Browse files
rojiroji
authored
Bring back source generation (#4022)
Note: latest dotnet SDKs (which are needed to source generate again) require us to set the environment variable MSBuildEnableWorkloadResolver=false. Fixes #3979
1 parent 661a54f commit 4ce1c68

64 files changed

Lines changed: 27 additions & 7020 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ on:
1010
pull_request:
1111

1212
env:
13-
dotnet_sdk_version: '6.0.100-rc.1.21463.6'
13+
dotnet_sdk_version: '6.0.100-rtm.21505.64'
1414
postgis_version: 3
1515
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
16+
# Hack to support latest prerelease dotnet SDK, https://github.com/dotnet/installer/issues/12230#issuecomment-936348246
17+
MSBuildEnableWorkloadResolver: false
1618

1719
jobs:
1820
build:

‎.github/workflows/rich-code-nav.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- '*'
1010

1111
env:
12-
dotnet_sdk_version: '6.0.100-rc.1.21463.6'
12+
dotnet_sdk_version: '6.0.100-rtm.21505.64'
1313
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1414

1515
jobs:

‎Npgsql.sln‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
3535
EndProject
3636
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.SourceGenerators", "src\Npgsql.SourceGenerators\Npgsql.SourceGenerators.csproj", "{63026A19-60B8-4906-81CB-216F30E8094B}"
3737
EndProject
38-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.TrimmingTests", "test\Npgsql.TrimmingTests\Npgsql.TrimmingTests.csproj", "{844EC023-21B8-448D-93AD-5F6857F15DFF}"
39-
EndProject
4038
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.NodaTime.Tests", "test\Npgsql.NodaTime.Tests\Npgsql.NodaTime.Tests.csproj", "{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}"
4139
EndProject
4240
Global
@@ -127,14 +125,6 @@ Global
127125
{63026A19-60B8-4906-81CB-216F30E8094B}.Release|Any CPU.Build.0 = Release|Any CPU
128126
{63026A19-60B8-4906-81CB-216F30E8094B}.Release|x86.ActiveCfg = Release|Any CPU
129127
{63026A19-60B8-4906-81CB-216F30E8094B}.Release|x86.Build.0 = Release|Any CPU
130-
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131-
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
132-
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Debug|x86.ActiveCfg = Debug|Any CPU
133-
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Debug|x86.Build.0 = Debug|Any CPU
134-
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
135-
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Release|Any CPU.Build.0 = Release|Any CPU
136-
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Release|x86.ActiveCfg = Release|Any CPU
137-
{844EC023-21B8-448D-93AD-5F6857F15DFF}.Release|x86.Build.0 = Release|Any CPU
138128
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139129
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Debug|Any CPU.Build.0 = Debug|Any CPU
140130
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -158,7 +148,6 @@ Global
158148
{F7C53EBD-0075-474F-A083-419257D04080} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
159149
{A77E5FAF-D775-4AB4-8846-8965C2104E60} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
160150
{63026A19-60B8-4906-81CB-216F30E8094B} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
161-
{844EC023-21B8-448D-93AD-5F6857F15DFF} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
162151
{C00D2EB1-5719-4372-9E1C-5ED05DC23A00} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
163152
EndGlobalSection
164153
GlobalSection(ExtensibilityGlobals) = postSolution

‎src/Npgsql.GeoJSON/Generated/GeoJsonHandler.Generated.cs‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎src/Npgsql.GeoJSON/Npgsql.GeoJSON.csproj‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
<TargetFramework>netstandard2.0</TargetFramework>
77
<TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net6.0</TargetFramework>
88
<SignAssembly>false</SignAssembly>
9-
10-
<!-- TEMPORARY HACK, SEE #3979
11-
Since we can no longer generate sources with dotnet SDK 6.0.100-rc.1, we generate them with preview7 and
12-
commit them... -->
13-
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
14-
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
159
</PropertyGroup>
1610

1711
<ItemGroup>
@@ -21,9 +15,6 @@
2115

2216
<ItemGroup>
2317
<ProjectReference Include="../Npgsql/Npgsql.csproj" />
24-
25-
<!-- TEMPORARY HACK, SEE #3979
2618
<ProjectReference Include="../Npgsql.SourceGenerators/Npgsql.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
27-
-->
2819
</ItemGroup>
2920
</Project>

‎src/Npgsql.NetTopologySuite/Generated/NetTopologySuiteHandler.Generated.cs‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
<TargetFramework>netstandard2.0</TargetFramework>
77
<TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net6.0</TargetFramework>
88
<NoWarn>$(NoWarn);NU5104</NoWarn>
9-
10-
<!-- TEMPORARY HACK, SEE #3979
11-
Since we can no longer generate sources with dotnet SDK 6.0.100-rc.1, we generate them with preview7 and
12-
commit them... -->
13-
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
14-
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
159
</PropertyGroup>
1610

1711
<ItemGroup>
@@ -24,9 +18,6 @@
2418

2519
<ItemGroup>
2620
<ProjectReference Include="../Npgsql/Npgsql.csproj" />
27-
28-
<!-- TEMPORARY HACK, SEE #3979
2921
<ProjectReference Include="../Npgsql.SourceGenerators/Npgsql.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
30-
-->
3122
</ItemGroup>
3223
</Project>

‎src/Npgsql.NodaTime/Generated/DateHandler.Generated.cs‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎src/Npgsql.NodaTime/Generated/DateMultirangeHandler.Generated.cs‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)