Skip to content

Commit b200009

Browse files
JoshVartyJoshVarty
committed
Moved to v1.0 of Roslyn libraries.
We need to do this in order to use Roslyn's test framework. We also needed to add a reference to MEF 2 (Microsoft.Composition) which isn't yet distributed via .NET.
1 parent 688d4b6 commit b200009

15 files changed

+435
-67
lines changed

‎src/SourceBrowser.Generator/DocumentWalkers/VBWalker.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public override void VisitToken(SyntaxToken token)
4343
{
4444
tokenModel = ProcessKeyword(token);
4545
}
46-
else if (token.VisualBasicKind() == SyntaxKind.IdentifierToken)
46+
else if (token.VBKind() == SyntaxKind.IdentifierToken)
4747
{
4848
tokenModel = ProcessIdentifier(token);
4949
}
50-
else if(token.VisualBasicKind() == SyntaxKind.StringLiteralToken)
50+
else if(token.VBKind() == SyntaxKind.StringLiteralToken)
5151
{
5252
tokenModel = ProcessStringLiteral(token);
5353
}
@@ -75,7 +75,7 @@ private ICollection<Trivia> ProcessTrivia(SyntaxTriviaList triviaList)
7575
{
7676
var triviaModelList = triviaList.Select(n => new Trivia(
7777
value: n.ToFullString(),
78-
type: n.VisualBasicKind().ToString()
78+
type: n.VBKind().ToString()
7979
)).ToList();
8080

8181
return triviaModelList;
@@ -101,7 +101,7 @@ private Token ProcessOtherToken(SyntaxToken token)
101101
/// </summary>
102102
public Token ProcessKeyword(SyntaxToken token)
103103
{
104-
string fullName = token.VisualBasicKind().ToString();
104+
string fullName = token.VBKind().ToString();
105105
string value = token.ToString();
106106
string type = VisualBasicTokenTypes.KEYWORD;
107107
int lineNumber = token.GetLocation().GetLineSpan().StartLinePosition.Line + 1;
@@ -112,7 +112,7 @@ public Token ProcessKeyword(SyntaxToken token)
112112

113113
private Token ProcessStringLiteral(SyntaxToken token)
114114
{
115-
string fullName = token.VisualBasicKind().ToString();
115+
string fullName = token.VBKind().ToString();
116116
string value = token.ToString();
117117
string type = VisualBasicTokenTypes.STRING;
118118
int lineNumber = token.GetLocation().GetLineSpan().StartLinePosition.Line + 1;

‎src/SourceBrowser.Generator/SourceBrowser.Generator.csproj

+41-22
Original file line numberDiff line numberDiff line change
@@ -35,47 +35,66 @@
3535
<StartupObject />
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Microsoft.CodeAnalysis">
39-
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.0.7.4091001-beta\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
38+
<Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39+
<SpecificVersion>False</SpecificVersion>
40+
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
4041
</Reference>
41-
<Reference Include="Microsoft.CodeAnalysis.CSharp">
42-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.0.7.4091001-beta\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
42+
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43+
<SpecificVersion>False</SpecificVersion>
44+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
4345
</Reference>
44-
<Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop">
45-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.0.7.4091001-beta\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
46+
<Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<SpecificVersion>False</SpecificVersion>
48+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
4649
</Reference>
47-
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
48-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.0.7.4091001-beta\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
50+
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<SpecificVersion>False</SpecificVersion>
52+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
4953
</Reference>
50-
<Reference Include="Microsoft.CodeAnalysis.Desktop">
51-
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.0.7.4091001-beta\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
54+
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop">
55+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath>
5256
</Reference>
53-
<Reference Include="Microsoft.CodeAnalysis.VisualBasic">
54-
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.0.7.4091001-beta\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
57+
<Reference Include="Microsoft.CodeAnalysis.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58+
<SpecificVersion>False</SpecificVersion>
59+
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
5560
</Reference>
56-
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Desktop">
57-
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.0.7.4091001-beta\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Desktop.dll</HintPath>
61+
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62+
<SpecificVersion>False</SpecificVersion>
63+
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
5864
</Reference>
59-
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces">
60-
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.0.7.4091001-beta\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
65+
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66+
<SpecificVersion>False</SpecificVersion>
67+
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Desktop.dll</HintPath>
6168
</Reference>
62-
<Reference Include="Microsoft.CodeAnalysis.Workspaces">
63-
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.0.7.4091001-beta\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
69+
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<SpecificVersion>False</SpecificVersion>
71+
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
72+
</Reference>
73+
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces.Desktop">
74+
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.Desktop.dll</HintPath>
75+
</Reference>
76+
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<SpecificVersion>False</SpecificVersion>
78+
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
79+
</Reference>
80+
<Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop">
81+
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
6482
</Reference>
6583
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6684
<SpecificVersion>False</SpecificVersion>
6785
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
6886
</Reference>
6987
<Reference Include="System" />
7088
<Reference Include="System.Collections" />
71-
<Reference Include="System.Collections.Immutable, Version=1.1.20.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
89+
<Reference Include="System.Collections.Immutable, Version=1.1.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7290
<Private>True</Private>
73-
<HintPath>..\packages\Microsoft.Bcl.Immutable.1.1.20-beta\lib\portable-net45+win8\System.Collections.Immutable.dll</HintPath>
91+
<HintPath>..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
7492
</Reference>
7593
<Reference Include="System.Core" />
7694
<Reference Include="System.Net.Http" />
77-
<Reference Include="System.Reflection.Metadata">
78-
<HintPath>..\packages\Microsoft.Bcl.Metadata.1.0.12-alpha\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
95+
<Reference Include="System.Reflection.Metadata, Version=1.0.17.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
96+
<SpecificVersion>False</SpecificVersion>
97+
<HintPath>..\packages\System.Reflection.Metadata.1.0.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
7998
</Reference>
8099
<Reference Include="System.Web" />
81100
<Reference Include="System.Xml.Linq" />

‎src/SourceBrowser.Generator/packages.config

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Bcl.Immutable" version="1.1.20-beta" targetFramework="net45" />
4-
<package id="Microsoft.Bcl.Metadata" version="1.0.12-alpha" targetFramework="net45" />
5-
<package id="Microsoft.CodeAnalysis" version="0.7.4091001-beta" targetFramework="net45" />
6-
<package id="Microsoft.CodeAnalysis.Common" version="0.7.4091001-beta" targetFramework="net45" />
7-
<package id="Microsoft.CodeAnalysis.CSharp" version="0.7.4091001-beta" targetFramework="net45" />
8-
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="0.7.4091001-beta" targetFramework="net45" />
9-
<package id="Microsoft.CodeAnalysis.VisualBasic" version="0.7.4091001-beta" targetFramework="net45" />
10-
<package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="0.7.4091001-beta" targetFramework="net45" />
11-
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="0.7.4091001-beta" targetFramework="net45" />
3+
<package id="Microsoft.CodeAnalysis" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
4+
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
5+
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
6+
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
7+
<package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
8+
<package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
9+
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
1210
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
11+
<package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
12+
<package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
1313
</packages>

0 commit comments

Comments
 (0)