huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump Roslyn to a 2.6.0 build 

Fixes #1654
This commit is contained in:
Ryan Nowak 2017-08-30 15:30:57 -07:00
parent 5cb11b9bf4
commit f3fecabe04
11 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -14,6 +14,8 @@
<!-- Generate full pdbs for desktop targeting projects on platforms that support generating full pdbs. --> <!-- Generate full pdbs for desktop targeting projects on platforms that support generating full pdbs. -->
<DebugType Condition="'$(OS)'=='Windows_NT' AND '$(TargetFramework)'=='net46'">full</DebugType> <DebugType Condition="'$(OS)'=='Windows_NT' AND '$(TargetFramework)'=='net46'">full</DebugType>
<RoslynDevVersion>2.6.0-beta1-62023-02</RoslynDevVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
NuGet.config
View File

@ -3,6 +3,7 @@
<packageSources> <packageSources>
<clear /> <clear />
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" /> <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
<add key="Roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" /> <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

2
src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
View File

@ -11,7 +11,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" /> <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj
View File

@ -17,9 +17,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" /> <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.CodeAnalysis.Remote.Razor.ServiceHub" /> <PackageReference Include="Microsoft.CodeAnalysis.Remote.Razor.ServiceHub" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" /> <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="StreamJsonRpc" /> <PackageReference Include="StreamJsonRpc" />
</ItemGroup> </ItemGroup>

2
src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs
View File

@ -31,7 +31,7 @@ namespace Microsoft.CodeAnalysis.Remote.Razor
{ {
var projectId = ProjectId.CreateFromSerialized(projectIdBytes, projectDebugName); var projectId = ProjectId.CreateFromSerialized(projectIdBytes, projectDebugName);
var solution = await GetSolutionAsync().ConfigureAwait(false); var solution = await GetSolutionAsync(cancellationToken).ConfigureAwait(false);
var project = solution.GetProject(projectId); var project = solution.GetProject(projectId);
var resolver = new DefaultTagHelperResolver(designTime: true); var resolver = new DefaultTagHelperResolver(designTime: true);

2
src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDirectiveResolver.cs
View File

@ -23,7 +23,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
using (var session = await client.CreateSessionAsync(project.Solution)) using (var session = await client.CreateSessionAsync(project.Solution))
{ {
var directives = await session.InvokeAsync<IEnumerable<DirectiveDescriptor>>("GetDirectivesAsync", new object[] { project.Id.Id, "Foo", }).ConfigureAwait(false); var directives = await session.InvokeAsync<IEnumerable<DirectiveDescriptor>>("GetDirectivesAsync", new object[] { project.Id.Id, "Foo", }, cancellationToken).ConfigureAwait(false);
return directives; return directives;
} }
} }

2
src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDocumentGenerator.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
using (var session = await client.CreateSessionAsync(project.Solution)) using (var session = await client.CreateSessionAsync(project.Solution))
{ {
var document = await session.InvokeAsync<RazorEngineDocument>("GenerateDocumentAsync", new object[] { project.Id.Id, "Foo", filePath, text }).ConfigureAwait(false); var document = await session.InvokeAsync<RazorEngineDocument>("GenerateDocumentAsync", new object[] { project.Id.Id, "Foo", filePath, text }, cancellationToken).ConfigureAwait(false);
return document; return document;
} }
} }

3
src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs
View File

@ -47,7 +47,8 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
{ {
var jsonObject = await session.InvokeAsync<JObject>( var jsonObject = await session.InvokeAsync<JObject>(
"GetTagHelpersAsync", "GetTagHelpersAsync",
new object[] { project.Id.Id, "Foo", }).ConfigureAwait(false); new object[] { project.Id.Id, "Foo", },
CancellationToken.None).ConfigureAwait(false);
result = GetTagHelperResolutionResult(jsonObject); result = GetTagHelperResolutionResult(jsonObject);

12
src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
View File

@ -11,15 +11,15 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" /> <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" /> <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" /> <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" /> <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" />
<PackageReference Include="Microsoft.VisualStudio.Editor" /> <PackageReference Include="Microsoft.VisualStudio.Editor" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" /> <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" />
<PackageReference Include="Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient" /> <PackageReference Include="Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.VisualStudio.LanguageServices" /> <PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.VisualStudio.OLE.Interop" /> <PackageReference Include="Microsoft.VisualStudio.OLE.Interop" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" /> <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" /> <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />

3
test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj
View File

@ -18,7 +18,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"/> <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" /> <PackageReference Include="Microsoft.Extensions.DependencyModel" />
<PackageReference Include="Microsoft.NET.Test.Sdk" /> <PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Moq" /> <PackageReference Include="Moq" />

9
test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
View File

@ -21,10 +21,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" /> <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" /> <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(RoslynDevVersion)" NoWarn="KRB4002" />
<PackageReference Include="Moq" /> <PackageReference Include="Moq" />
<PackageReference Include="xunit.analyzers" /> <PackageReference Include="xunit.analyzers" />
<PackageReference Include="xunit.runner.visualstudio" /> <PackageReference Include="xunit.runner.visualstudio" />