Skip to content

Commit 9d78e39

Browse files
madskristensenmadskristensen
committed
VS2017 support
1 parent 44d4622 commit 9d78e39

7 files changed

+76
-84
lines changed

‎appveyor.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
version: 1.0.{build}
2-
os: Visual Studio 2015
1+
os: Visual Studio 2017 RC
32

43
install:
54
- ps: (new-object Net.WebClient).DownloadString("https://raw.github.com/madskristensen/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex

‎lib/Microsoft.JSON.Core.dll‎

-308 KB
Binary file not shown.

‎lib/Microsoft.VisualStudio.TaskRunnerExplorer.14.0.dll‎

-17.7 KB
Binary file not shown.

‎src/WebCompilerVsix/JSON/CompilerConfigSchemaSelector.cs‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel.Composition;
4-
using System.IO;
5-
using System.Linq;
6-
using System.Reflection;
7-
using System.Threading.Tasks;
8-
using Microsoft.JSON.Core.Schema;
1+
//using System;
2+
//using System.Collections.Generic;
3+
//using System.ComponentModel.Composition;
4+
//using System.IO;
5+
//using System.Linq;
6+
//using System.Reflection;
7+
//using System.Threading.Tasks;
8+
//using Microsoft.JSON.Core.Schema;
99

10-
namespace WebCompilerVsix.JSON
11-
{
12-
[Export(typeof(IJSONSchemaSelector))]
13-
class CompilerConfigSchemaSelector : IJSONSchemaSelector
14-
{
15-
public event EventHandler AvailableSchemasChanged { add { } remove { } }
10+
//namespace WebCompilerVsix.JSON
11+
//{
12+
// [Export(typeof(IJSONSchemaSelector))]
13+
// class CompilerConfigSchemaSelector : IJSONSchemaSelector
14+
// {
15+
// public event EventHandler AvailableSchemasChanged { add { } remove { } }
1616

17-
public Task<IEnumerable<string>> GetAvailableSchemasAsync()
18-
{
19-
return Task.FromResult(Enumerable.Empty<string>());
20-
}
17+
// public Task<IEnumerable<string>> GetAvailableSchemasAsync()
18+
// {
19+
// return Task.FromResult(Enumerable.Empty<string>());
20+
// }
2121

22-
public string GetSchemaFor(string fileLocation)
23-
{
24-
string fileName = Path.GetFileName(fileLocation);
22+
// public string GetSchemaFor(string fileLocation)
23+
// {
24+
// string fileName = Path.GetFileName(fileLocation);
2525

26-
if (fileName.Equals(Constants.CONFIG_FILENAME, StringComparison.OrdinalIgnoreCase))
27-
return GetSchemaFileName("json\\compilerconfig-schema.json");
26+
// if (fileName.Equals(Constants.CONFIG_FILENAME, StringComparison.OrdinalIgnoreCase))
27+
// return GetSchemaFileName("json\\compilerconfig-schema.json");
2828

29-
if (fileName.Equals(Constants.DEFAULTS_FILENAME, StringComparison.OrdinalIgnoreCase))
30-
return GetSchemaFileName("json\\compilerdefaults-schema.json");
29+
// if (fileName.Equals(Constants.DEFAULTS_FILENAME, StringComparison.OrdinalIgnoreCase))
30+
// return GetSchemaFileName("json\\compilerdefaults-schema.json");
3131

32-
return null;
33-
}
32+
// return null;
33+
// }
3434

35-
private static string GetSchemaFileName(string relativePath)
36-
{
37-
string assembly = Assembly.GetExecutingAssembly().Location;
38-
string folder = Path.GetDirectoryName(assembly);
39-
return Path.Combine(folder, relativePath);
40-
}
41-
}
42-
}
35+
// private static string GetSchemaFileName(string relativePath)
36+
// {
37+
// string assembly = Assembly.GetExecutingAssembly().Location;
38+
// string folder = Path.GetDirectoryName(assembly);
39+
// return Path.Combine(folder, relativePath);
40+
// }
41+
// }
42+
//}

‎src/WebCompilerVsix/JSON/RelativeFilePathFormatProvider.cs‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel.Composition;
4-
using System.IO;
5-
using Microsoft.JSON.Core.Parser.TreeItems;
6-
using Microsoft.JSON.Core.Schema;
1+
//using System;
2+
//using System.Collections.Generic;
3+
//using System.ComponentModel.Composition;
4+
//using System.IO;
5+
//using Microsoft.JSON.Core.Parser.TreeItems;
6+
//using Microsoft.JSON.Core.Schema;
77

8-
namespace WebCompilerVsix.JSON
9-
{
10-
[Export(typeof(IJSONSchemaFormatHandler))]
11-
class RelativeFilePathFormatProvider : JSONSchemaFormatHandlerBase
12-
{
13-
public override string FormatName
14-
{
15-
get { return "compiler_relativepath"; }
16-
}
8+
//namespace WebCompilerVsix.JSON
9+
//{
10+
// [Export(typeof(IJSONSchemaFormatHandler))]
11+
// class RelativeFilePathFormatProvider : JSONSchemaFormatHandlerBase
12+
// {
13+
// public override string FormatName
14+
// {
15+
// get { return "compiler_relativepath"; }
16+
// }
1717

18-
public override bool HideFormatNameCompletion
19-
{
20-
get { return true; }
21-
}
18+
// public override bool HideFormatNameCompletion
19+
// {
20+
// get { return true; }
21+
// }
2222

23-
public override IEnumerable<string> GetIssues(JSONDocument doc, string canonicalizedValue)
24-
{
25-
if (string.IsNullOrEmpty(doc.DocumentLocation))
26-
yield break;
23+
// public override IEnumerable<string> GetIssues(JSONDocument doc, string canonicalizedValue)
24+
// {
25+
// if (string.IsNullOrEmpty(doc.DocumentLocation))
26+
// yield break;
2727

28-
string fileName = Path.GetFileName(doc.DocumentLocation);
28+
// string fileName = Path.GetFileName(doc.DocumentLocation);
2929

30-
if (!fileName.Equals(Constants.CONFIG_FILENAME, StringComparison.OrdinalIgnoreCase))
31-
yield break;
30+
// if (!fileName.Equals(Constants.CONFIG_FILENAME, StringComparison.OrdinalIgnoreCase))
31+
// yield break;
3232

33-
string folder = Path.GetDirectoryName(doc.DocumentLocation);
34-
string absolutePath = Path.Combine(folder, canonicalizedValue);
33+
// string folder = Path.GetDirectoryName(doc.DocumentLocation);
34+
// string absolutePath = Path.Combine(folder, canonicalizedValue);
3535

36-
if (!File.Exists(absolutePath) && !Directory.Exists(absolutePath))
37-
yield return $"The file '{canonicalizedValue}' does not exist";
38-
}
39-
}
40-
}
36+
// if (!File.Exists(absolutePath) && !Directory.Exists(absolutePath))
37+
// yield return $"The file '{canonicalizedValue}' does not exist";
38+
// }
39+
// }
40+
//}

‎src/WebCompilerVsix/WebCompilerVsix.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,6 @@
151151
<Private>False</Private>
152152
</Reference>
153153
<Reference Include="Microsoft.CSharp" />
154-
<Reference Include="Microsoft.JSON.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
155-
<SpecificVersion>False</SpecificVersion>
156-
<HintPath>..\..\lib\Microsoft.JSON.Core.dll</HintPath>
157-
<Private>False</Private>
158-
</Reference>
159154
<Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
160155
<EmbedInteropTypes>False</EmbedInteropTypes>
161156
<Private>False</Private>
@@ -194,10 +189,7 @@
194189
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
195190
<Private>False</Private>
196191
</Reference>
197-
<Reference Include="Microsoft.VisualStudio.TaskRunnerExplorer.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
198-
<SpecificVersion>False</SpecificVersion>
199-
<HintPath>..\..\lib\Microsoft.VisualStudio.TaskRunnerExplorer.14.0.dll</HintPath>
200-
</Reference>
192+
<Reference Include="Microsoft.VisualStudio.TaskRunnerExplorer.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
201193
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
202194
<Private>False</Private>
203195
</Reference>

‎src/WebCompilerVsix/source.extension.vsixmanifest‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
<Tags>Compile, LESS, Sass, Scss, CoffeeScript, JavaScript, JSX, ES6, Stylus</Tags>
1313
</Metadata>
1414
<Installation>
15-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
15+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="14.0" />
16+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="15.0" />
1617
</Installation>
17-
<Dependencies>
18-
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
19-
<Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0]" />
20-
</Dependencies>
18+
<Prerequisites>
19+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
20+
<Prerequisite Id="Microsoft.VisualStudio.Component.Web" Version="[15.0,16.0)" DisplayName="Web development tools" />
21+
</Prerequisites>
2122
<Assets>
2223
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
2324
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />

0 commit comments

Comments
 (0)