Skip to content

Commit 17ad6f7

Browse files
committed
fix nuspecs and npm packages
1 parent a983d35 commit 17ad6f7

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

Tocsoft.GraphQLCodeGen.MsBuild/Tocsoft.GraphQLCodeGen.MsBuild.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<Description>msbuild targets for converting graphql queries to a strangle typed c# library</Description>
1414
</PropertyGroup>
1515

16-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp1.0|AnyCPU'">
17-
<DefineConstants>TRACE;DEBUG;NETCOREAPP1_0</DefineConstants>
16+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.0|AnyCPU'">
17+
<DefineConstants>TRACE;DEBUG;NETCOREAPP2_0</DefineConstants>
1818
</PropertyGroup>
1919

2020
<ItemGroup>

Tocsoft.GraphQLCodeGen.MsBuild/Tocsoft.GraphQLCodeGen.MsBuild.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<file src="bin\$configuration$\**\*.*" target="tasks" />
1414

1515
<file src="..\Tocsoft.GraphQLCodeGen.Cli\bin\$configuration$\net461\publish\**\*.*" target="tasks\binaries\net461" />
16-
<file src="..\Tocsoft.GraphQLCodeGen.Cli\bin\$configuration$\netcoreapp1.0\publish\**\*.*" target="tasks\binaries\netcoreapp1.0" />
16+
<file src="..\Tocsoft.GraphQLCodeGen.Cli\bin\$configuration$\netcoreapp2.0\publish\**\*.*" target="tasks\binaries\netcoreapp2.0" />
1717
</files>
1818
</package>

Tocsoft.GraphQLCodeGen.Npm/Tocsoft.GraphQLCodeGen.Npm.njsproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
<Content Include="..\Tocsoft.GraphQLCodeGen.Cli\bin\Debug\net46\publish\Tocsoft.GraphQLCodeGen.pdb">
111111
<Link>bin\Tocsoft.GraphQLCodeGen.pdb</Link>
112112
</Content>
113-
<Content Include=".npmrc" />
114113
<Content Include="package.json" />
115114
<Content Include="README.md" />
116115
</ItemGroup>

Tocsoft.GraphQLCodeGen.Npm/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ if (hasFullDotNet) {
3737
}
3838
} else {
3939
if (isDevMode) {
40-
binaryPath = __dirname + '../Tocsoft.GraphQLCodeGen.Cli/bin/debug/netcoreapp1.0/Tocsoft.GraphQLCodeGen.Cli.dll';
40+
binaryPath = __dirname + '../Tocsoft.GraphQLCodeGen.Cli/bin/debug/netcoreapp2.0/Tocsoft.GraphQLCodeGen.Cli.dll';
4141
} else {
42-
binaryPath = __dirname + '/binaries/netcoreapp1.0/Tocsoft.GraphQLCodeGen.Cli.dll';
42+
binaryPath = __dirname + '/binaries/netcoreapp2.0/Tocsoft.GraphQLCodeGen.Cli.dll';
4343
}
4444
}
4545

build.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ PUSHD Tocsoft.GraphQLCodeGen.Npm
2424
REM lets copy the published files from the release folders into a binaries folder ready from publish
2525

2626
xcopy ..\Tocsoft.GraphQLCodeGen.Cli\bin\Release\net461\publish binaries\net461 /IYS
27-
xcopy ..\Tocsoft.GraphQLCodeGen.Cli\bin\Release\netcoreapp1.0\publish binaries\netcoreapp1.0 /IYS
27+
xcopy ..\Tocsoft.GraphQLCodeGen.Cli\bin\Release\netcoreapp2.0\publish binaries\netcoreapp2.0 /IYS
2828

2929
call npm version 0.0.1
3030
if not "%GitVersion_NuGetVersion%" == "" (
@@ -37,7 +37,7 @@ call npm pack
3737

3838
call npm version 0.0.1
3939
call npm version "1.0.0"
40-
xcopy tocsoft.graphql-codegen-*.tgz ..\artifacts /Y
40+
xcopy tocsoft.graphql-codegen-*.tgz ..\artifacts\ /Y
4141

4242
REM cleanup and delete build artifacts again
4343
del tocsoft.graphql-codegen-*.tgz

0 commit comments

Comments
 (0)