Skip to content

Commit 7568a6e

Browse files
tocsofttocsoft
committed
load correct task version
1 parent 4069b0f commit 7568a6e

File tree

4 files changed

+43
-42
lines changed

4 files changed

+43
-42
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
shell: pwsh
6363
run: dotnet nuget push "$((Resolve-Path packages/*.nupkg).Path)" -k ${{secrets.NUGET_TOKEN}} --skip-duplicate
6464

65-
publish-npm-pacakge:
65+
publish-npm-package:
6666
needs: test
6767
if: (github.event_name == 'push')
6868

@@ -87,11 +87,11 @@ jobs:
8787
name: npm
8888
path: packages/*.tgz
8989

90-
- name: Configure Github package registry
90+
- name: Configure authenticate bintray
9191
shell: pwsh
9292
run: Set-Content -Path '.npmrc' -Value "${{ secrets.BINTRAY_NPMRC }}"
9393

94-
- name: Publish npm package to Github package registry
94+
- name: Publish npm package to bintray
9595
shell: pwsh
9696
run: npm publish "$((Resolve-Path packages/*.tgz).Path)" --registry https://api.bintray.com/npm/tocsoft/npm
9797

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,5 +292,5 @@ __pycache__/
292292
/Sample/Client/GitHubTypescript/generated-real.ts
293293
/Sample/Client/GitHub/generated.ts
294294
/Tocsoft.GraphQLCodeGen.Cli/binaries
295-
*.tzg
295+
*.tgz
296296
*.binlog

‎Tocsoft.GraphQLCodeGen.Cli/Tocsoft.GraphQLCodeGen.Cli.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<RootNamespace>Tocsoft.GraphQLCodeGen</RootNamespace>
77
<LangVersion>latest</LangVersion>
88
<IsPackable>false</IsPackable>
9+
<MinVerTagPrefix>v</MinVerTagPrefix>
910
</PropertyGroup>
1011

1112
<ItemGroup>

‎Tocsoft.GraphQLCodeGen.MsBuild/build/Tocsoft.GraphQLCodeGen.MsBuild.props‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<GraphQLCodeGenAssemblyFolderRuntime Condition=" '$(MSBuildRuntimeType)' == 'Core' ">netcoreapp2.0</GraphQLCodeGenAssemblyFolderRuntime>
5-
<GraphQLCodeGenAssemblyFolderRuntime Condition=" '$(MSBuildRuntimeType)' != 'Core' ">net461</GraphQLCodeGenAssemblyFolderRuntime>
6-
<GraphQLCodeGenAssemblyFolder Condition =" '$(GraphQLCodeGenAssemblyFolder)' == '' ">$(MSBuildThisFileDirectory)..\tasks\$(GraphQLCodeGenAssemblyFolderRuntime)</GraphQLCodeGenAssemblyFolder>
7-
8-
<GraphQLCodeGenAssembly>$(GraphQLCodeGenAssemblyFolder)\Tocsoft.GraphQLCodeGen.MsBuild.dll</GraphQLCodeGenAssembly>
9-
<RunGraphQLCodeGen Condition="'$(RunGraphQLCodeGen)' == ''">true</RunGraphQLCodeGen>
10-
<GraphQLCodeGenTimeOut Condition="'$(GraphQLCodeGenTimeOut)' == ''">5000</GraphQLCodeGenTimeOut>
11-
<!-- should be completely optional-->
12-
<GraphQLCodeGenAdditionalSettingsPath Condition="'$(GraphQLCodeGenAdditionalSettingsPath)' == ''"></GraphQLCodeGenAdditionalSettingsPath>
13-
</PropertyGroup>
14-
15-
<ItemDefinitionGroup>
16-
<Compile>
17-
<Generator>MSBuild:GenerateGraphQLClient</Generator>
18-
</Compile>
19-
</ItemDefinitionGroup>
20-
21-
22-
<ItemGroup>
23-
<None Update="**\*.gql">
24-
<Generator>MSBuild:GenerateGraphQLClient</Generator>
25-
</None>
26-
<None Update="gqlsettings.json">
27-
<Generator>MSBuild:GenerateGraphQLClient</Generator>
28-
</None>
29-
</ItemGroup>
30-
31-
<ItemGroup>
32-
<Content Update="**\*.gql">
33-
<Generator>MSBuild:GenerateGraphQLClient</Generator>
34-
</Content>
35-
<Content Update="gqlsettings.json">
36-
<Generator>MSBuild:GenerateGraphQLClient</Generator>
37-
</Content>
38-
</ItemGroup>
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<GraphQLCodeGenAssemblyFolderRuntime Condition=" '$(MSBuildRuntimeType)' == 'Core' ">netcoreapp3.1</GraphQLCodeGenAssemblyFolderRuntime>
5+
<GraphQLCodeGenAssemblyFolderRuntime Condition=" '$(MSBuildRuntimeType)' != 'Core' ">net461</GraphQLCodeGenAssemblyFolderRuntime>
6+
<GraphQLCodeGenAssemblyFolder Condition =" '$(GraphQLCodeGenAssemblyFolder)' == '' ">$(MSBuildThisFileDirectory)..\tasks\$(GraphQLCodeGenAssemblyFolderRuntime)</GraphQLCodeGenAssemblyFolder>
7+
8+
<GraphQLCodeGenAssembly>$(GraphQLCodeGenAssemblyFolder)\Tocsoft.GraphQLCodeGen.MsBuild.dll</GraphQLCodeGenAssembly>
9+
<RunGraphQLCodeGen Condition="'$(RunGraphQLCodeGen)' == ''">true</RunGraphQLCodeGen>
10+
<GraphQLCodeGenTimeOut Condition="'$(GraphQLCodeGenTimeOut)' == ''">5000</GraphQLCodeGenTimeOut>
11+
<!-- should be completely optional-->
12+
<GraphQLCodeGenAdditionalSettingsPath Condition="'$(GraphQLCodeGenAdditionalSettingsPath)' == ''"></GraphQLCodeGenAdditionalSettingsPath>
13+
</PropertyGroup>
14+
15+
<ItemDefinitionGroup>
16+
<Compile>
17+
<Generator>MSBuild:GenerateGraphQLClient</Generator>
18+
</Compile>
19+
</ItemDefinitionGroup>
20+
21+
22+
<ItemGroup>
23+
<None Update="**\*.gql">
24+
<Generator>MSBuild:GenerateGraphQLClient</Generator>
25+
</None>
26+
<None Update="gqlsettings.json">
27+
<Generator>MSBuild:GenerateGraphQLClient</Generator>
28+
</None>
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<Content Update="**\*.gql">
33+
<Generator>MSBuild:GenerateGraphQLClient</Generator>
34+
</Content>
35+
<Content Update="gqlsettings.json">
36+
<Generator>MSBuild:GenerateGraphQLClient</Generator>
37+
</Content>
38+
</ItemGroup>
3939
</Project>

0 commit comments

Comments
 (0)