Skip to content

Commit e7b4d06

Browse files
authored
Merge pull request #217 from joshcampbell191/patch-1
Added support for installing XrmDefinitelyTyped as a PackageReference
2 parents 9762b27 + 203560d commit e7b4d06

2 files changed

Lines changed: 19 additions & 8 deletions

File tree

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3-
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>@project@</id>
55
<version>@build.number@</version>
66
<authors>@authors@</authors>
@@ -11,17 +11,28 @@
1111
<iconUrl>https://raw.githubusercontent.com/delegateas/delegateas.github.io/master/img/XrmDefinitelyTyped-sticker_small.png</iconUrl>
1212
<projectUrl>http://delegateas.github.io/</projectUrl>
1313
<releaseNotes>@releaseNotes@</releaseNotes>
14-
<copyright>@copyright@</copyright>
14+
<copyright>@copyright@</copyright>
1515
<tags>@tags@</tags>
16+
<contentFiles>
17+
<files include="any\any\XrmDefinitelyTyped\*.*" buildAction="Content" />
18+
</contentFiles>
1619
@dependencies@
1720
@references@
1821
</metadata>
1922
<files>
23+
<!-- content -->
2024
<file src="..\files\Run.ps1" target="content\XrmDefinitelyTyped" />
2125
<file src="..\files\Run.fsx" target="content\XrmDefinitelyTyped" />
2226
<file src="..\files\XrmDefinitelyTyped.exe.config" target="content\XrmDefinitelyTyped" />
2327
<file src="..\src\XrmDefinitelyTyped\bin\Release\*.dll" target="content\XrmDefinitelyTyped" />
2428
<file src="..\src\XrmDefinitelyTyped\bin\Release\*.exe" target="content\XrmDefinitelyTyped" />
2529
<file src="..\src\XrmDefinitelyTyped\bin\Release\XrmDefinitelyTyped.xml" target="content\XrmDefinitelyTyped" />
30+
<!-- contentFiles -->
31+
<file src="..\files\Run.ps1" target="contentFiles\any\any\XrmDefinitelyTyped" />
32+
<file src="..\files\Run.fsx" target="contentFiles\any\any\XrmDefinitelyTyped" />
33+
<file src="..\files\XrmDefinitelyTyped.exe.config" target="contentFiles\any\any\XrmDefinitelyTyped" />
34+
<file src="..\src\XrmDefinitelyTyped\bin\Release\*.dll" target="contentFiles\any\any\XrmDefinitelyTyped" />
35+
<file src="..\src\XrmDefinitelyTyped\bin\Release\*.exe" target="contentFiles\any\any\XrmDefinitelyTyped" />
36+
<file src="..\src\XrmDefinitelyTyped\bin\Release\XrmDefinitelyTyped.xml" target="contentFiles\any\any\XrmDefinitelyTyped" />
2637
</files>
27-
</package>
38+
</package>

src/XrmDefinitelyTyped/XrmDefinitelyTyped.fsproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@
101101
<None Include="paket.references" />
102102
<None Include="App.config" />
103103
<None Include="EnvInfo.config" />
104-
<Content Include="bin\Release\$(TargetFramework)\*.dll" Pack="true" PackagePath="content\XrmDefinitelyTyped" />
105-
<Content Include="bin\Release\$(TargetFramework)\*.exe" Pack="true" PackagePath="content\XrmDefinitelyTyped" />
106-
<Content Include="bin\Release\$(TargetFramework)\XrmDefinitelyTyped.xml" Pack="true" PackagePath="content\XrmDefinitelyTyped" />
107-
<Content Include="..\..\files\*" Pack="true" PackagePath="content\XrmDefinitelyTyped" />
104+
<Content Include="bin\Release\$(TargetFramework)\*.dll" Pack="true" PackagePath="content\XrmDefinitelyTyped;contentFiles\any\any\XrmDefinitelyTyped" />
105+
<Content Include="bin\Release\$(TargetFramework)\*.exe" Pack="true" PackagePath="content\XrmDefinitelyTyped;contentFiles\any\any\XrmDefinitelyTyped" />
106+
<Content Include="bin\Release\$(TargetFramework)\XrmDefinitelyTyped.xml" Pack="true" PackagePath="content\XrmDefinitelyTyped;contentFiles\any\any\XrmDefinitelyTyped" />
107+
<Content Include="..\..\files\*" Pack="true" PackagePath="content\XrmDefinitelyTyped;contentFiles\any\any\XrmDefinitelyTyped" />
108108
<None Include="package.json" />
109109
<None Include="tsconfig.json" />
110110
<None Include="gulpfile.js" />
@@ -133,4 +133,4 @@
133133
<Exec Command="npm install" />
134134
<Exec Command="npm start" />
135135
</Target>
136-
</Project>
136+
</Project>

0 commit comments

Comments
 (0)