Skip to content

Commit 1eb36c8

Browse files
TaritsynTaritsyn
authored
NuGet: Remove a redundant code from the source code of packages (chakra-core#6670)
I just removed the redundant code from the packages. This PR relates to issue chakra-core#6586.
1 parent 1eae003 commit 1eb36c8

7 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎Build/NuGet/Windows.Cpp.All/Items.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</Link>
1212
<ClCompile>
1313
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
14-
</ClCompile>
14+
</ClCompile>
1515
</ItemDefinitionGroup>
1616
<ItemGroup Condition="'$(Configuration)' == 'Debug' And '$(Platform)' == 'arm'">
1717
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\lib\native\v140\arm\Debug\ChakraCore.dll" />

‎Build/NuGet/Windows.Cpp.All/Primary.nuspec‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,54 @@
1010
</metadata>
1111
<files>
1212
<!--Build-->
13-
<file src="Items.targets" target="build\native\$id$.targets"/>
13+
<file src="Items.targets" target="build\native\$id$.targets" />
1414

1515
<!--Include-->
16-
<file src="..\..\..\lib\Jsrt\ChakraCommon.h" target="build\native\include\ChakraCommon.h"/>
17-
<file src="..\..\..\lib\Jsrt\ChakraCommonWindows.h" target="build\native\include\ChakraCommonWindows.h"/>
18-
<file src="..\..\..\lib\Jsrt\ChakraCore.h" target="build\native\include\ChakraCore.h"/>
19-
<file src="..\..\..\lib\Jsrt\ChakraCoreWindows.h" target="build\native\include\ChakraCoreWindows.h"/>
20-
<file src="..\..\..\lib\Jsrt\ChakraDebug.h" target="build\native\include\ChakraDebug.h"/>
16+
<file src="..\..\..\lib\Jsrt\ChakraCommon.h" target="build\native\include" />
17+
<file src="..\..\..\lib\Jsrt\ChakraCommonWindows.h" target="build\native\include" />
18+
<file src="..\..\..\lib\Jsrt\ChakraCore.h" target="build\native\include" />
19+
<file src="..\..\..\lib\Jsrt\ChakraCoreWindows.h" target="build\native\include" />
20+
<file src="..\..\..\lib\Jsrt\ChakraDebug.h" target="build\native\include" />
2121

2222
<!--Lib-->
23-
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.dll" target="lib\native\v140\x86\release\ChakraCore.dll" />
24-
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.lib" target="lib\native\v140\x86\release\ChakraCore.lib" />
25-
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.pdb" target="lib\native\v140\x86\release\ChakraCore.pdb" />
26-
<file src="..\..\VcBuild\bin\x86_release\ch.exe" target="lib\native\v140\x86\release\ch.exe" />
27-
<file src="..\..\VcBuild\bin\x86_release\ch.pdb" target="lib\native\v140\x86\release\ch.pdb" />
23+
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.dll" target="lib\native\v140\x86\release" />
24+
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.lib" target="lib\native\v140\x86\release" />
25+
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.pdb" target="lib\native\v140\x86\release" />
26+
<file src="..\..\VcBuild\bin\x86_release\ch.exe" target="lib\native\v140\x86\release" />
27+
<file src="..\..\VcBuild\bin\x86_release\ch.pdb" target="lib\native\v140\x86\release" />
2828

2929
<!--Copying Release to Debug for now to save on build time-->
30-
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.dll" target="lib\native\v140\x86\debug\ChakraCore.dll" />
31-
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.lib" target="lib\native\v140\x86\debug\ChakraCore.lib" />
32-
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.pdb" target="lib\native\v140\x86\debug\ChakraCore.pdb" />
33-
<file src="..\..\VcBuild\bin\x86_release\ch.exe" target="lib\native\v140\x86\debug\ch.exe" />
34-
<file src="..\..\VcBuild\bin\x86_release\ch.pdb" target="lib\native\v140\x86\debug\ch.pdb" />
30+
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.dll" target="lib\native\v140\x86\debug" />
31+
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.lib" target="lib\native\v140\x86\debug" />
32+
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.pdb" target="lib\native\v140\x86\debug" />
33+
<file src="..\..\VcBuild\bin\x86_release\ch.exe" target="lib\native\v140\x86\debug" />
34+
<file src="..\..\VcBuild\bin\x86_release\ch.pdb" target="lib\native\v140\x86\debug" />
3535

36-
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.dll" target="lib\native\v140\x64\release\ChakraCore.dll" />
37-
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.lib" target="lib\native\v140\x64\release\ChakraCore.lib" />
38-
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.pdb" target="lib\native\v140\x64\release\ChakraCore.pdb" />
39-
<file src="..\..\VcBuild\bin\x64_release\ch.exe" target="lib\native\v140\x64\release\ch.exe" />
40-
<file src="..\..\VcBuild\bin\x64_release\ch.pdb" target="lib\native\v140\x64\release\ch.pdb" />
36+
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.dll" target="lib\native\v140\x64\release" />
37+
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.lib" target="lib\native\v140\x64\release" />
38+
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.pdb" target="lib\native\v140\x64\release" />
39+
<file src="..\..\VcBuild\bin\x64_release\ch.exe" target="lib\native\v140\x64\release" />
40+
<file src="..\..\VcBuild\bin\x64_release\ch.pdb" target="lib\native\v140\x64\release" />
4141

4242
<!--Copying Release to Debug for now to save on build time-->
43-
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.dll" target="lib\native\v140\x64\debug\ChakraCore.dll" />
44-
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.lib" target="lib\native\v140\x64\debug\ChakraCore.lib" />
45-
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.pdb" target="lib\native\v140\x64\debug\ChakraCore.pdb" />
46-
<file src="..\..\VcBuild\bin\x64_release\ch.exe" target="lib\native\v140\x64\debug\ch.exe" />
47-
<file src="..\..\VcBuild\bin\x64_release\ch.pdb" target="lib\native\v140\x64\debug\ch.pdb" />
43+
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.dll" target="lib\native\v140\x64\debug" />
44+
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.lib" target="lib\native\v140\x64\debug" />
45+
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.pdb" target="lib\native\v140\x64\debug" />
46+
<file src="..\..\VcBuild\bin\x64_release\ch.exe" target="lib\native\v140\x64\debug" />
47+
<file src="..\..\VcBuild\bin\x64_release\ch.pdb" target="lib\native\v140\x64\debug" />
4848

49-
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.dll" target="lib\native\v140\arm\release\ChakraCore.dll" />
50-
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.lib" target="lib\native\v140\arm\release\ChakraCore.lib" />
51-
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.pdb" target="lib\native\v140\arm\release\ChakraCore.pdb" />
52-
<file src="..\..\VcBuild\bin\arm_release\ch.exe" target="lib\native\v140\arm\release\ch.exe" />
53-
<file src="..\..\VcBuild\bin\arm_release\ch.pdb" target="lib\native\v140\arm\release\ch.pdb" />
49+
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.dll" target="lib\native\v140\arm\release" />
50+
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.lib" target="lib\native\v140\arm\release" />
51+
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.pdb" target="lib\native\v140\arm\release" />
52+
<file src="..\..\VcBuild\bin\arm_release\ch.exe" target="lib\native\v140\arm\release" />
53+
<file src="..\..\VcBuild\bin\arm_release\ch.pdb" target="lib\native\v140\arm\release" />
5454

5555
<!--Copying Release to Debug for now to save on build time-->
56-
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.dll" target="lib\native\v140\arm\debug\ChakraCore.dll" />
57-
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.lib" target="lib\native\v140\arm\debug\ChakraCore.lib" />
58-
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.pdb" target="lib\native\v140\arm\debug\ChakraCore.pdb" />
59-
<file src="..\..\VcBuild\bin\arm_release\ch.exe" target="lib\native\v140\arm\debug\ch.exe" />
60-
<file src="..\..\VcBuild\bin\arm_release\ch.pdb" target="lib\native\v140\arm\debug\ch.pdb" />
56+
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.dll" target="lib\native\v140\arm\debug" />
57+
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.lib" target="lib\native\v140\arm\debug" />
58+
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.pdb" target="lib\native\v140\arm\debug" />
59+
<file src="..\..\VcBuild\bin\arm_release\ch.exe" target="lib\native\v140\arm\debug" />
60+
<file src="..\..\VcBuild\bin\arm_release\ch.pdb" target="lib\native\v140\arm\debug" />
6161

6262
$CommonFileElements$
6363
</files>

‎Build/NuGet/Windows.DotNet.All/Items.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Condition=" '$(TargetFramework)' == '' Or '$(TargetFramework.TrimEnd(`0123456789`))' == 'net' ">
4-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win7-x86\native\*" Condition=" '$(Platform)' == 'AnyCPU' ">
4+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win7-x86\native\*.*" Condition=" '$(Platform)' == 'AnyCPU' ">
55
<Link>x86\%(Filename)%(Extension)</Link>
66
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
77
<Visible>False</Visible>
88
</Content>
9-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win7-x64\native\*" Condition=" '$(Platform)' == 'AnyCPU' ">
9+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win7-x64\native\*.*" Condition=" '$(Platform)' == 'AnyCPU' ">
1010
<Link>x64\%(Filename)%(Extension)</Link>
1111
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1212
<Visible>False</Visible>
1313
</Content>
14-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win8-arm\native\*" Condition=" '$(Platform)' == 'AnyCPU' ">
14+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win8-arm\native\*.*" Condition=" '$(Platform)' == 'AnyCPU' ">
1515
<Link>arm\%(Filename)%(Extension)</Link>
1616
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1717
<Visible>False</Visible>
1818
</Content>
1919

20-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win7-x86\native\*" Condition=" '$(Platform)' == 'x86' ">
20+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win7-x86\native\*.*" Condition=" '$(Platform)' == 'x86' ">
2121
<Link>%(Filename)%(Extension)</Link>
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
<Visible>False</Visible>
2424
</Content>
25-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win7-x64\native\*" Condition=" '$(Platform)' == 'x64' ">
25+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win7-x64\native\*.*" Condition=" '$(Platform)' == 'x64' ">
2626
<Link>%(Filename)%(Extension)</Link>
2727
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2828
<Visible>False</Visible>
2929
</Content>
30-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win8-arm\native\*" Condition=" '$(Platform)' == 'ARM' ">
30+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win8-arm\native\*.*" Condition=" '$(Platform)' == 'ARM' ">
3131
<Link>%(Filename)%(Extension)</Link>
3232
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3333
<Visible>False</Visible>

‎Build/NuGet/Windows.DotNet.All/Primary.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
3-
<metadata minClientVersion="3.4">
3+
<metadata>
44
<id>$id$</id>
55
<version>$version$</version>
66
<description>$description$</description>
@@ -11,9 +11,9 @@
1111
<files>
1212
<file src="Items.props" target="build\$id$.props" />
1313

14-
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.dll" target="runtimes\win7-x86\native\ChakraCore.dll" />
15-
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.dll" target="runtimes\win7-x64\native\ChakraCore.dll" />
16-
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.dll" target="runtimes\win8-arm\native\ChakraCore.dll" />
14+
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.dll" target="runtimes\win7-x86\native" />
15+
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.dll" target="runtimes\win7-x64\native" />
16+
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.dll" target="runtimes\win8-arm\native" />
1717

1818
$CommonFileElements$
1919
</files>

‎Build/NuGet/Windows.DotNet.All/Symbols.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<files>
1212
<file src="Items.props" target="build\$id$.props" />
1313

14-
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.pdb" target="runtimes\win7-x86\native\ChakraCore.pdb" />
15-
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.pdb" target="runtimes\win7-x64\native\ChakraCore.pdb" />
16-
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.pdb" target="runtimes\win8-arm\native\ChakraCore.pdb" />
14+
<file src="..\..\VcBuild\bin\x86_release\ChakraCore.pdb" target="runtimes\win7-x86\native" />
15+
<file src="..\..\VcBuild\bin\x64_release\ChakraCore.pdb" target="runtimes\win7-x64\native" />
16+
<file src="..\..\VcBuild\bin\arm_release\ChakraCore.pdb" target="runtimes\win8-arm\native" />
1717

1818
$CommonFileElements$
1919
</files>

‎Build/NuGet/Windows.DotNet.Arch/Items.props.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\{{runtimeIdentifier}}\native\*">
4+
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\{{runtimeIdentifier}}\native\*.*">
55
<Link>%(Filename)%(Extension)</Link>
66
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
77
<Visible>False</Visible>

‎Build/NuGet/Windows.DotNet.Arch/Primary.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<files>
1212
<file src="Items.$platformArchitecture$.props" target="build\$id$.props" />
1313

14-
<file src="..\..\VcBuild\bin\$platformArchitecture$_release\ChakraCore.dll" target="runtimes\$runtimeIdentifier$\native\ChakraCore.dll" />
14+
<file src="..\..\VcBuild\bin\$platformArchitecture$_release\ChakraCore.dll" target="runtimes\$runtimeIdentifier$\native" />
1515

1616
$CommonFileElements$
1717
</files>

0 commit comments

Comments
 (0)