Skip to content

Commit c301b90

Browse files
genemarsgenemars
committed
Upgraded to .NET 6
1 parent 5278cec commit c301b90

30 files changed

+126
-430
lines changed

‎MIG.Tests/MIG.Tests.csproj

+15-65
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,17 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
4-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
5-
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}</ProjectGuid>
9-
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10-
<OutputType>Library</OutputType>
11-
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>MIG.Tests</RootNamespace>
13-
<AssemblyName>MIG.Tests</AssemblyName>
14-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
15-
<FileAlignment>512</FileAlignment>
16-
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<PlatformTarget>AnyCPU</PlatformTarget>
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<PlatformTarget>AnyCPU</PlatformTarget>
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
38-
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
39-
<Private>True</Private>
40-
</Reference>
41-
<Reference Include="System" />
42-
<Reference Include="System.Core" />
43-
<Reference Include="System.Data" />
44-
<Reference Include="System.Xml" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<Compile Include="Tests.cs" />
48-
<Compile Include="Properties\AssemblyInfo.cs" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<None Include="packages.config" />
52-
</ItemGroup>
53-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
54-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
553
<PropertyGroup>
56-
<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>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
7+
<IsPackable>false</IsPackable>
578
</PropertyGroup>
58-
<Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
59-
</Target>
60-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
61-
Other similar extension points exist, see Microsoft.Common.targets.
62-
<Target Name="BeforeBuild">
63-
</Target>
64-
<Target Name="AfterBuild">
65-
</Target>
66-
-->
67-
</Project>
9+
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
12+
<PackageReference Include="NUnit" Version="3.13.2" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
14+
<PackageReference Include="coverlet.collector" Version="3.1.0" />
15+
</ItemGroup>
16+
17+
</Project>

‎MIG.Tests/Properties/AssemblyInfo.cs

-35
This file was deleted.

‎MIG.Tests/Tests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎MIG.Tests/packages.config

-4
This file was deleted.

‎MIG.sln

+26-26
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
44
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MIG", "MIG\MIG.csproj", "{005357C9-7F8E-458E-AFFA-BF84F7D6A6AE}"
55
EndProject
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.WebService", "Test.WebService\Test.WebService.csproj", "{E4CB8D80-39EC-4347-8FA1-292904B13AD0}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MIG.Tests", "MIG.Tests\MIG.Tests.csproj", "{849350FD-FA20-4101-9A15-062FCEA18112}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MIG.Tests", "MIG.Tests\MIG.Tests.csproj", "{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.WebService", "Test.WebService\Test.WebService.csproj", "{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,30 +29,30 @@ Global
2929
{005357C9-7F8E-458E-AFFA-BF84F7D6A6AE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
3030
{005357C9-7F8E-458E-AFFA-BF84F7D6A6AE}.Release|x86.ActiveCfg = Release|Any CPU
3131
{005357C9-7F8E-458E-AFFA-BF84F7D6A6AE}.Release|x86.Build.0 = Release|Any CPU
32-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
35-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
36-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Debug|x86.ActiveCfg = Debug|Any CPU
37-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Debug|x86.Build.0 = Debug|Any CPU
38-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Release|Any CPU.Build.0 = Release|Any CPU
40-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
41-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
42-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Release|x86.ActiveCfg = Release|Any CPU
43-
{E4CB8D80-39EC-4347-8FA1-292904B13AD0}.Release|x86.Build.0 = Release|Any CPU
44-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
47-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
48-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Debug|x86.ActiveCfg = Debug|Any CPU
49-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Debug|x86.Build.0 = Debug|Any CPU
50-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Release|Any CPU.Build.0 = Release|Any CPU
52-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
53-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
54-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Release|x86.ActiveCfg = Release|Any CPU
55-
{5074EC2B-D316-4EEB-9A6F-563728CBEDF3}.Release|x86.Build.0 = Release|Any CPU
32+
{849350FD-FA20-4101-9A15-062FCEA18112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{849350FD-FA20-4101-9A15-062FCEA18112}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{849350FD-FA20-4101-9A15-062FCEA18112}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
35+
{849350FD-FA20-4101-9A15-062FCEA18112}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
36+
{849350FD-FA20-4101-9A15-062FCEA18112}.Debug|x86.ActiveCfg = Debug|Any CPU
37+
{849350FD-FA20-4101-9A15-062FCEA18112}.Debug|x86.Build.0 = Debug|Any CPU
38+
{849350FD-FA20-4101-9A15-062FCEA18112}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{849350FD-FA20-4101-9A15-062FCEA18112}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{849350FD-FA20-4101-9A15-062FCEA18112}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
41+
{849350FD-FA20-4101-9A15-062FCEA18112}.Release|Mixed Platforms.Build.0 = Release|Any CPU
42+
{849350FD-FA20-4101-9A15-062FCEA18112}.Release|x86.ActiveCfg = Release|Any CPU
43+
{849350FD-FA20-4101-9A15-062FCEA18112}.Release|x86.Build.0 = Release|Any CPU
44+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
47+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
48+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Debug|x86.ActiveCfg = Debug|Any CPU
49+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Debug|x86.Build.0 = Debug|Any CPU
50+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
53+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Release|Mixed Platforms.Build.0 = Release|Any CPU
54+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Release|x86.ActiveCfg = Release|Any CPU
55+
{5F0E7F51-FF32-4FA9-9EEF-2A7841BABA22}.Release|x86.Build.0 = Release|Any CPU
5656
EndGlobalSection
5757
GlobalSection(MonoDevelopProperties) = preSolution
5858
Policies = $0

‎MIG/MigServiceConfiguration.cs ‎MIG/Config/MigServiceConfiguration.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎MIG/DynamicApi.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎MIG/Events.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ limitations under the License.
2121
* Project Homepage: https://github.com/genielabs/mig-service-dotnet
2222
*/
2323

24-
using System;
2524
using MIG.Config;
2625

2726
namespace MIG

‎MIG/Gateways/Authentication.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎MIG/Gateways/Defs.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎MIG/Gateways/MqttServiceGateway.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -21,8 +21,6 @@ limitations under the License.
2121
* Project Homepage: https://github.com/genielabs/mig-service-dotnet
2222
*/
2323

24-
using System;
25-
2624
namespace MIG.Gateways
2725
{
2826
public class MqttServiceGateway

‎MIG/Gateways/TcpSocketGateway.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -24,9 +24,8 @@ limitations under the License.
2424
using System;
2525
using System.Collections.Generic;
2626
using System.Text;
27-
28-
using MIG.Utility;
2927
using MIG.Config;
28+
using MIG.Utility;
3029

3130
namespace MIG.Gateways
3231
{

‎MIG/Gateways/WebServiceGateway.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -35,11 +35,9 @@ limitations under the License.
3535

3636
using Ude;
3737
using CommonMark;
38-
39-
using MIG.Config;
4038
using System.Diagnostics;
4139
using System.Net.NetworkInformation;
42-
40+
using MIG.Config;
4341
using MIG.Gateways.Authentication;
4442

4543
namespace MIG.Gateways

‎MIG/Gateways/WebServiceUtility.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎MIG/Gateways/WebSocketGateway.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ limitations under the License.
2424
using System;
2525
using System.Collections.Generic;
2626
using System.Linq;
27-
2827
using MIG.Config;
2928
using MIG.Gateways.Authentication;
3029

‎MIG/IMigGateway.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
This file is part of MIG (https://github.com/genielabs/mig-service-dotnet)
33
4-
Copyright (2012-2018) G-Labs (https://github.com/genielabs)
4+
Copyright (2012-2023) G-Labs (https://github.com/genielabs)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -21,10 +21,7 @@ limitations under the License.
2121
* Project Homepage: https://github.com/genielabs/mig-service-dotnet
2222
*/
2323

24-
using System;
2524
using System.Collections.Generic;
26-
using System.Linq;
27-
using System.Text;
2825
using MIG.Config;
2926

3027
namespace MIG

0 commit comments

Comments
 (0)