Skip to content

.Net5.0 #63

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
syntacs wants to merge 6 commits into
base: master
Choose a base branch
from
Open

.Net5.0 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd1d861
initial 50, all except test projects, VS2019
Aug 19, 2022
de32eed
added PDFSharp
Aug 19, 2022
76abd6d
NReflect fork
Aug 19, 2022
7941005
new url for NReflect
Aug 19, 2022
bc02dfa
submodule again
Aug 19, 2022
a0ea109
allow enum init with nefgative numbers
Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "NReflect"]
path = libs/NReflect
url = https://github.com/gbaychev/NReflect.git
url = https://github.com/syntacs/NReflect.git
2 changes: 1 addition & 1 deletion libs/NReflect
Open in desktop
Submodule NReflect updated 4 files
+8 −126 NReflect/NReflect.csproj
+0 −54 NReflect/Properties/AssemblyInfo.cs
+4 −2 NReflect/ReflectionWorker.cs
+3 −3 NReflect/Reflector.cs
272 changes: 7 additions & 265 deletions src/AssemblyImport.Tests/AssemblyImport.Tests.csproj
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 0 additions & 36 deletions src/AssemblyImport.Tests/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions src/AssemblyImport/AssemblyImport.build
View file
Open in desktop

This file was deleted.

193 changes: 17 additions & 176 deletions src/AssemblyImport/AssemblyImport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,177 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{88605D35-9E31-47CC-B6A2-45E6381D52B9}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NClass.AssemblyImport</RootNamespace>
<AssemblyName>AssemblyImport</AssemblyName>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' != 'Unix' ">
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' == 'Unix' ">
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\GUI\bin\Debug\Plugins\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\GUI\bin\Release\Plugins\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="NReflect">
<HintPath>..\..\libs\NReflect\NReflect\bin\$(Configuration)\NReflect.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<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="Controls\ControlDrawHelper.cs" />
<Compile Include="Controls\DataGridViewImageComboBoxColumn.cs" />
<Compile Include="Controls\DataGridViewImageComboBoxColumnCell.cs" />
<Compile Include="Controls\DataGridViewImageComboBoxEditingControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\ImageComboBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\ImageComboBoxItem.cs" />
<Compile Include="Declarations\NRArgumentListDeclaration.cs" />
<Compile Include="Declarations\NRConstructorDeclaration.cs" />
<Compile Include="Declarations\NREventDeclaration.cs" />
<Compile Include="Declarations\NRFieldDeclaration.cs" />
<Compile Include="Declarations\NRPropertyDeclaration.cs" />
<Compile Include="Declarations\NRMethodDeclaration.cs" />
<Compile Include="Declarations\NROperatorDeclaration.cs" />
<Compile Include="Declarations\NRParameterDeclaration.cs" />
<Compile Include="Extensions.cs" />
<Compile Include="NClassImportFilter.cs" />
<Compile Include="ImportSettings.cs" />
<Compile Include="ImportSettingsForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ImportSettingsForm.Designer.cs">
<DependentUpon>ImportSettingsForm.cs</DependentUpon>
</Compile>
<Compile Include="Lang\Strings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Strings.resx</DependentUpon>
</Compile>
<Compile Include="Lang\Strings.cs" />
<Compile Include="NETImport.cs" />
<Compile Include="NETImportPlugin.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="UnsafeTypesPresentException.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\Core.csproj">
<Project>{8CF10505-3C2E-4E45-AB90-21613237B412}</Project>
<Name>Core</Name>
</ProjectReference>
<ProjectReference Include="..\CSharp\CSharp.csproj">
<Project>{755B2714-62DB-419C-9097-49C08439E7E3}</Project>
<Name>CSharp</Name>
</ProjectReference>
<ProjectReference Include="..\DiagramEditor\DiagramEditor.csproj">
<Project>{F52A7548-E60A-485B-9C84-1D2871416DB7}</Project>
<Name>DiagramEditor</Name>
</ProjectReference>
<ProjectReference Include="..\GUI\GUI.csproj">
<Project>{A2918CE1-6894-4FC9-A864-4651769D0274}</Project>
<Name>GUI</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="ImportSettingsForm.resx">
<DependentUpon>ImportSettingsForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Lang\Strings.de.resx">
<LastGenOutput>Strings.de.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Lang\Strings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Include="Resources\internal.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\private.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\protected.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\protint.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\default.png" />
</ItemGroup>
<ItemGroup>
<Content Include="libs\NReflect.dll" />
</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 Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows7.0</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<RootNamespace>NClass.AssemblyImport</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\libs\NReflect\NReflect\NReflect.csproj" />
<ProjectReference Include="..\Core\Core.csproj" />
<ProjectReference Include="..\CSharp\CSharp.csproj" />
<ProjectReference Include="..\DiagramEditor\DiagramEditor.csproj" />
<ProjectReference Include="..\GUI\GUI.csproj" />
<ProjectReference Include="..\Translations\Translations.csproj" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /Y $(OutDir)* ..\GUI\bin\Debug\net5.0-windows7.0\Plugins" />
</Target>
</Project>
3 changes: 2 additions & 1 deletion src/AssemblyImport/Declarations/NRArgumentListDeclaration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NClass.CSharp;
using NClass.Core;
using NClass.CSharp;
using NReflect.NRParameters;
using System.Collections;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/AssemblyImport/NETImport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public NETImport(ClassDiagram diagram, ImportSettings settings)
/// </summary>
/// <param name="fileName">The file name and path of the assembly to import.</param>
/// <returns><c>True</c>, if the import was successful.</returns>
public bool ImportAssembly(string fileName, bool useNewAppDomain = true)
public bool ImportAssembly(string fileName, bool useNewAppDomain = false)
{
if (string.IsNullOrEmpty(fileName))
{
Expand Down
36 changes: 0 additions & 36 deletions src/AssemblyImport/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/CSharp/CSharp.build
View file
Open in desktop

This file was deleted.

Loading