diff --git a/.build/Build.Environment.cs b/.build/Build.Environment.cs index 03166572d37..cf0aa3f47d3 100644 --- a/.build/Build.Environment.cs +++ b/.build/Build.Environment.cs @@ -19,7 +19,7 @@ partial class Build AbsolutePath CoverageReportDirectory => OutputDirectory / "coverage-reports"; AbsolutePath PackageDirectory => OutputDirectory / "packages"; AbsolutePath HotChocolateDirectoryBuildProps => SourceDirectory / "HotChocolate" / "Directory.Build.Props"; - AbsolutePath TemplatesNuSpec => RootDirectory / "templates" / "HotChocolate.Templates.nuspec"; + AbsolutePath TemplatesProj => RootDirectory / "templates" / "HotChocolate.Templates.csproj"; AbsolutePath EmptyServer12Proj => RootDirectory / "templates" / "server" / "HotChocolate.Template.Server.csproj"; AbsolutePath EmptyAzf12Proj => RootDirectory / "templates" / "azure-function" / "HotChocolate.Template.AzureFunctions.csproj"; AbsolutePath Gateway13Proj => RootDirectory / "templates" / "gateway" / "HotChocolate.Template.Gateway.csproj"; diff --git a/.build/Build.Publish.cs b/.build/Build.Publish.cs index 1a7ea2f364d..2c65e9bc744 100644 --- a/.build/Build.Publish.cs +++ b/.build/Build.Publish.cs @@ -4,10 +4,8 @@ using Nuke.Common.IO; using Nuke.Common.Tooling; using Nuke.Common.Tools.DotNet; -using Nuke.Common.Tools.NuGet; using static Nuke.Common.Tools.DotNet.DotNetTasks; using static Helpers; -using static Nuke.Common.Tools.NuGet.NuGetTasks; partial class Build { @@ -68,14 +66,14 @@ partial class Build .Produces(PackageDirectory / "*.snupkg") .Executes(() => { - var projFile = File.ReadAllText(EmptyServer12Proj); - File.WriteAllText(EmptyServer12Proj, projFile.Replace("14.0.0-preview.build.0", SemVersion)); - - projFile = File.ReadAllText(EmptyAzf12Proj); - File.WriteAllText(EmptyAzf12Proj, projFile.Replace("14.0.0-preview.build.0", SemVersion)); + var projFile = File.ReadAllText(EmptyAzf12Proj); + File.WriteAllText(EmptyAzf12Proj, projFile.Replace("0.0.0-placeholder", SemVersion)); projFile = File.ReadAllText(Gateway13Proj); - File.WriteAllText(Gateway13Proj, projFile.Replace("14.0.0-preview.build.0", SemVersion)); + File.WriteAllText(Gateway13Proj, projFile.Replace("0.0.0-placeholder", SemVersion)); + + projFile = File.ReadAllText(EmptyServer12Proj); + File.WriteAllText(EmptyServer12Proj, projFile.Replace("0.0.0-placeholder", SemVersion)); DotNetBuildSonarSolution( PackSolutionFile, @@ -108,11 +106,11 @@ partial class Build .SetAssemblyVersion(Version) .SetVersion(SemVersion)); - NuGetPack(c => c - .SetVersion(SemVersion) - .SetOutputDirectory(PackageDirectory) + DotNetPack(c => c + .SetProject(TemplatesProj) .SetConfiguration(Configuration) - .CombineWith(t => t.SetTargetPath(TemplatesNuSpec))); + .SetOutputDirectory(PackageDirectory) + .SetVersion(SemVersion)); }); Target Publish => _ => _ diff --git a/.build/Build.csproj b/.build/Build.csproj index 5366d0bf9ae..5949a74382d 100644 --- a/.build/Build.csproj +++ b/.build/Build.csproj @@ -20,7 +20,6 @@ - diff --git a/templates/HotChocolate.Templates.csproj b/templates/HotChocolate.Templates.csproj new file mode 100644 index 00000000000..e58001d493e --- /dev/null +++ b/templates/HotChocolate.Templates.csproj @@ -0,0 +1,31 @@ + + + + Template + HotChocolate.Templates + Hot Chocolate GraphQL templates. + Michael Staib + hotchocolate-signet.png + + netstandard2.0 + + true + false + content + $(NoWarn);NU5128 + true + + false + + + + + + + + + diff --git a/templates/HotChocolate.Templates.nuspec b/templates/HotChocolate.Templates.nuspec deleted file mode 100644 index c654f0c847e..00000000000 --- a/templates/HotChocolate.Templates.nuspec +++ /dev/null @@ -1,16 +0,0 @@ - - - - HotChocolate.Templates - 0.0.0 - Hot Chocolate GraphQL templates. - Michael Staib - https://chillicream.com/resources/hotchocolate-signet.png - - - - - - - - diff --git a/templates/azure-function/.template.config/template.json b/templates/azure-function/.template.config/template.json index 45835ae8f46..84b673f96ba 100644 --- a/templates/azure-function/.template.config/template.json +++ b/templates/azure-function/.template.config/template.json @@ -32,7 +32,7 @@ "description": "Target .NET 10" } ], - "replaces": "net8.0", + "replaces": "net10.0", "defaultValue": "net10.0" } }, diff --git a/templates/azure-function/HotChocolate.Template.AzureFunctions.csproj b/templates/azure-function/HotChocolate.Template.AzureFunctions.csproj index 5bc45673d6e..9fe7d6d9915 100644 --- a/templates/azure-function/HotChocolate.Template.AzureFunctions.csproj +++ b/templates/azure-function/HotChocolate.Template.AzureFunctions.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 v4 Exe enable @@ -18,8 +18,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/templates/gateway/.template.config/template.json b/templates/gateway/.template.config/template.json index adffd5709cc..4a3bf5dc966 100644 --- a/templates/gateway/.template.config/template.json +++ b/templates/gateway/.template.config/template.json @@ -32,7 +32,7 @@ "description": "Target .NET 10" } ], - "replaces": "net8.0", + "replaces": "net10.0", "defaultValue": "net10.0" } }, diff --git a/templates/gateway/HotChocolate.Template.Gateway.csproj b/templates/gateway/HotChocolate.Template.Gateway.csproj index 789ba3121df..bb8b822e4e7 100644 --- a/templates/gateway/HotChocolate.Template.Gateway.csproj +++ b/templates/gateway/HotChocolate.Template.Gateway.csproj @@ -1,13 +1,13 @@ - net8.0 + net10.0 enable enable - + diff --git a/templates/server/.template.config/template.json b/templates/server/.template.config/template.json index 415c088406d..bde7173b5fa 100644 --- a/templates/server/.template.config/template.json +++ b/templates/server/.template.config/template.json @@ -32,7 +32,7 @@ "description": "Target .NET 10" } ], - "replaces": "net8.0", + "replaces": "net10.0", "defaultValue": "net10.0" } }, diff --git a/templates/server/HotChocolate.Template.Server.csproj b/templates/server/HotChocolate.Template.Server.csproj index 78fdd691c0b..f1b8fecc422 100644 --- a/templates/server/HotChocolate.Template.Server.csproj +++ b/templates/server/HotChocolate.Template.Server.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable preview @@ -12,9 +12,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all