Upgraded project to new project system and provided a .NET 6.0 build

This commit is contained in:
cygon 2024-07-25 22:06:56 +02:00
parent c34d42a4b8
commit 9f156197c7
4 changed files with 35 additions and 164 deletions

View File

@ -15,7 +15,7 @@ the following directory layout:
Nuclex.Windows.Forms/ <-- Git: nuclex-shared-dotnet/Nuclex.Windows.Forms Nuclex.Windows.Forms/ <-- Git: nuclex-shared-dotnet/Nuclex.Windows.Forms
... ...
Nuclex.Support.Native/ <-- Git: nuclex-shared-dotnet/Nuclex.Support Nuclex.Support/ <-- Git: nuclex-shared-dotnet/Nuclex.Support
... ...
third-party/ third-party/
@ -28,8 +28,8 @@ repository (with `--recurse-submodules`).
The actual, direct requirements of the code to compile are: The actual, direct requirements of the code to compile are:
* Nuclex.Support * Nuclex.Support (project)
* Nuclex.Windows.Forms * Nuclex.Windows.Forms (project)
* ninject * ninject
* nunit (optional, if unit tests are built) * nunit (optional, if unit tests are built)
* nmock (optional, if unit tests are built) * nmock (optional, if unit tests are built)

View File

@ -1,75 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4B185E46-672F-4629-98E8-82DB07AA8147}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Nuclex.Windows.Forms.Ninject</RootNamespace>
<AssemblyName>Nuclex.Windows.Forms.Ninject</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\net-4.0\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\net-4.0\Debug\Nuclex.Windows.Forms.Ninject.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\net-4.0\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\net-4.0\Release\Nuclex.Windows.Forms.Ninject.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\Foundation.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ninject.ClientProfile">
<HintPath>..\References\ninject\net-4.0\Ninject.ClientProfile.dll</HintPath>
</Reference>
<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.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Source\NinjectWindowManager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Source\MvvmModule.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Nuclex.Support\Nuclex.Support %28net-4.0%29.csproj">
<Project>{00567408-4f44-4c00-866e-b04a99e482f2}</Project>
<Name>Nuclex.Support %28net-4.0%29</Name>
</ProjectReference>
<ProjectReference Include="..\Nuclex.Windows.Forms\Nuclex.Windows.Forms %28net-4.0%29.csproj">
<Project>{b2bfa3ec-3b7b-4ee0-8395-8426b5c7a8b8}</Project>
<Name>Nuclex.Windows.Forms %28net-4.0%29</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="..\Foundation.snk">
<Link>Foundation.snk</Link>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -0,0 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<AssemblyName>Nuclex.Windows.Forms.Ninject</AssemblyName>
<RootNamespace>Nuclex.Windows.Forms.Ninject</RootNamespace>
<IntermediateOutputPath>obj\source</IntermediateOutputPath>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Tests\**" />
<EmbeddedResource Remove="Tests\**" />
<None Remove="Tests\**" />
</ItemGroup>
<ItemGroup>
<None Remove=".git" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Ninject" Version="3.3.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Nuclex.Windows.Forms\Nuclex.Windows.Forms (net-4.6)(net-6.0).csproj" />
</ItemGroup>
</Project>

View File

@ -1,86 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4B185E46-672F-4629-98E8-82DB07AA8147}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Nuclex.Windows.Forms.Ninject</RootNamespace>
<AssemblyName>Nuclex.Windows.Forms.Ninject</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\net-4.0\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\net-4.0\Debug\Nuclex.Windows.Forms.Ninject.xml</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\net-4.6\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\net-4.6\Release\Nuclex.Windows.Forms.Ninject.xml</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<NuGetPackageRoot>$(SolutionDir)third-party\</NuGetPackageRoot>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\Foundation.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ninject, Version=2.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\third-party\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll</HintPath>
</Reference>
<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.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Source\NinjectWindowManager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Source\MvvmModule.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\Foundation.snk">
<Link>Foundation.snk</Link>
</None>
<None Include="Dependencies.md" />
<None Include="License.md" />
<None Include="Notice.md" />
<None Include="packages.config" />
<None Include="ReadMe.md" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Nuclex.Support\Nuclex.Support %28net-4.6%29.csproj">
<Project>{00567408-4f44-4c00-866e-b04a99e482f2}</Project>
<Name>Nuclex.Support %28net-4.6%29</Name>
</ProjectReference>
<ProjectReference Include="..\Nuclex.Windows.Forms\Nuclex.Windows.Forms %28net-4.6%29.csproj">
<Project>{b2bfa3ec-3b7b-4ee0-8395-8426b5c7a8b8}</Project>
<Name>Nuclex.Windows.Forms %28net-4.6%29</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>