Skip to content

Commit cecd341

Browse files
Updated JSON.NET, updated version numbers
1 parent 72ab317 commit cecd341

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

EditorExtensions/Source.extension.vsixmanifest

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
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">
33
<Metadata>
4-
<Identity Id="5fb7364d-2e8c-44a4-95eb-2a382e30fec8" Version="2.4" Language="en-US" Publisher="Mads Kristensen" />
5-
<DisplayName>Web Essentials 2013 for Update 4 RC</DisplayName>
4+
<Identity Id="5fb7364d-2e8c-44a4-95eb-2a382e30fec8" Version="2.5" Language="en-US" Publisher="Mads Kristensen" />
5+
<DisplayName>Web Essentials 2013 for Update 4</DisplayName>
66
<Description xml:space="preserve">Adds many useful features to Visual Studio for web developers. Requires VS2013 Update 4 RC</Description>
77
<MoreInfo>http://vswebessentials.com/</MoreInfo>
88
<License>License.txt</License>
99
<GettingStartedGuide>http://vswebessentials.com/changelog</GettingStartedGuide>
1010
<ReleaseNotes>http://vswebessentials.com/changelog</ReleaseNotes>
1111
<Icon>Resources/Images/WebEssentials2012logo.png</Icon>
1212
<PreviewImage>Resources/Images/preview.png</PreviewImage>
13-
<Tags>css, javascript, html, less, coffeescript, json</Tags>
13+
<Tags>css, javascript, html, less, coffeescript, json, sass, scss, sweetjs</Tags>
1414
</Metadata>
1515
<Installation InstalledByMsi="false">
16-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="12.0.31010" />
17-
<InstallationTarget Id="Microsoft.VisualStudio.VWDExpress" Version="12.0.31010" />
16+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="12.0.31101" />
1817
</Installation>
1918
<Dependencies>
2019
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />

EditorExtensions/WebEssentials2013.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@
195195
<SpecificVersion>False</SpecificVersion>
196196
<HintPath>$(DevEnvDir)\CommonExtensions\Microsoft\Web\Editor\Microsoft.Web.Editor.dll</HintPath>
197197
</Reference>
198-
<Reference Include="Newtonsoft.Json, Version=6.0.5.17707, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
198+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
199199
<SpecificVersion>False</SpecificVersion>
200-
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
200+
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
201201
</Reference>
202202
<Reference Include="PresentationCore" />
203203
<Reference Include="PresentationFramework" />
@@ -1033,7 +1033,7 @@
10331033
<Content Include="Resources\nodejs\tools\**" Exclude="&#xD;&#xA; **\node-sass\**; **\less\**; &#xD;&#xA; **\mocha\**; **\jade\**; &#xD;&#xA; **\*.md; **\*.markdown; **\*.html; **\*.txt; **\LICENSE; **\README; **\CHANGELOG; **\CNAME; **\*.old; **\*.patch; **\*.ico; &#xD;&#xA; **\*.json; **\.*; **\Makefile.*; **\Rakefile; **\*.yml; &#xD;&#xA; **\test.*; **\generate-*; &#xD;&#xA; **\*.min.js; **\*-min.js; &#xD;&#xA; **\media\**; **\images\**; **\man\**; &#xD;&#xA; **\.bin\**; **\benchmark\**; **\build\**; **\scripts\**; &#xD;&#xA; **\vendor\**; &#xD;&#xA; **\test\**; **\tst\**; **\tests\**; **\testing\**; &#xD;&#xA; **\examples\**; **\example\**; **\tools\**\tools\**">
10341034
<IncludeInVSIX>true</IncludeInVSIX>
10351035
</Content>
1036-
<Content Include="Resources\nodejs\tools\node_modules\node-sass\sass.js; Resources\nodejs\tools\node_modules\node-sass\bin\node-sass; Resources\nodejs\tools\node_modules\node-sass\lib\**; Resources\nodejs\tools\node_modules\node-sass\bin\win32-ia32-*\**; Resources\nodejs\tools\node_modules\tslint\**; Resources\nodejs\tools\node_modules\jscs\**; Resources\nodejs\tools\node_modules\coffeelint\**; Resources\nodejs\tools\node_modules\rtlcss\lib\**; Resources\nodejs\tools\node_modules\rtlcss\bin\rtlcss.js;">
1036+
<Content Include="Resources\nodejs\tools\node_modules\node-sass\index.js; Resources\nodejs\tools\node_modules\node-sass\bin\node-sass; Resources\nodejs\tools\node_modules\node-sass\lib\**; Resources\nodejs\tools\node_modules\node-sass\bin\win32-ia32-*\**; Resources\nodejs\tools\node_modules\tslint\**; Resources\nodejs\tools\node_modules\jscs\**; Resources\nodejs\tools\node_modules\coffeelint\**; Resources\nodejs\tools\node_modules\rtlcss\lib\**; Resources\nodejs\tools\node_modules\rtlcss\bin\rtlcss.js;">
10371037
<IncludeInVSIX>true</IncludeInVSIX>
10381038
</Content>
10391039
<Content Include="Resources\nodejs\tools\node_modules\less\lib\**; Resources\nodejs\tools\node_modules\less\bin\**">

EditorExtensions/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="AjaxMin" version="5.11.5295.12309" targetFramework="net451" />
44
<package id="ConfOxide" version="1.4.0.0" targetFramework="net451" />
55
<package id="Minimatch" version="1.1.0" targetFramework="net451" />
6-
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net451" />
6+
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net451" />
77
<package id="Pri.LongPath" version="1.2.2" targetFramework="net451" />
88
<package id="TransientFaultHandling.Core" version="5.1.1209.1" targetFramework="net451" />
99
<package id="WebMarkupMin.Core" version="0.9.8" targetFramework="net451" />

0 commit comments

Comments
 (0)