Skip to content

Commit 309f4f6

Browse files
brettfobrettfo
authored
Merge pull request #3989 from brettfo/nuspec-paths
normalize backslashes in .nuspec files
2 parents a0f4537 + ea75c3c commit 309f4f6

File tree

8 files changed

+91
-91
lines changed

8 files changed

+91
-91
lines changed

‎src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.netcore.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
</dependencies>
3939
</metadata>
4040
<files>
41-
<file src="FSharp.Compiler.Private.dll" target="lib/netstandard1.6" />
41+
<file src="FSharp.Compiler.Private.dll" target="lib\netstandard1.6" />
4242
</files>
4343
</package>

‎src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
</group>
3939
</dependencies>
4040
<contentFiles>
41-
<files include="any/any/default.win32manifest" buildAction="Content" copyToOutput="true" flatten="false" />
42-
<files include="any/any/Microsoft.FSharp.Targets" buildAction="Content" copyToOutput="true" flatten="false" />
43-
<files include="any/any/Microsoft.Portable.FSharp.targets" buildAction="Content" copyToOutput="true" flatten="false" />
44-
<files include="any/any/Microsoft.FSharp.NetSdk.targets" buildAction="Content" copyToOutput="true" flatten="false" />
45-
<files include="any/any/Microsoft.FSharp.NetSdk.props" buildAction="Content" copyToOutput="true" flatten="false" />
41+
<files include="any\any\default.win32manifest" buildAction="Content" copyToOutput="true" flatten="false" />
42+
<files include="any\any\Microsoft.FSharp.Targets" buildAction="Content" copyToOutput="true" flatten="false" />
43+
<files include="any\any\Microsoft.Portable.FSharp.targets" buildAction="Content" copyToOutput="true" flatten="false" />
44+
<files include="any\any\Microsoft.FSharp.NetSdk.targets" buildAction="Content" copyToOutput="true" flatten="false" />
45+
<files include="any\any\Microsoft.FSharp.NetSdk.props" buildAction="Content" copyToOutput="true" flatten="false" />
4646
</contentFiles>
4747
</metadata>
4848
<files>
@@ -54,16 +54,16 @@
5454
tools, build and runtime/native make unnecessary copies.
5555
this approach gives a very small deployment. Which is kind of necessary.
5656
-->
57-
<file src="fsc.exe" target="lib/netstandard1.6" />
58-
<file src="fsi.exe" target="lib/netstandard1.6" />
59-
<file src="FSharp.Core.dll" target="lib/netstandard1.6" />
60-
<file src="FSharp.Compiler.Private.dll" target="lib/netstandard1.6" />
61-
<file src="FSharp.Build.dll" target="lib/netstandard1.6" />
62-
<file src="FSharp.Compiler.Interactive.Settings.dll" target="lib/netstandard1.6" />
63-
<file src="default.win32manifest" target="contentFiles/any/any/" />
64-
<file src="Microsoft.FSharp.Targets" target="contentFiles/any/any/" />
65-
<file src="Microsoft.Portable.FSharp.Targets" target="contentFiles/any/any/" />
66-
<file src="Microsoft.FSharp.NetSdk.targets" target="contentFiles/any/any/" />
67-
<file src="Microsoft.FSharp.NetSdk.props" target="contentFiles/any/any/" />
57+
<file src="fsc.exe" target="lib\netstandard1.6" />
58+
<file src="fsi.exe" target="lib\netstandard1.6" />
59+
<file src="FSharp.Core.dll" target="lib\netstandard1.6" />
60+
<file src="FSharp.Compiler.Private.dll" target="lib\netstandard1.6" />
61+
<file src="FSharp.Build.dll" target="lib\netstandard1.6" />
62+
<file src="FSharp.Compiler.Interactive.Settings.dll" target="lib\netstandard1.6" />
63+
<file src="default.win32manifest" target="contentFiles\any\any" />
64+
<file src="Microsoft.FSharp.Targets" target="contentFiles\any\any" />
65+
<file src="Microsoft.Portable.FSharp.Targets" target="contentFiles\any\any" />
66+
<file src="Microsoft.FSharp.NetSdk.targets" target="contentFiles\any\any" />
67+
<file src="Microsoft.FSharp.NetSdk.props" target="contentFiles\any\any" />
6868
</files>
6969
</package>

‎src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuspec‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646
tools, build and runtime/native make unnecessary copies.
4747
this approach gives a very small deployment. Which is kind of necessary.
4848
-->
49-
<file src="fsc.exe" target="lib/netstandard1.6" />
50-
<file src="fsi.exe" target="lib/netstandard1.6" />
51-
<file src="FSharp.Core.dll" target="lib/netstandard1.6" />
52-
<file src="FSharp.Compiler.Private.dll" target="lib/netstandard1.6" />
53-
<file src="FSharp.Build.dll" target="lib/netstandard1.6" />
54-
<file src="FSharp.Compiler.Interactive.Settings.dll" target="lib/netstandard1.6" />
55-
<file src="default.win32manifest" target="runtimes/any/native" />
56-
<file src="Microsoft.FSharp.Targets" target="runtimes/any/native" />
57-
<file src="Microsoft.Portable.FSharp.Targets" target="runtimes/any/native" />
58-
<file src="Microsoft.FSharp.NetSdk.targets" target="runtimes/any/native" />
59-
<file src="Microsoft.FSharp.NetSdk.props" target="runtimes/any/native" />
49+
<file src="fsc.exe" target="lib\netstandard1.6" />
50+
<file src="fsi.exe" target="lib\netstandard1.6" />
51+
<file src="FSharp.Core.dll" target="lib\netstandard1.6" />
52+
<file src="FSharp.Compiler.Private.dll" target="lib\netstandard1.6" />
53+
<file src="FSharp.Build.dll" target="lib\netstandard1.6" />
54+
<file src="FSharp.Compiler.Interactive.Settings.dll" target="lib\netstandard1.6" />
55+
<file src="default.win32manifest" target="runtimes\any\native" />
56+
<file src="Microsoft.FSharp.Targets" target="runtimes\any\native" />
57+
<file src="Microsoft.Portable.FSharp.Targets" target="runtimes\any\native" />
58+
<file src="Microsoft.FSharp.NetSdk.targets" target="runtimes\any\native" />
59+
<file src="Microsoft.FSharp.NetSdk.props" target="runtimes\any\native" />
6060
</files>
6161
</package>

‎src/fsharp/FSharp.Core.Unittests/FSharp.Core/SampleTuples/Microsoft.FSharp.TupleSample.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</dependencies>
1818
</metadata>
1919
<files>
20-
<file src="lib/netstandard1.1/TupleSample.dll" target="lib/netstandard1.1" />
21-
<file src="lib/portable-net40+sl4+win8+wp8/TupleSample.dll" target="lib/portable-net40+sl4+win8+wp8" />
20+
<file src="lib\netstandard1.1\TupleSample.dll" target="lib\netstandard1.1" />
21+
<file src="lib\portable-net40+sl4+win8+wp8\TupleSample.dll" target="lib\portable-net40+sl4+win8+wp8" />
2222
</files>
2323
</package>

‎src/fsharp/FSharp.Core.nuget/FSharp.Core.4.1.xxx.nuspec‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -71,56 +71,56 @@
7171
</dependencies>
7272
</metadata>
7373
<files>
74-
<file src="profiles/net20/FSharp.Core.dll" target="lib/net20/" />
75-
<file src="profiles/net20/FSharp.Core.sigdata" target="lib/net20/" />
76-
<file src="profiles/net20/FSharp.Core.optdata" target="lib/net20/" />
77-
<file src="profiles/net20/FSharp.Core.xml" target="lib/net20/" />
74+
<file src="profiles\net20\FSharp.Core.dll" target="lib\net20\" />
75+
<file src="profiles\net20\FSharp.Core.sigdata" target="lib\net20\" />
76+
<file src="profiles\net20\FSharp.Core.optdata" target="lib\net20\" />
77+
<file src="profiles\net20\FSharp.Core.xml" target="lib\net20\" />
7878

79-
<file src="profiles/net40/FSharp.Core.dll" target="lib/net40/" />
80-
<file src="profiles/net40/FSharp.Core.sigdata" target="lib/net40/" />
81-
<file src="profiles/net40/FSharp.Core.optdata" target="lib/net40/" />
82-
<file src="profiles/net40/FSharp.Core.xml" target="lib/net40/" />
79+
<file src="profiles\net40\FSharp.Core.dll" target="lib\net40\" />
80+
<file src="profiles\net40\FSharp.Core.sigdata" target="lib\net40\" />
81+
<file src="profiles\net40\FSharp.Core.optdata" target="lib\net40\" />
82+
<file src="profiles\net40\FSharp.Core.xml" target="lib\net40\" />
8383

84-
<file src="net40/bin/FSharp.Core.dll" target="lib/net45/" />
85-
<file src="net40/bin/FSharp.Core.sigdata" target="lib/net45/" />
86-
<file src="net40/bin/FSharp.Core.optdata" target="lib/net45/" />
87-
<file src="net40/bin/FSharp.Core.xml" target="lib/net45/" />
84+
<file src="net40\bin\FSharp.Core.dll" target="lib\net45" />
85+
<file src="net40\bin\FSharp.Core.sigdata" target="lib\net45" />
86+
<file src="net40\bin\FSharp.Core.optdata" target="lib\net45" />
87+
<file src="net40\bin\FSharp.Core.xml" target="lib\net45" />
8888

89-
<file src="coreclr/bin/FSharp.Core.dll" target="lib/netstandard1.6/" />
90-
<file src="coreclr/bin/FSharp.Core.sigdata" target="lib/netstandard1.6/" />
91-
<file src="coreclr/bin/FSharp.Core.optdata" target="lib/netstandard1.6/" />
92-
<file src="coreclr/bin/FSharp.Core.xml" target="lib/netstandard1.6/" />
93-
<file src="coreclr/bin/FSharp.Core.sigdata" target="runtimes/any/native/" />
94-
<file src="coreclr/bin/FSharp.Core.optdata" target="runtimes/any/native/" />
89+
<file src="coreclr\bin\FSharp.Core.dll" target="lib\netstandard1.6" />
90+
<file src="coreclr\bin\FSharp.Core.sigdata" target="lib\netstandard1.6" />
91+
<file src="coreclr\bin\FSharp.Core.optdata" target="lib\netstandard1.6" />
92+
<file src="coreclr\bin\FSharp.Core.xml" target="lib\netstandard1.6" />
93+
<file src="coreclr\bin\FSharp.Core.sigdata" target="runtimes\any\native" />
94+
<file src="coreclr\bin\FSharp.Core.optdata" target="runtimes\any\native" />
9595

96-
<file src="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.dll" target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
97-
<file src="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.sigdata" target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
98-
<file src="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.optdata" target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
99-
<file src="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/FSharp.Core.xml" target="lib/portable-net45+monoandroid10+monotouch10+xamarinios10/" />
96+
<file src="profiles\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll" target="lib\portable-net45+monoandroid10+monotouch10+xamarinios10" />
97+
<file src="profiles\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.sigdata" target="lib\portable-net45+monoandroid10+monotouch10+xamarinios10" />
98+
<file src="profiles\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.optdata" target="lib\portable-net45+monoandroid10+monotouch10+xamarinios10" />
99+
<file src="profiles\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.xml" target="lib\portable-net45+monoandroid10+monotouch10+xamarinios10" />
100100

101-
<file src="profiles/portable-net45+netcore45/FSharp.Core.dll" target="lib/portable-net45+netcore45/" />
102-
<file src="profiles/portable-net45+netcore45/FSharp.Core.sigdata" target="lib/portable-net45+netcore45/" />
103-
<file src="profiles/portable-net45+netcore45/FSharp.Core.optdata" target="lib/portable-net45+netcore45/" />
104-
<file src="profiles/portable-net45+netcore45/FSharp.Core.xml" target="lib/portable-net45+netcore45/" />
101+
<file src="profiles\portable-net45+netcore45\FSharp.Core.dll" target="lib\portable-net45+netcore45" />
102+
<file src="profiles\portable-net45+netcore45\FSharp.Core.sigdata" target="lib\portable-net45+netcore45" />
103+
<file src="profiles\portable-net45+netcore45\FSharp.Core.optdata" target="lib\portable-net45+netcore45" />
104+
<file src="profiles\portable-net45+netcore45\FSharp.Core.xml" target="lib\portable-net45+netcore45" />
105105

106-
<file src="profiles/portable-net45+netcore45+wp8/FSharp.Core.dll" target="lib/portable-net45+netcore45+wp8/" />
107-
<file src="profiles/portable-net45+netcore45+wp8/FSharp.Core.sigdata" target="lib/portable-net45+netcore45+wp8/" />
108-
<file src="profiles/portable-net45+netcore45+wp8/FSharp.Core.optdata" target="lib/portable-net45+netcore45+wp8/" />
109-
<file src="profiles/portable-net45+netcore45+wp8/FSharp.Core.xml" target="lib/portable-net45+netcore45+wp8/" />
106+
<file src="profiles\portable-net45+netcore45+wp8\FSharp.Core.dll" target="lib\portable-net45+netcore45+wp8" />
107+
<file src="profiles\portable-net45+netcore45+wp8\FSharp.Core.sigdata" target="lib\portable-net45+netcore45+wp8" />
108+
<file src="profiles\portable-net45+netcore45+wp8\FSharp.Core.optdata" target="lib\portable-net45+netcore45+wp8" />
109+
<file src="profiles\portable-net45+netcore45+wp8\FSharp.Core.xml" target="lib\portable-net45+netcore45+wp8" />
110110

111-
<file src="profiles/portable-net45+netcore45+wpa81+wp8/FSharp.Core.dll" target="lib/portable-net45+netcore45+wpa81+wp8/" />
112-
<file src="profiles/portable-net45+netcore45+wpa81+wp8/FSharp.Core.sigdata" target="lib/portable-net45+netcore45+wpa81+wp8/" />
113-
<file src="profiles/portable-net45+netcore45+wpa81+wp8/FSharp.Core.optdata" target="lib/portable-net45+netcore45+wpa81+wp8/" />
114-
<file src="profiles/portable-net45+netcore45+wpa81+wp8/FSharp.Core.xml" target="lib/portable-net45+netcore45+wpa81+wp8/" />
111+
<file src="profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll" target="lib\portable-net45+netcore45+wpa81+wp8" />
112+
<file src="profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.sigdata" target="lib\portable-net45+netcore45+wpa81+wp8" />
113+
<file src="profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.optdata" target="lib\portable-net45+netcore45+wpa81+wp8" />
114+
<file src="profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.xml" target="lib\portable-net45+netcore45+wpa81+wp8" />
115115

116-
<file src="profiles/portable-net45+sl5+netcore45/FSharp.Core.dll" target="lib/portable-net45+sl5+netcore45/" />
117-
<file src="profiles/portable-net45+sl5+netcore45/FSharp.Core.sigdata" target="lib/portable-net45+sl5+netcore45/" />
118-
<file src="profiles/portable-net45+sl5+netcore45/FSharp.Core.optdata" target="lib/portable-net45+sl5+netcore45/" />
119-
<file src="profiles/portable-net45+sl5+netcore45/FSharp.Core.xml" target="lib/portable-net45+sl5+netcore45/" />
116+
<file src="profiles\portable-net45+sl5+netcore45\FSharp.Core.dll" target="lib\portable-net45+sl5+netcore45" />
117+
<file src="profiles\portable-net45+sl5+netcore45\FSharp.Core.sigdata" target="lib\portable-net45+sl5+netcore45" />
118+
<file src="profiles\portable-net45+sl5+netcore45\FSharp.Core.optdata" target="lib\portable-net45+sl5+netcore45" />
119+
<file src="profiles\portable-net45+sl5+netcore45\FSharp.Core.xml" target="lib\portable-net45+sl5+netcore45" />
120120

121-
<file src="profiles/xamarinmac20/FSharp.Core.dll" target="lib/xamarinmac20/" />
122-
<file src="profiles/xamarinmac20/FSharp.Core.sigdata" target="lib/xamarinmac20/" />
123-
<file src="profiles/xamarinmac20/FSharp.Core.optdata" target="lib/xamarinmac20/" />
124-
<file src="profiles/xamarinmac20/FSharp.Core.xml" target="lib/xamarinmac20/" />
121+
<file src="profiles\xamarinmac20\FSharp.Core.dll" target="lib\xamarinmac20" />
122+
<file src="profiles\xamarinmac20\FSharp.Core.sigdata" target="lib\xamarinmac20" />
123+
<file src="profiles\xamarinmac20\FSharp.Core.optdata" target="lib\xamarinmac20" />
124+
<file src="profiles\xamarinmac20\FSharp.Core.xml" target="lib\xamarinmac20" />
125125
</files>
126126
</package>

‎src/fsharp/FSharp.Core.nuget/FSharp.Core.4.2.xxx.nuspec‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@
5252
</dependencies>
5353
</metadata>
5454
<files>
55-
<file src="coreclr/bin/FSharp.Core.dll" target="lib/netstandard1.6/" />
56-
<file src="coreclr/bin/FSharp.Core.sigdata" target="lib/netstandard1.6/" />
57-
<file src="coreclr/bin/FSharp.Core.optdata" target="lib/netstandard1.6/" />
58-
<file src="coreclr/bin/FSharp.Core.xml" target="lib/netstandard1.6/" />
55+
<file src="coreclr\bin\FSharp.Core.dll" target="lib\netstandard1.6" />
56+
<file src="coreclr\bin\FSharp.Core.sigdata" target="lib\netstandard1.6" />
57+
<file src="coreclr\bin\FSharp.Core.optdata" target="lib\netstandard1.6" />
58+
<file src="coreclr\bin\FSharp.Core.xml" target="lib\netstandard1.6" />
5959

60-
<file src="net40/bin/FSharp.Core.dll" target="lib/net45/" />
61-
<file src="net40/bin/FSharp.Core.sigdata" target="lib/net45/" />
62-
<file src="net40/bin/FSharp.Core.optdata" target="lib/net45/" />
63-
<file src="net40/bin/FSharp.Core.xml" target="lib/net45/" />
60+
<file src="net40\bin\FSharp.Core.dll" target="lib\net45" />
61+
<file src="net40\bin\FSharp.Core.sigdata" target="lib\net45" />
62+
<file src="net40\bin\FSharp.Core.optdata" target="lib\net45" />
63+
<file src="net40\bin\FSharp.Core.xml" target="lib\net45" />
6464

6565
</files>
6666
</package>

‎src/fsharp/FSharp.Core.nuget/Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
<dependencies></dependencies>
1515
</metadata>
1616
<files>
17-
<file src="profiles/net20/**/**" target="lib/" />
18-
<file src="profiles/net40/**/**" target="lib/" />
19-
<file src="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/**/**" target="lib/" />
20-
<file src="profiles/portable-net45+netcore45/**/**" target="lib/" />
21-
<file src="profiles/portable-net45+netcore45+wp8/**/**" target="lib/" />
22-
<file src="profiles/portable-net45+netcore45+wpa81+wp8/**/**" target="lib/" />
23-
<file src="profiles/portable-net45+sl5+netcore45/**/**" target="lib/" />
24-
<file src="profiles/xamarinmac20/**/**" target="lib/" />
17+
<file src="profiles\net20\**\**" target="lib" />
18+
<file src="profiles\net40\**\**" target="lib" />
19+
<file src="profiles\portable-net45+monoandroid10+monotouch10+xamarinios10\**\**" target="lib" />
20+
<file src="profiles\portable-net45+netcore45\**\**" target="lib" />
21+
<file src="profiles\portable-net45+netcore45+wp8\**\**" target="lib" />
22+
<file src="profiles\portable-net45+netcore45+wpa81+wp8\**\**" target="lib" />
23+
<file src="profiles\portable-net45+sl5+netcore45\**\**" target="lib" />
24+
<file src="profiles\xamarinmac20\**\**" target="lib" />
2525

2626
</files>
2727
</package>

‎src/fsharp/FSharp.Core/Testing.FSharp.Core.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
</dependencies>
4343
</metadata>
4444
<files>
45-
<file src="FSharp.Core.dll" target="lib/netstandard1.6" />
46-
<file src="FSharp.Core.xml" target="lib/netstandard1.6" />
47-
<file src="FSharp.Core.runtimeconfig.json" target="lib/netstandard1.6" />
45+
<file src="FSharp.Core.dll" target="lib\netstandard1.6" />
46+
<file src="FSharp.Core.xml" target="lib\netstandard1.6" />
47+
<file src="FSharp.Core.runtimeconfig.json" target="lib\netstandard1.6" />
4848
</files>
4949
</package>

0 commit comments

Comments
 (0)