Fixed packing + errors

s-e-f · Aug 10, 2023 · 0110125 · 0110125
1 parent 6ac61bd
commit 0110125
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Squeel/Generators/ExtensionMethodGenerator.cs b/Squeel/Generators/ExtensionMethodGenerator.cs
@@ -25,7 +25,7 @@ internal static class SqueelDbConnectionExtensions
                     (
                         this global::Npgsql.NpgsqlConnection connection,
                         ref global::{{GeneratedFileOptions.Namespace}}.SqueelInterpolatedStringHandler query,
-                        [EnumeratorCancellation] global::System.Threading.CancellationToken ct = default
+                        global::System.Threading.CancellationToken ct = default
                     )
                     {
                         throw new global::System.InvalidOperationException("This call failed to be intercepted by the Squeel source generator");

diff --git a/Squeel/Generators/QueryAsyncGenerator.cs b/Squeel/Generators/QueryAsyncGenerator.cs
@@ -132,7 +132,7 @@ internal static class {{entity.Name}}QueryImplementation
                         (
                             this global::Npgsql.NpgsqlConnection connection,
                             ref global::Squeel.SqueelInterpolatedStringHandler query,
-                            [global::System.Runtime.CompilerServices.EnumeratorCancellation] global::System.Threading.CancellationToken ct = default
+                            global::System.Threading.CancellationToken ct = default
                         )
                         {
                             var sql = query.ToString('@');
@@ -146,7 +146,7 @@ internal static class {{entity.Name}}QueryImplementation
                             (
                                 global::Npgsql.NpgsqlCommand command,
                                 global::System.Collections.Generic.IEnumerable<global::{{GeneratedFileOptions.Namespace}}.ParameterDescriptor> parameters,
-                                [global::System.Runtime.CompilerServices] global::System.Threading.CancellationToken ct
+                                [global::System.Runtime.CompilerServices.EnumeratorCancellation] global::System.Threading.CancellationToken ct
                             )
                             {
                                 foreach (var pd in parameters)

diff --git a/Squeel/Squeel.csproj b/Squeel/Squeel.csproj
@@ -52,6 +52,8 @@
 
 	<Target Name="GetDependencyTargetPaths">
 		<ItemGroup>
+			<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="dotnet/analyzers/cs" Visible="false" />
+
 			<TargetPathWithTargetPlatformMoniker Include="$(PkgHumanizer_Core)\lib\netstandard2.0\Humanizer.dll" IncludeRuntimeDependency="false" />
 			<None Include="$(PkgHumanizer_Core)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="dotnet/analyzers/cs" Visible="false" />