Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed StrawberryShake MSBuild integration #4762

Merged
merged 1 commit into from
Feb 16, 2022
Merged

Fixed StrawberryShake MSBuild integration #4762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...rc/CodeGeneration.CSharp.Analyzers/StrawberryShake.CodeGeneration.CSharp.Analyzers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
<!-- Package the generator in the analyzer directory of the nuget package -->
<None Include="$(OutputPath)\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)..\.server\**\*.*" Pack="true" PackagePath="build/gen" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\graphql.MSBuild.xaml" Pack="true" PackagePath="build/graphql.MSBuild.xaml" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\graphql.MSBuild.ContentType.xaml" Pack="true" PackagePath="build/graphql.MSBuild.ContentType.xaml" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\StrawberryShake.props" Pack="true" PackagePath="build/StrawberryShake.CodeGeneration.CSharp.Analyzers.props" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\StrawberryShake.targets" Pack="true" PackagePath="build/StrawberryShake.CodeGeneration.CSharp.Analyzers.targets" Visible="false" />
</ItemGroup>
Expand Down
16 changes: 0 additions & 16 deletions src/StrawberryShake/SourceGenerator/src/MSBuild/StrawberryShake.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,4 @@
<StrawberryShake_PersistedQueryDirectory></StrawberryShake_PersistedQueryDirectory>
</PropertyGroup>

<ItemDefinitionGroup>
<GraphQL>
<Generator>MSBuild:GraphQLCompile</Generator>
</GraphQL>
<GraphQLConfig>
<Generator>MSBuild:GraphQLCompile</Generator>
</GraphQLConfig>
</ItemDefinitionGroup>

<ItemGroup>
<None Remove="**/*.graphql" />
<GraphQL Include="**/*.graphql" />
<None Remove="**/.graphqlrc.json" />
<GraphQLConfig Include="**/.graphqlrc.json" />
</ItemGroup>

</Project>
16 changes: 5 additions & 11 deletions src/StrawberryShake/SourceGenerator/src/MSBuild/StrawberryShake.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,18 @@
</PropertyGroup>

<ItemGroup>
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)graphql.MSBuild.xaml" />
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)graphql.MSBuild.ContentType.xaml" />
</ItemGroup>

<ItemGroup>
<!-- GraphQL Files -->
<!-- GraphQL Files -->
<GraphQL Include="**/*.graphql" />
<None Remove="@(GraphQL)" />
<Watch Include="@(GraphQL)" />
<AvailableItemName Include="GraphQL" />
<AdditionalFiles Include="@(GraphQL)" GraphQL="true" />
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="GraphQL" />


<!-- GraphQL Config Files -->
<GraphQLConfig Include="**/.graphqlrc.json" />
<None Remove="@(GraphQLConfig)" />
<Content Remove="@(GraphQLConfig)" />
<Watch Include="@(GraphQLConfig)" />
<AvailableItemName Include="GraphQLConfig" />
<AdditionalFiles Include="@(GraphQLConfig)" GraphQLConfig="true" />
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="GraphQLConfig" />

Expand All @@ -34,8 +30,6 @@
<CompilerVisibleProperty Include="MSBuildProjectFile" />
</ItemGroup>

<Import Project="$(MSBuildThisFileDirectory)VSCode.targets" Condition="'$(StrawberryShake_RemoveGeneratedCode)' == 'true'" />

<!--Design Time Code Generation Hook.-->
<PropertyGroup>
<CoreCompileDependsOn>
Expand Down
9 changes: 0 additions & 9 deletions src/StrawberryShake/SourceGenerator/src/MSBuild/graphql.MSBuild.ContentType.xaml
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/StrawberryShake/SourceGenerator/src/MSBuild/graphql.MSBuild.xaml
View file
Open in desktop

This file was deleted.