Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ported to VS 2015 #3

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Ported to VS 2015 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c1e09a
migrated to VS 2015, use NuGet packages rather than libs
Dec 13, 2016
a5304ac
fixed name of SQI parameter "Big Methods"
Dec 13, 2016
5409f67
fixed ArgumentException
Dec 19, 2016
36f9c35
fixed invalid references, added NuGet package for QuickGraph
Jan 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed Sources/Libs/GraphSharp.Controls.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Sources/Libs/GraphSharp.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Sources/Libs/MathNet.Numerics.dll
View file
Open in desktop
Binary file not shown.
Binary file added Sources/Libs/Microsoft.Cci.Analysis.ControlAndDataFlowGraph.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Sources/Libs/Microsoft.Cci.CodeModel.dll
View file
Open in desktop
Binary file not shown.
Binary file added Sources/Libs/Microsoft.Cci.CodeModelToIL.dll
View file
Open in desktop
Binary file not shown.
Binary file added Sources/Libs/Microsoft.Cci.ILGenerator.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Sources/Libs/Microsoft.Cci.ILToCodeModel.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Sources/Libs/Microsoft.Cci.MetadataHelper.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Sources/Libs/Microsoft.Cci.MetadataModel.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Sources/Libs/Microsoft.Cci.MutableCodeModel.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Sources/Libs/Microsoft.Cci.MutableMetadataModel.dll
View file
Open in desktop
Binary file not shown.
Binary file added Sources/Libs/Microsoft.Cci.NewILToCodeModel.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Sources/Libs/Microsoft.Cci.PdbReader.dll
View file
Open in desktop
Binary file not shown.
Binary file added Sources/Libs/Microsoft.Cci.PdbWriter.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Sources/Libs/Microsoft.Cci.PeReader.dll
View file
Open in desktop
Binary file not shown.
Binary file added Sources/Libs/Microsoft.Cci.PeWriter.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Sources/Libs/Microsoft.Cci.SourceModel.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Sources/Libs/QuickGraph.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Sources/Libs/System.Windows.Controls.DataVisualization.Toolkit.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Sources/Libs/WPFExtensions.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Sources/Libs/WPFToolkit.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Sources/Usus.net.CleanCode/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Sources/Usus.net.CleanCode/Usus.net.CleanCode.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
Expand Down Expand Up @@ -162,6 +162,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
Expand Down
31 changes: 31 additions & 0 deletions Sources/Usus.net.CleanCode/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion Sources/Usus.net.Cockpit/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Sources/Usus.net.Cockpit/Usus.net.Cockpit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
Expand Down Expand Up @@ -178,6 +178,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
Expand Down
31 changes: 31 additions & 0 deletions Sources/Usus.net.Cockpit/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
8 changes: 6 additions & 2 deletions Sources/Usus.net.Console/Usus.net.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>andrena.Usus.net.Console</RootNamespace>
<AssemblyName>Usus.net.Console</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Expand All @@ -23,6 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
Expand All @@ -32,6 +34,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand All @@ -55,6 +58,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Key.snk" />
</ItemGroup>
<ItemGroup>
Expand Down
31 changes: 31 additions & 0 deletions Sources/Usus.net.Console/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
8 changes: 7 additions & 1 deletion Sources/Usus.net.Core.IntegrationTests/Usus.net.Core.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Usus.net.Core.IntegrationTests</RootNamespace>
<AssemblyName>Usus.net.Core.IntegrationTests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -23,6 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -31,6 +33,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
Expand Down Expand Up @@ -68,6 +71,9 @@
<Name>Usus.net.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
31 changes: 31 additions & 0 deletions Sources/Usus.net.Core.IntegrationTests/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
6 changes: 5 additions & 1 deletion Sources/Usus.net.Core.UnitTests/Usus.net.Core.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Usus.net.Core.UnitTests</RootNamespace>
<AssemblyName>Usus.net.Core.UnitTests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -23,6 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -31,6 +33,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand Down Expand Up @@ -93,6 +96,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Key.snk" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
31 changes: 31 additions & 0 deletions Sources/Usus.net.Core.UnitTests/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MetadataHelper" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.SourceModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.MutableMetadataModel" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.PdbReader" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Cci.ILGenerator" publicKeyToken="736440c9b414ea16" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.65055.0" newVersion="0.0.0.2"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
3 changes: 2 additions & 1 deletion Sources/Usus.net.Core/Metrics/Methods/StatementCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.Cci;
using Microsoft.Cci.Analysis;
using Microsoft.Cci.ILToCodeModel;

namespace andrena.Usus.net.Core.Metrics.Methods
Expand Down Expand Up @@ -52,7 +53,7 @@ private void RememberStatementWithoutLocation(IStatement statement)

private bool IsNotBlock(IStatement statement)
{
return !(statement is BasicBlock);
return !(statement is IBlockStatement);
}

private bool HasLocation(IStatement statement)
Expand Down
Loading