Skip to content

Commit

Permalink
cleaning up
Browse files Browse the repository at this point in the history
Signed-off-by: Lev Nachmanson <[email protected]>
  • Loading branch information
levnach committed Dec 3, 2024
1 parent 94e52ec commit e596be4
Show file tree
Hide file tree
Showing 30 changed files with 62 additions and 125 deletions.
1 change: 1 addition & 0 deletions GraphLayout/MSAGL/AutomaticGraphLayout.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<AssemblyName>Microsoft.Msagl</AssemblyName>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
<NoWarn>NU1605,CS1591,CS1570,CS1572, CS1587, CS1572, CS1573, CS1712</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<DefineConstants>TEST_MSAGL</DefineConstants>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<RootNamespace>AspectRatioSample</RootNamespace>
<OldToolsVersion>3.5</OldToolsVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<AssemblyName>DrawingFromFromGeometryGraphSample</AssemblyName>
<OldToolsVersion>3.5</OldToolsVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>Exe</OutputType>
<StartupObject></StartupObject>
<OldToolsVersion>3.5</OldToolsVersion>
Expand Down
2 changes: 1 addition & 1 deletion GraphLayout/Samples/Editing/Editing.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>Exe</OutputType>
<StartupObject></StartupObject>
<OldToolsVersion>3.5</OldToolsVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<OldToolsVersion>3.5</OldToolsVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<OldToolsVersion>3.5</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>Exe</OutputType>
<OldToolsVersion>3.5</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<RootNamespace>LocationLabeling</RootNamespace>
<AssemblyName>LocationLabeling</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion GraphLayout/Samples/MinWpfApp/MinWpfApp.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion GraphLayout/Samples/NodesWithImages/NodesWithImages.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<OldToolsVersion>3.5</OldToolsVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<OldToolsVersion>3.5</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion GraphLayout/Samples/SameLayerSample/SameLayerSample.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
2 changes: 1 addition & 1 deletion GraphLayout/Samples/SvgLayerSample/SvgLayerSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<OldToolsVersion>3.5</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<OldToolsVersion>3.5</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
Expand Down
3 changes: 2 additions & 1 deletion GraphLayout/Test/Test01/Test01.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -176,4 +177,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion GraphLayout/TinyClickDemo/TinyClickDemo.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
2 changes: 1 addition & 1 deletion GraphLayout/WriteToSvgSample/WriteToSvgSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
129 changes: 32 additions & 97 deletions GraphLayout/tools/Dot2Graph/Dot2Graph.csproj
Original file line number Diff line number Diff line change
@@ -1,113 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BA8FED53-458E-4CB3-8EB3-CBFCADD87E5D}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net472</TargetFramework>
<RuntimeIdentifiers>win</RuntimeIdentifiers>
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Dot2Graph</RootNamespace>
<AssemblyName>Dot2Graph</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Platforms>AnyCPU;x86;x64</Platforms>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>

<!-- Debug Configuration -->
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>

<!-- Release Configuration -->
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AttributeValuePair.cs" />
<Compile Include="Dot.cs" />
<Compile Include="DotLex.cs" />
<Compile Include="PosData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Drawing\AutomaticGraphLayout.Drawing.csproj">
<Project>{B76F8F71-4B00-4242-BE36-C9F0732511F7}</Project>
<Name>AutomaticGraphLayout.Drawing</Name>
</ProjectReference>
<ProjectReference Include="..\..\MSAGL\AutomaticGraphLayout.csproj">
<Project>{415D3E3F-7105-46C1-84D2-7ECB34213D92}</Project>
<Name>AutomaticGraphLayout</Name>
</ProjectReference>
<ProjectReference Include="..\QUT.ShiftReduceParser\QUT.ShiftReduceParser.csproj">
<Project>{ef5cf15e-5645-433b-8a23-af93e3f2682f}</Project>
<Name>QUT.ShiftReduceParser</Name>
</ProjectReference>
</ItemGroup>


<ItemGroup>
<None Include="dot.lex" />
<None Include="dot.y" />
</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>

<ItemGroup>
<ProjectReference Include="..\..\Drawing\AutomaticGraphLayout.Drawing.csproj" />
<ProjectReference Include="..\..\MSAGL\AutomaticGraphLayout.csproj" />
<ProjectReference Include="..\QUT.ShiftReduceParser\QUT.ShiftReduceParser.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.Msagl.GraphViewerGdi</RootNamespace>
<AssemblyName>Microsoft.Msagl.GraphViewerGdi</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyName>Microsoft.Msagl.WpfGraphControl</AssemblyName>
</PropertyGroup>
Expand Down

0 comments on commit e596be4

Please sign in to comment.