Skip to content

Commit

Permalink
Fixed build issue that prevented the FSharp package from being build. (
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelstaib authored Oct 25, 2023
1 parent 6da15a3 commit 1e09709
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 3 deletions.
4 changes: 1 addition & 3 deletions .build/Build.Environment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@ partial class Build
AbsolutePath TestResultDirectory => OutputDirectory / "test-results";
AbsolutePath CoverageReportDirectory => OutputDirectory / "coberage-reports";
AbsolutePath PackageDirectory => OutputDirectory / "packages";

AbsolutePath StarWarsTemplateNuSpec => RootDirectory / "templates" / "StarWars" / "HotChocolate.Templates.StarWars.nuspec";

AbsolutePath HotChocolateDirectoryBuildProps => SourceDirectory / "HotChocolate" / "Directory.Build.Props";

AbsolutePath StarWarsProj => RootDirectory / "templates" / "StarWars" / "content" / "StarWars.csproj";
AbsolutePath EmptyServerTemplateNuSpec => RootDirectory / "templates" / "Server" / "HotChocolate.Templates.Server.nuspec";
AbsolutePath EmptyServerProj => RootDirectory / "templates" / "Server" / "content" / "HotChocolate.Server.Template.csproj";
Expand All @@ -33,4 +30,5 @@ partial class Build
AbsolutePath EmptyAzfUp12Proj => RootDirectory / "templates" / "v12" / "function-isolated" / "HotChocolate.Template.AzureFunctions.Isolated.csproj";
AbsolutePath Gateway13Proj => RootDirectory / "templates" / "v12" / "gateway" / "HotChocolate.Template.Gateway.csproj";
AbsolutePath GatewayManaged13Proj => RootDirectory / "templates" / "v12" / "gateway-bcp" / "HotChocolate.Template.Gateway.Managed.csproj";
AbsolutePath FSharpTypes => SourceDirectory/"HotChocolate" /"Core" / "src" / "Types.FSharp" / "HotChocolate.Types.FSharp.fsproj";
}
9 changes: 9 additions & 0 deletions .build/Build.Publish.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ partial class Build
.SetAssemblyVersion(Version)
.SetVersion(SemVersion));

DotNetPack(c => c
.SetProject(FSharpTypes)
.SetConfiguration(Configuration)
.SetOutputDirectory(PackageDirectory)
.SetInformationalVersion(SemVersion)
.SetFileVersion(Version)
.SetAssemblyVersion(Version)
.SetVersion(SemVersion));

DotNetPack(c => c
.SetNoRestore(true)
.SetNoBuild(true)
Expand Down
15 changes: 15 additions & 0 deletions src/HotChocolate/Core/HotChocolate.Core.sln
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HotChocolate.Transport.Http
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HotChocolate.Transport.Abstractions", "..\AspNetCore\src\Transport.Abstractions\HotChocolate.Transport.Abstractions.csproj", "{08D371ED-04DE-4CE3-AD1B-F6CC6D341706}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotChocolate.Types.Shared", "src\Types.Shared\HotChocolate.Types.Shared.csproj", "{E5B248B8-A2E1-46CB-9281-D5871F1483C3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -959,6 +961,18 @@ Global
{08D371ED-04DE-4CE3-AD1B-F6CC6D341706}.Release|x64.Build.0 = Release|Any CPU
{08D371ED-04DE-4CE3-AD1B-F6CC6D341706}.Release|x86.ActiveCfg = Release|Any CPU
{08D371ED-04DE-4CE3-AD1B-F6CC6D341706}.Release|x86.Build.0 = Release|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Debug|x64.ActiveCfg = Debug|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Debug|x64.Build.0 = Debug|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Debug|x86.ActiveCfg = Debug|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Debug|x86.Build.0 = Debug|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Release|Any CPU.Build.0 = Release|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Release|x64.ActiveCfg = Release|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Release|x64.Build.0 = Release|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Release|x86.ActiveCfg = Release|Any CPU
{E5B248B8-A2E1-46CB-9281-D5871F1483C3}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1031,6 +1045,7 @@ Global
{B98BC881-DDDD-4988-AC43-187C733895CD} = {37B9D3B1-CA34-4720-9A0B-CFF1E64F52C2}
{D1B67116-DB1C-4CE7-954F-AD9E17C06061} = {7637D30E-7339-4D4E-9424-87CF2394D234}
{08D371ED-04DE-4CE3-AD1B-F6CC6D341706} = {7637D30E-7339-4D4E-9424-87CF2394D234}
{E5B248B8-A2E1-46CB-9281-D5871F1483C3} = {37B9D3B1-CA34-4720-9A0B-CFF1E64F52C2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E4D94C77-6657-4630-9D42-0A9AC5153A1B}
Expand Down

0 comments on commit 1e09709

Please sign in to comment.