Skip to content

Port to net8. #35

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port to net8. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
build/
packages/
*/obj/
*/bin/
idloutput/
*.suo
*.tlb
Expand Down
Empty file removed .sonarcloud.properties
View file
Open in desktop
Empty file.
66 changes: 14 additions & 52 deletions DsmSuite.Analyzer.Compare.Test/DsmSuite.Analyzer.Compare.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="..\PropertySheets\DsmSuite.Common.props" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net8.0</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProjectGuid>{AE26E765-3E28-45C0-87FC-A45A88AE431B}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DsmSuite.Analyzer.Compare.Test</RootNamespace>
<AssemblyName>DsmSuite.Analyzer.Compare.Test</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<TargetFrameworkProfile />
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AssemblyTitle>DsmSuite.Analyzer.Compare.Test</AssemblyTitle>
<Product>DsmSuite.Analyzer.Compare.Test</Product>
<Copyright>Copyright © 2021</Copyright>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<Choose>
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
<Private>False</Private>
</Reference>
</ItemGroup>
</Otherwise>
<Otherwise />
</Choose>
<ItemGroup>
<Compile Include="DsiModelCompareTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<PackageReference Include="MSTest" Version="3.4.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DsmSuite.Analyzer.CompareLib\DsmSuite.Analyzer.CompareLib.csproj">
<Project>{4DEF3EDB-91A6-4C95-BF74-D11B3363BEE2}</Project>
<Name>DsmSuite.Analyzer.CompareLib</Name>
</ProjectReference>
<ProjectReference Include="..\DsmSuite.Analyzer.Model\DsmSuite.Analyzer.Model.csproj">
<Project>{7106d2f0-804e-4f73-950c-266ffc096a87}</Project>
<Name>DsmSuite.Analyzer.Model</Name>
</ProjectReference>
<ProjectReference Include="..\DsmSuite.Common.Util\DsmSuite.Common.Util.csproj">
<Project>{c2eb943f-4bb8-47bb-bdc1-7f6b607fb977}</Project>
<Name>DsmSuite.Common.Util</Name>
</ProjectReference>
<ProjectReference Include="..\DsmSuite.Analyzer.CompareLib\DsmSuite.Analyzer.CompareLib.csproj" />
<ProjectReference Include="..\DsmSuite.Analyzer.Model\DsmSuite.Analyzer.Model.csproj" />
<ProjectReference Include="..\DsmSuite.Common.Util\DsmSuite.Common.Util.csproj" />
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
Expand All @@ -77,13 +48,4 @@
</ItemGroup>
</When>
</Choose>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
36 changes: 0 additions & 36 deletions DsmSuite.Analyzer.Compare.Test/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions DsmSuite.Analyzer.Compare/App.config
View file
Open in desktop

This file was deleted.

61 changes: 13 additions & 48 deletions DsmSuite.Analyzer.Compare/DsmSuite.Analyzer.Compare.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="..\PropertySheets\DsmSuite.Common.props" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net8.0</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProjectGuid>{F0F09701-6A36-479E-97B9-BCC0DEF3C050}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DsmSuite.Analyzer.Compare</RootNamespace>
<AssemblyName>DsmSuite.Analyzer.Compare</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<AssemblyTitle>DsmSuite.Analyzer.Compare</AssemblyTitle>
<Product>DsmSuite.Analyzer.Compare</Product>
<Copyright>Copyright © 2020</Copyright>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<ProjectReference Include="..\DsmSuite.Analyzer.CompareLib\DsmSuite.Analyzer.CompareLib.csproj" />
<ProjectReference Include="..\DsmSuite.Analyzer.Model\DsmSuite.Analyzer.Model.csproj" />
<ProjectReference Include="..\DsmSuite.Common.Util\DsmSuite.Common.Util.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DsmSuite.Analyzer.CompareLib\DsmSuite.Analyzer.CompareLib.csproj">
<Project>{4def3edb-91a6-4c95-bf74-d11b3363bee2}</Project>
<Name>DsmSuite.Analyzer.CompareLib</Name>
</ProjectReference>
<ProjectReference Include="..\DsmSuite.Analyzer.Model\DsmSuite.Analyzer.Model.csproj">
<Project>{7106d2f0-804e-4f73-950c-266ffc096a87}</Project>
<Name>DsmSuite.Analyzer.Model</Name>
</ProjectReference>
<ProjectReference Include="..\DsmSuite.Common.Util\DsmSuite.Common.Util.csproj">
<Project>{C2EB943F-4BB8-47BB-BDC1-7F6B607FB977}</Project>
<Name>DsmSuite.Common.Util</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
35 changes: 0 additions & 35 deletions DsmSuite.Analyzer.Compare/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

52 changes: 12 additions & 40 deletions DsmSuite.Analyzer.CompareLib/DsmSuite.Analyzer.CompareLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="..\PropertySheets\DsmSuite.Common.props" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net8.0</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProjectGuid>{4DEF3EDB-91A6-4C95-BF74-D11B3363BEE2}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DsmSuite.Analyzer.CompareLib</RootNamespace>
<AssemblyName>DsmSuite.Analyzer.CompareLib</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<AssemblyTitle>DsmSuite.Analyzer.ComparerLib</AssemblyTitle>
<Product>DsmSuite.Analyzer.ComparerLib</Product>
<Copyright>Copyright © 2021</Copyright>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<ProjectReference Include="..\DsmSuite.Analyzer.Model\DsmSuite.Analyzer.Model.csproj" />
<ProjectReference Include="..\DsmSuite.Common.Util\DsmSuite.Common.Util.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="DsiModelCompare.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DsmSuite.Analyzer.Model\DsmSuite.Analyzer.Model.csproj">
<Project>{7106d2f0-804e-4f73-950c-266ffc096a87}</Project>
<Name>DsmSuite.Analyzer.Model</Name>
</ProjectReference>
<ProjectReference Include="..\DsmSuite.Common.Util\DsmSuite.Common.Util.csproj">
<Project>{c2eb943f-4bb8-47bb-bdc1-7f6b607fb977}</Project>
<Name>DsmSuite.Common.Util</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
35 changes: 0 additions & 35 deletions DsmSuite.Analyzer.CompareLib/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions DsmSuite.Analyzer.DotNet.Lib/BinaryFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,9 @@ private void AnalyseTypeRelations(TypeDefinition typeDecl)

private void AnalyzeTypeInterfaces(TypeDefinition typeDecl)
{
foreach (TypeReference interf in typeDecl.Interfaces)
foreach (InterfaceImplementation impl in typeDecl.Interfaces)
{
TypeReference interf = impl.InterfaceType;
try
{
string context = "Analyze interfaces of type " + typeDecl.Name;
Expand Down Expand Up @@ -257,8 +258,9 @@ private void AnalyzeGenericMethodParameters(TypeDefinition typeDecl,
{
foreach (GenericParameter genericArgument in method.GenericParameters)
{
foreach (TypeReference constraint in genericArgument.Constraints)
foreach (GenericParameterConstraint cs in genericArgument.Constraints)
{
TypeReference constraint = cs.ConstraintType;
try
{
string context = "Analyze generic parameters of method " + typeDecl.Name + "::" + method.Name;
Expand Down
Loading