Skip to content

Commit 3616d3b

Browse files
dungpadungpa
committed
Release NuGet package and VS extension 1.0.5
1 parent 1094078 commit 3616d3b

File tree

7 files changed

+243
-30
lines changed

7 files changed

+243
-30
lines changed

‎src/Fantomas.Cmd/AssemblyInfo.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ open System.Resources
66
open System.Runtime.CompilerServices
77
open System.Runtime.InteropServices
88

9-
let [<Literal>] version = "1.0.4"
9+
let [<Literal>] version = "1.0.5"
1010

1111
// Version information
1212
[<assembly: AssemblyVersion(version)>]

‎src/Fantomas.VisualStudio/Fantomas.VisualStudio.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@
130130
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
131131
<IncludeInVSIX>true</IncludeInVSIX>
132132
</Content>
133+
<Content Include="LICENSE.txt">
134+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
135+
<IncludeInVSIX>true</IncludeInVSIX>
136+
</Content>
133137
</ItemGroup>
134138
<PropertyGroup>
135139
<UseCodebase>true</UseCodebase>

‎src/Fantomas.VisualStudio/Fantomas.VisualStudio.v12.csproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
<WarningLevel>4</WarningLevel>
4949
</PropertyGroup>
5050
<ItemGroup>
51-
<Reference Include="FSharp.Compiler.Editor, Version=4.3.0.0, Culture=neutral, PublicKeyToken=f536804aa0eb945b, processorArchitecture=MSIL">
51+
<Reference Include="FSharp.Compiler.Service, Version=0.0.2.0, Culture=neutral, processorArchitecture=MSIL">
5252
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\packages\FSharp.Compiler.Editor.1.0.7\lib\net40\FSharp.Compiler.Editor.dll</HintPath>
53+
<HintPath>..\packages\FSharp.Compiler.Service.0.0.2-alpha\lib\net40\FSharp.Compiler.Service.dll</HintPath>
5454
</Reference>
5555
<Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5656
</Reference>
@@ -111,9 +111,7 @@
111111
<Compile Include="Utils\TextUtils.cs" />
112112
</ItemGroup>
113113
<ItemGroup>
114-
<None Include="packages.config">
115-
<SubType>Designer</SubType>
116-
</None>
114+
<None Include="packages.config" />
117115
<None Include="source.extension.vsixmanifest">
118116
<SubType>Designer</SubType>
119117
</None>
@@ -133,6 +131,10 @@
133131
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
134132
<IncludeInVSIX>true</IncludeInVSIX>
135133
</Content>
134+
<Content Include="LICENSE.txt">
135+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
136+
<IncludeInVSIX>true</IncludeInVSIX>
137+
</Content>
136138
</ItemGroup>
137139
<PropertyGroup>
138140
<UseCodebase>true</UseCodebase>

‎src/Fantomas.VisualStudio/LICENSE.txt

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [2013-2014] [Anh-Dung Phan, Gustavo Guerra]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎src/Fantomas.VisualStudio/source.extension.vsixmanifest

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
3-
<Metadata>
4-
<Identity Id="Fantomas.Hestia.d4101bb1-9731-4577-bdec-7d088dce2136" Version="1.0.4" Language="en-US" Publisher="Anh-Dung Phan, Gustavo Guerra, Ivan Towlson" />
5-
<DisplayName>Fantomas</DisplayName>
6-
<Description xml:space="preserve">Provides formatting commands for F# in Visual Studio</Description>
7-
<MoreInfo>http://github.com/dungpa/fantomas</MoreInfo>
8-
<Icon>fsharp_logo.png</Icon>
9-
<Tags>formatting, indentation, beautifier, fsharp, editing</Tags>
10-
</Metadata>
11-
<Installation>
12-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="11.0" />
13-
<InstallationTarget Version="[12.0,13.0)" Id="Microsoft.VisualStudio.Pro" />
14-
</Installation>
15-
<Dependencies>
16-
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
17-
<Dependency Id="Microsoft.VisualStudio.MPF.11.0" DisplayName="Visual Studio MPF 11.0" d:Source="Installed" Version="11.0" />
18-
</Dependencies>
19-
<Assets>
20-
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
21-
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
22-
</Assets>
3+
<Metadata>
4+
<Identity Id="Fantomas.Hestia.d4101bb1-9731-4577-bdec-7d088dce2136" Version="1.0.5" Language="en-US" Publisher="Anh-Dung Phan, Gustavo Guerra, Ivan Towlson" />
5+
<DisplayName>Fantomas</DisplayName>
6+
<Description xml:space="preserve">Provides formatting commands for F# in Visual Studio</Description>
7+
<MoreInfo>http://github.com/dungpa/fantomas</MoreInfo>
8+
<License>LICENSE.txt</License>
9+
<Icon>fsharp_logo.png</Icon>
10+
<Tags>formatting, indentation, beautifier, fsharp, editing</Tags>
11+
</Metadata>
12+
<Installation>
13+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="11.0" />
14+
<InstallationTarget Version="[12.0,13.0)" Id="Microsoft.VisualStudio.Pro" />
15+
</Installation>
16+
<Dependencies>
17+
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
18+
<Dependency Id="Microsoft.VisualStudio.MPF.11.0" DisplayName="Visual Studio MPF 11.0" d:Source="Installed" Version="11.0" />
19+
</Dependencies>
20+
<Assets>
21+
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
22+
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
23+
</Assets>
2324
</PackageManifest>

‎src/Fantomas.nuspec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>Fantomas</id>
5-
<version>1.0.4</version>
5+
<version>1.0.5</version>
66
<title>Fantomas</title>
77
<authors>Anh-Dung Phan,Gustavo Guerra</authors>
88
<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
@@ -12,10 +12,14 @@
1212

1313
Some common use cases include (1) Reformatting a code base to conform a universal page width (2) Converting legacy code from verbose syntax to light syntax (3) Formatting auto-generated F# signatures.</description>
1414
<summary>Source code formatting tool for F#.</summary>
15-
<releaseNotes>Fix issues #95, #100, #101 and #103</releaseNotes>
15+
<releaseNotes>Fully support F# 3.1
16+
Compatible with F# on Mono
17+
Handle external functions
18+
Improve support of multiline strings
19+
Implement various bug fixes</releaseNotes>
1620
<tags>F# fsharp formatting beautifier indentation indenter</tags>
1721
<dependencies>
18-
<dependency id="FSharp.Compiler.Editor" version="1.0.7" />
22+
<dependency id="FSharp.Compiler.Service" />
1923
</dependencies>
2024
</metadata>
2125
<files>

‎src/Fantomas/AssemblyInfo.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ open System.Resources
66
open System.Runtime.CompilerServices
77
open System.Runtime.InteropServices
88

9-
let [<Literal>] version = "1.0.4"
9+
let [<Literal>] version = "1.0.5"
1010

1111
// Version information
1212
[<assembly: AssemblyVersion(version)>]

0 commit comments

Comments
 (0)