Merge pull request #21 from devlead/feature/preview7

devlead · web-flow · commit 5256a87c7781 · 2025-08-13T10:06:03.000+02:00
Update to .NET 10 Preview 7 and Fix Trimming Warnings
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.6.25358.103"
+    "version": "10.0.100-preview.7.25380.108"
   }
 }
diff --git a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakeModules.g.verified.cs b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakeModules.g.verified.cs
@@ -31,7 +31,7 @@ private sealed class ServiceRegistration : ICakeRegistrationBuilder
             public Type? ServiceType { get; set; }
             public ServiceLifetime Lifetime { get; set; }
 
-            public ServiceRegistration(Type implementationType)
+            public ServiceRegistration([System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)] Type implementationType)
             {
                 ImplementationType = implementationType;
             }
@@ -86,11 +86,13 @@ public ICakeRegistrationBuilder RegisterInstance<TImplementation>(TImplementatio
 
             public ICakeRegistrationBuilder RegisterType(Type type)
             {
+#pragma warning disable IL2067 // 'type' argument does not satisfy 'DynamicallyAccessedMemberTypes.PublicConstructors' in call to 'ServiceRegistration.ServiceRegistration(Type)'
                 var registration = new ServiceRegistration(type)
                 {
                     Lifetime = ServiceLifetime.Transient,
                     ServiceType = type,
                 };
+#pragma warning restore IL2067
 
                 _registrations.Add(registration);
                 return registration;
diff --git a/src/Cake.Generator.Core/CakeGenerator.Generate.Helper.Services.Modules.ServiceCollectionAdapter.cs b/src/Cake.Generator.Core/CakeGenerator.Generate.Helper.Services.Modules.ServiceCollectionAdapter.cs
@@ -14,7 +14,7 @@ private sealed class ServiceRegistration : ICakeRegistrationBuilder
                         public Type? ServiceType { get; set; }
                         public ServiceLifetime Lifetime { get; set; }
 
-                        public ServiceRegistration(Type implementationType)
+                        public ServiceRegistration([System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)] Type implementationType)
                         {
                             ImplementationType = implementationType;
                         }
@@ -69,11 +69,13 @@ public ICakeRegistrationBuilder RegisterInstance<TImplementation>(TImplementatio
 
                         public ICakeRegistrationBuilder RegisterType(Type type)
                         {
+            #pragma warning disable IL2067 // 'type' argument does not satisfy 'DynamicallyAccessedMemberTypes.PublicConstructors' in call to 'ServiceRegistration.ServiceRegistration(Type)'
                             var registration = new ServiceRegistration(type)
                             {
                                 Lifetime = ServiceLifetime.Transient,
                                 ServiceType = type,
                             };
+            #pragma warning restore IL2067
 
                             _registrations.Add(registration);
                             return registration;
diff --git a/src/Cake.Generator/Cake.Generator.csproj b/src/Cake.Generator/Cake.Generator.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Cake.NuGet" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="8.0.1" Condition="'$(TargetFramework)' == 'net8.0'" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="10.0.0-preview.6.25358.103" Condition="'$(TargetFramework)' == 'net10.0'" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="10.0.0-preview.7.25380.108" Condition="'$(TargetFramework)' == 'net10.0'" />
   </ItemGroup>
 
   <!-- Reference the core source generator project -->
diff --git a/src/Cake.Sdk/Cake.Sdk.csproj b/src/Cake.Sdk/Cake.Sdk.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Cake.NuGet" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="8.0.1" Condition="'$(TargetFramework)' == 'net8.0'" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="10.0.0-preview.6.25358.103" Condition="'$(TargetFramework)' == 'net10.0'" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="10.0.0-preview.7.25380.108" Condition="'$(TargetFramework)' == 'net10.0'" />
   </ItemGroup>
 
   <!-- Generate SDK files with actual version during build -->
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -15,15 +15,15 @@
     <PackageVersion Include="Cake.Twitter" Version="5.0.0" />
     <PackageVersion Include="Cake.BuildSystems.Module" Version="8.0.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
     <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
     <!-- Test dependencies -->
     <PackageVersion Include="xunit.v3" Version="3.0.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageVersion Include="Verify.XunitV3" Version="30.4.0" />
+    <PackageVersion Include="Verify.XunitV3" Version="30.6.1" />
     <PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "10.0.100-preview.6.25358.103"`
	`3`	`+ "version": "10.0.100-preview.7.25380.108"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ private sealed class ServiceRegistration : ICakeRegistrationBuilder`
`31`	`31`	`public Type? ServiceType { get; set; }`
`32`	`32`	`public ServiceLifetime Lifetime { get; set; }`
`33`	`33`
`34`		`- public ServiceRegistration(Type implementationType)`
	`34`	`+ public ServiceRegistration([System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)] Type implementationType)`
`35`	`35`	`{`
`36`	`36`	`ImplementationType = implementationType;`
`37`	`37`	`}`
`@@ -86,11 +86,13 @@ public ICakeRegistrationBuilder RegisterInstance<TImplementation>(TImplementatio`
`86`	`86`
`87`	`87`	`public ICakeRegistrationBuilder RegisterType(Type type)`
`88`	`88`	`{`
	`89`	`+#pragma warning disable IL2067 // 'type' argument does not satisfy 'DynamicallyAccessedMemberTypes.PublicConstructors' in call to 'ServiceRegistration.ServiceRegistration(Type)'`
`89`	`90`	`var registration = new ServiceRegistration(type)`
`90`	`91`	`{`
`91`	`92`	`Lifetime = ServiceLifetime.Transient,`
`92`	`93`	`ServiceType = type,`
`93`	`94`	`};`
	`95`	`+#pragma warning restore IL2067`
`94`	`96`
`95`	`97`	`_registrations.Add(registration);`
`96`	`98`	`return registration;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ private sealed class ServiceRegistration : ICakeRegistrationBuilder`
`14`	`14`	`public Type? ServiceType { get; set; }`
`15`	`15`	`public ServiceLifetime Lifetime { get; set; }`
`16`	`16`
`17`		`- public ServiceRegistration(Type implementationType)`
	`17`	`+ public ServiceRegistration([System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors)] Type implementationType)`
`18`	`18`	`{`
`19`	`19`	`ImplementationType = implementationType;`
`20`	`20`	`}`
`@@ -69,11 +69,13 @@ public ICakeRegistrationBuilder RegisterInstance<TImplementation>(TImplementatio`
`69`	`69`
`70`	`70`	`public ICakeRegistrationBuilder RegisterType(Type type)`
`71`	`71`	`{`
	`72`	`+ #pragma warning disable IL2067 // 'type' argument does not satisfy 'DynamicallyAccessedMemberTypes.PublicConstructors' in call to 'ServiceRegistration.ServiceRegistration(Type)'`
`72`	`73`	`var registration = new ServiceRegistration(type)`
`73`	`74`	`{`
`74`	`75`	`Lifetime = ServiceLifetime.Transient,`
`75`	`76`	`ServiceType = type,`
`76`	`77`	`};`
	`78`	`+ #pragma warning restore IL2067`
`77`	`79`
`78`	`80`	`_registrations.Add(registration);`
`79`	`81`	`return registration;`