Skip to content

Commit

Permalink
Upgraded to .NET 6
Browse files Browse the repository at this point in the history
  • Loading branch information
genemars committed Dec 19, 2022
1 parent bf8b94c commit dc4361d
Show file tree
Hide file tree
Showing 16 changed files with 98 additions and 381 deletions.
27 changes: 0 additions & 27 deletions Test.CM15/Properties/AssemblyInfo.cs

This file was deleted.

69 changes: 14 additions & 55 deletions Test.CM15/Test.CM15.csproj
Original file line number Diff line number Diff line change
@@ -1,55 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{F294E092-807A-493C-85AD-BB8AA5C5AB22}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Test.CM15</RootNamespace>
<AssemblyName>Test.CM15</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<ReleaseVersion>1.0</ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
</PropertyGroup>
<ItemGroup>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
<HintPath>..\packages\NLog.4.5.10\lib\net45\NLog.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\XTenLib\XTenLib.csproj">
<Project>{92933BA1-609C-4DE0-B29E-FDA37C7DC0EF}</Project>
<Name>XTenLib</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="NLog.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\XTenLib\XTenLib.csproj" />
</ItemGroup>

</Project>
4 changes: 0 additions & 4 deletions Test.CM15/packages.config

This file was deleted.

35 changes: 0 additions & 35 deletions XTenLib.Tests/Properties/AssemblyInfo.cs

This file was deleted.

33 changes: 0 additions & 33 deletions XTenLib.Tests/Tests.cs

This file was deleted.

17 changes: 17 additions & 0 deletions XTenLib.Tests/UnitTest1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using NUnit.Framework;

namespace XTenLib.Tests;

public class Tests
{
[SetUp]
public void Setup()
{
}

[Test]
public void Test1()
{
Assert.Pass();
}
}
80 changes: 15 additions & 65 deletions XTenLib.Tests/XTenLib.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,67 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
<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>{3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}</ProjectGuid>
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>XTenLib.Tests</RootNamespace>
<AssemblyName>XTenLib.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Tests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
</Target>
<!-- 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>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0"/>
<PackageReference Include="NUnit" Version="3.13.2"/>
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0"/>
<PackageReference Include="coverlet.collector" Version="3.1.0"/>
</ItemGroup>

</Project>
4 changes: 0 additions & 4 deletions XTenLib.Tests/packages.config

This file was deleted.

20 changes: 10 additions & 10 deletions XTenLib.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XTenLib", "XTenLib\XTenLib.csproj", "{92933BA1-609C-4DE0-B29E-FDA37C7DC0EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.CM15", "Test.CM15\Test.CM15.csproj", "{F294E092-807A-493C-85AD-BB8AA5C5AB22}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.CM15", "Test.CM15\Test.CM15.csproj", "{D4FA5123-46E8-4731-9D0F-6545C655FCCB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XTenLib.Tests", "XTenLib.Tests\XTenLib.Tests.csproj", "{3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XTenLib.Tests", "XTenLib.Tests\XTenLib.Tests.csproj", "{8DD58A35-6CD1-4D32-800C-81133311674B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -17,14 +17,14 @@ Global
{92933BA1-609C-4DE0-B29E-FDA37C7DC0EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92933BA1-609C-4DE0-B29E-FDA37C7DC0EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92933BA1-609C-4DE0-B29E-FDA37C7DC0EF}.Release|Any CPU.Build.0 = Release|Any CPU
{F294E092-807A-493C-85AD-BB8AA5C5AB22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F294E092-807A-493C-85AD-BB8AA5C5AB22}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F294E092-807A-493C-85AD-BB8AA5C5AB22}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F294E092-807A-493C-85AD-BB8AA5C5AB22}.Release|Any CPU.Build.0 = Release|Any CPU
{3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3F2ECBE2-8D4E-4363-88DE-29478CBFACF6}.Release|Any CPU.Build.0 = Release|Any CPU
{D4FA5123-46E8-4731-9D0F-6545C655FCCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4FA5123-46E8-4731-9D0F-6545C655FCCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4FA5123-46E8-4731-9D0F-6545C655FCCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4FA5123-46E8-4731-9D0F-6545C655FCCB}.Release|Any CPU.Build.0 = Release|Any CPU
{8DD58A35-6CD1-4D32-800C-81133311674B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8DD58A35-6CD1-4D32-800C-81133311674B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8DD58A35-6CD1-4D32-800C-81133311674B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8DD58A35-6CD1-4D32-800C-81133311674B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
Expand Down
36 changes: 0 additions & 36 deletions XTenLib/Properties/AssemblyInfo.cs

This file was deleted.

1 change: 0 additions & 1 deletion XTenLib/X10Module.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ limitations under the License.

#pragma warning disable 1591

using System;
using System.ComponentModel;

namespace XTenLib
Expand Down
Loading

0 comments on commit dc4361d

Please sign in to comment.