Skip to content
This repository has been archived by the owner on Jul 15, 2023. It is now read-only.

Commit

Permalink
Merge pull request #725 from Microsoft/dev
Browse files Browse the repository at this point in the history
Changes:
* Style-cop changes
* Ignore resource DLLs
* Improve locating System.Object dll
* Add DGML report formatter
* Update VSIX to use AsyncPackage
* Remove Ubuntu14.04 CI build because it is covered by Ubuntu16.04
  • Loading branch information
conniey authored Nov 20, 2018
2 parents 94f0f02 + 19f18f2 commit 289db1d
Show file tree
Hide file tree
Showing 184 changed files with 2,542 additions and 1,271 deletions.
55 changes: 53 additions & 2 deletions PortabilityTools.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2036
# Visual Studio Version 16
VisualStudioVersion = 16.0.28210.120
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C991F5FC-04B5-420C-98A0-80974AA946F7}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -82,6 +82,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiPort", "ApiPort", "{C2CF
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{CB5759DE-9D7B-4B21-89BC-E81920D611BB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.DGML", "src\lib\Microsoft.Fx.Portability.Reports.DGML\Microsoft.Fx.Portability.Reports.DGML.csproj", "{1B6E53A7-9180-4D79-9556-E5CE59483EA1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1046,6 +1048,54 @@ Global
{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|ARM.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|ARM.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|x64.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|x64.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|x86.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|x86.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|x64.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|x86.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|ARM.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|x64.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|x64.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|x86.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|x86.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|Any CPU.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|ARM.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|ARM.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|x64.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|x64.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|x86.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|x86.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1076,6 +1126,7 @@ Global
{D66AC566-3B80-46F0-8687-3C5F4D203F1A} = {6234AABE-C4F3-4094-9C0D-FFD589235DBE}
{C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
{CB5759DE-9D7B-4B21-89BC-E81920D611BB} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
{1B6E53A7-9180-4D79-9556-E5CE59483EA1} = {D66AC566-3B80-46F0-8687-3C5F4D203F1A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8E8B2DB2-4847-4909-8631-A995D50F10EF}
Expand Down
1 change: 0 additions & 1 deletion docs/RecommendedChanges/System/Remove usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Remove usage.

### Affected APIs
* `T:System.AccessViolationException`
* `T:System.AppDomain`
* `T:System.AppDomainManager`
* `T:System.AppDomainManagerInitializationOptions`
* `T:System.AppDomainSetup`
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
### Recommended Action
Use AssemblyBuilder.DefineDynamicAssembly

### Affected APIs
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess)`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.Security.Policy.Evidence)`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.Security.Policy.Evidence,System.Security.PermissionSet,System.Security.PermissionSet,System.Security.PermissionSet)`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.Collections.Generic.IEnumerable{System.Reflection.Emit.CustomAttributeBuilder})`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.Collections.Generic.IEnumerable{System.Reflection.Emit.CustomAttributeBuilder},System.Security.SecurityContextSource)`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.Security.PermissionSet,System.Security.PermissionSet,System.Security.PermissionSet)`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.String)`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.String,System.Boolean,System.Collections.Generic.IEnumerable{System.Reflection.Emit.CustomAttributeBuilder})`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.String,System.Security.Policy.Evidence)`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.String,System.Security.Policy.Evidence,System.Security.PermissionSet,System.Security.PermissionSet,System.Security.PermissionSet)`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.String,System.Security.Policy.Evidence,System.Security.PermissionSet,System.Security.PermissionSet,System.Security.PermissionSet,System.Boolean)`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.String,System.Security.Policy.Evidence,System.Security.PermissionSet,System.Security.PermissionSet,System.Security.PermissionSet,System.Boolean,System.Collections.Generic.IEnumerable{System.Reflection.Emit.CustomAttributeBuilder})`
* `M:System.AppDomain.DefineDynamicAssembly(System.Reflection.AssemblyName,System.Reflection.Emit.AssemblyBuilderAccess,System.String,System.Security.PermissionSet,System.Security.PermissionSet,System.Security.PermissionSet)`
2 changes: 1 addition & 1 deletion netci.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName
def configurationGroups = ['Debug', 'Release']
def outerloopPlatforms = ['Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04', 'OSX10.12']
def outerloopPlatforms = ['Windows_NT', 'Ubuntu16.04', 'OSX10.12']

// Generate the builds for debug and release, commit and PRJob
[true, false].each { isPR -> // Defines a closure over true and false, value assigned to isPR
Expand Down
163 changes: 0 additions & 163 deletions rules.ruleset
Original file line number Diff line number Diff line change
Expand Up @@ -47,186 +47,23 @@
</Rules>
<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
<Rule Id="SA0001" Action="None" />
<Rule Id="SA1000" Action="None" />
<Rule Id="SA1001" Action="None" />
<Rule Id="SA1002" Action="None" />
<Rule Id="SA1003" Action="None" />
<Rule Id="SA1004" Action="None" />
<Rule Id="SA1005" Action="None" />
<Rule Id="SA1006" Action="None" />
<Rule Id="SA1007" Action="None" />
<Rule Id="SA1008" Action="None" />
<Rule Id="SA1009" Action="None" />
<Rule Id="SA1010" Action="None" />
<Rule Id="SA1011" Action="None" />
<Rule Id="SA1012" Action="None" />
<Rule Id="SA1013" Action="None" />
<Rule Id="SA1014" Action="None" />
<Rule Id="SA1015" Action="None" />
<Rule Id="SA1016" Action="None" />
<Rule Id="SA1017" Action="None" />
<Rule Id="SA1018" Action="None" />
<Rule Id="SA1019" Action="None" />
<Rule Id="SA1020" Action="None" />
<Rule Id="SA1021" Action="None" />
<Rule Id="SA1022" Action="None" />
<Rule Id="SA1023" Action="None" />
<Rule Id="SA1024" Action="None" />
<Rule Id="SA1025" Action="None" />
<Rule Id="SA1026" Action="None" />
<Rule Id="SA1027" Action="None" />
<Rule Id="SA1028" Action="None" />
<Rule Id="SA1100" Action="None" />
<Rule Id="SA1101" Action="None" />
<Rule Id="SA1102" Action="None" />
<Rule Id="SA1103" Action="None" />
<Rule Id="SA1104" Action="None" />
<Rule Id="SA1105" Action="None" />
<Rule Id="SA1106" Action="None" />
<Rule Id="SA1107" Action="None" />
<Rule Id="SA1108" Action="None" />
<Rule Id="SA1109" Action="None" />
<Rule Id="SA1110" Action="None" />
<Rule Id="SA1111" Action="None" />
<Rule Id="SA1112" Action="None" />
<Rule Id="SA1113" Action="None" />
<Rule Id="SA1114" Action="None" />
<Rule Id="SA1115" Action="None" />
<Rule Id="SA1116" Action="None" />
<Rule Id="SA1117" Action="None" />
<Rule Id="SA1118" Action="None" />
<Rule Id="SA1119" Action="None" />
<Rule Id="SA1120" Action="None" />
<Rule Id="SA1121" Action="None" />
<Rule Id="SA1122" Action="None" />
<Rule Id="SA1123" Action="None" />
<Rule Id="SA1124" Action="None" />
<Rule Id="SA1125" Action="None" />
<Rule Id="SA1126" Action="None" />
<Rule Id="SA1127" Action="None" />
<Rule Id="SA1128" Action="None" />
<Rule Id="SA1129" Action="None" />
<Rule Id="SA1130" Action="None" />
<Rule Id="SA1131" Action="None" />
<Rule Id="SA1132" Action="None" />
<Rule Id="SA1133" Action="None" />
<Rule Id="SA1134" Action="None" />
<Rule Id="SA1135" Action="None" />
<Rule Id="SA1136" Action="None" />
<Rule Id="SA1137" Action="None" />
<Rule Id="SA1138" Action="None" />
<Rule Id="SA1139" Action="None" />
<Rule Id="SA1200" Action="None" />
<Rule Id="SA1201" Action="None" />
<Rule Id="SA1202" Action="None" />
<Rule Id="SA1203" Action="None" />
<Rule Id="SA1204" Action="None" />
<Rule Id="SA1205" Action="None" />
<Rule Id="SA1206" Action="None" />
<Rule Id="SA1207" Action="None" />
<Rule Id="SA1208" Action="None" />
<Rule Id="SA1209" Action="None" />
<Rule Id="SA1210" Action="None" />
<Rule Id="SA1211" Action="None" />
<Rule Id="SA1212" Action="None" />
<Rule Id="SA1213" Action="None" />
<Rule Id="SA1214" Action="None" />
<Rule Id="SA1215" Action="None" />
<Rule Id="SA1216" Action="None" />
<Rule Id="SA1217" Action="None" />
<Rule Id="SA1300" Action="None" />
<Rule Id="SA1301" Action="None" />
<Rule Id="SA1302" Action="None" />
<Rule Id="SA1303" Action="None" />
<Rule Id="SA1304" Action="None" />
<Rule Id="SA1306" Action="None" />
<Rule Id="SA1307" Action="None" />
<Rule Id="SA1308" Action="None" />
<Rule Id="SA1309" Action="None" />
<Rule Id="SA1310" Action="None" />
<Rule Id="SA1311" Action="None" />
<Rule Id="SA1312" Action="None" />
<Rule Id="SA1313" Action="None" />
<Rule Id="SA1314" Action="None" />
<Rule Id="SA1400" Action="None" />
<Rule Id="SA1401" Action="None" />
<Rule Id="SA1402" Action="None" />
<Rule Id="SA1403" Action="None" />
<Rule Id="SA1404" Action="None" />
<Rule Id="SA1405" Action="None" />
<Rule Id="SA1406" Action="None" />
<Rule Id="SA1407" Action="None" />
<Rule Id="SA1408" Action="None" />
<Rule Id="SA1409" Action="None" />
<Rule Id="SA1410" Action="None" />
<Rule Id="SA1411" Action="None" />
<Rule Id="SA1412" Action="Warning" />
<Rule Id="SA1413" Action="None" />
<Rule Id="SA1500" Action="None" />
<Rule Id="SA1501" Action="None" />
<Rule Id="SA1502" Action="None" />
<Rule Id="SA1503" Action="None" />
<Rule Id="SA1504" Action="None" />
<Rule Id="SA1505" Action="None" />
<Rule Id="SA1506" Action="None" />
<Rule Id="SA1508" Action="None" />
<Rule Id="SA1509" Action="None" />
<Rule Id="SA1510" Action="None" />
<Rule Id="SA1511" Action="None" />
<Rule Id="SA1512" Action="None" />
<Rule Id="SA1513" Action="None" />
<Rule Id="SA1514" Action="None" />
<Rule Id="SA1515" Action="None" />
<Rule Id="SA1516" Action="None" />
<Rule Id="SA1517" Action="None" />
<Rule Id="SA1519" Action="None" />
<Rule Id="SA1520" Action="None" />
<Rule Id="SA1600" Action="None" />
<Rule Id="SA1601" Action="None" />
<Rule Id="SA1602" Action="None" />
<Rule Id="SA1603" Action="None" />
<Rule Id="SA1604" Action="None" />
<Rule Id="SA1605" Action="None" />
<Rule Id="SA1606" Action="None" />
<Rule Id="SA1607" Action="None" />
<Rule Id="SA1608" Action="None" />
<Rule Id="SA1610" Action="None" />
<Rule Id="SA1611" Action="None" />
<Rule Id="SA1612" Action="None" />
<Rule Id="SA1613" Action="None" />
<Rule Id="SA1614" Action="None" />
<Rule Id="SA1615" Action="None" />
<Rule Id="SA1616" Action="None" />
<Rule Id="SA1617" Action="None" />
<Rule Id="SA1618" Action="None" />
<Rule Id="SA1619" Action="None" />
<Rule Id="SA1620" Action="None" />
<Rule Id="SA1621" Action="None" />
<Rule Id="SA1622" Action="None" />
<Rule Id="SA1623" Action="None" />
<Rule Id="SA1624" Action="None" />
<Rule Id="SA1625" Action="None" />
<Rule Id="SA1626" Action="None" />
<Rule Id="SA1627" Action="None" />
<Rule Id="SA1628" Action="None" />
<Rule Id="SA1629" Action="None" />
<Rule Id="SA1630" Action="None" />
<Rule Id="SA1631" Action="None" />
<Rule Id="SA1632" Action="None" />
<Rule Id="SA1637" Action="None" />
<Rule Id="SA1638" Action="None" />
<Rule Id="SA1640" Action="None" />
<Rule Id="SA1641" Action="None" />
<Rule Id="SA1642" Action="None" />
<Rule Id="SA1643" Action="None" />
<Rule Id="SA1644" Action="None" />
<Rule Id="SA1645" Action="None" />
<Rule Id="SA1646" Action="None" />
<Rule Id="SA1647" Action="None" />
<Rule Id="SA1648" Action="None" />
<Rule Id="SA1649" Action="None" />
<Rule Id="SA1650" Action="None" />
<Rule Id="SA1651" Action="None" />
<Rule Id="SA1652" Action="None" />
</Rules>
</RuleSet>
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;

using static Microsoft.Fx.Portability.Utils.FormattableStringHelper;

namespace ApiPortVS.VS2017
Expand Down
3 changes: 2 additions & 1 deletion src/ApiPort/ApiPort.VisualStudio.2017/ServiceProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ public class ServiceProvider : Module
{
protected override void Load(ContainerBuilder builder)
{
builder.RegisterAdapter<IServiceProvider, IProjectService>(serviceProvider => {
builder.RegisterAdapter<IServiceProvider, IProjectService>(serviceProvider =>
{
var componentModel = serviceProvider.GetService(typeof(SComponentModel)) as IComponentModel;
var projectServiceAccessor = componentModel.GetService<IProjectServiceAccessor>();
return projectServiceAccessor.GetProjectService();
Expand Down
2 changes: 1 addition & 1 deletion src/ApiPort/ApiPort.VisualStudio.Common/AssemblyFile.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using Microsoft.Fx.Portability;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using Microsoft.Fx.Portability;

namespace ApiPortVS
{
Expand Down
5 changes: 4 additions & 1 deletion src/ApiPort/ApiPort.VisualStudio.Common/ComProjectMapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
using System;
using System.Diagnostics;
using System.Threading.Tasks;
using VisualStudio = Microsoft.VisualStudio.Shell;

using static Microsoft.Fx.Portability.Utils.FormattableStringHelper;

using VisualStudio = Microsoft.VisualStudio.Shell;

namespace ApiPortVS
{
/// <summary>
Expand Down Expand Up @@ -77,6 +79,7 @@ public async Task<IVsCfg> GetVsProjectConfigurationAsync(Project project)
Trace.TraceError(ToCurrentCulture($"Could not retrieve {nameof(IVsCfgProvider)} from project: {project.Name}"));
return null;
}

if (!(provider is IVsCfgProvider2))
{
Trace.TraceError(ToCurrentCulture($"IVsCfgProvider returned {provider.GetType()} is not of the right type. Expected: {nameof(IVsCfgProvider2)}"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ public interface IErrorListProvider
/// <summary>
/// Displays given source mapped items in the error window.
/// </summary>
/// <param name="items"></param>
/// <param name="projects"></param>
/// <returns></returns>
Task DisplaySourceItemsAsync(IEnumerable<ISourceMappedItem> items, ICollection<CalculatedProject> projects);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ public interface ISourceLineMapper
/// <summary>
/// Finds source information from the report
/// </summary>
/// <param name="assemblyPath"></param>
/// <param name="pdbPath"></param>
/// <param name="report"></param>
/// <returns></returns>
IEnumerable<ISourceMappedItem> GetSourceInfo(string assemblyPath, string pdbPath, ReportingResult report);

/// <summary>
Expand All @@ -23,9 +19,6 @@ public interface ISourceLineMapper
/// <remarks>
/// This method assumes that the pdb files for targetAssemblies will be the same path replaced with pdb.
/// </remarks>
/// <param name="targetAssemblies"></param>
/// <param name="analysis"></param>
/// <returns></returns>
IEnumerable<ISourceMappedItem> GetSourceInfo(IEnumerable<string> targetAssemblies, ReportingResult analysis);
}
}
Loading

0 comments on commit 289db1d

Please sign in to comment.