diff --git a/Samples/ActionClientSample/ActionClientSample.csproj b/Samples/ActionClientSample/ActionClientSample.csproj index 6650648f..e572eb86 100644 --- a/Samples/ActionClientSample/ActionClientSample.csproj +++ b/Samples/ActionClientSample/ActionClientSample.csproj @@ -1,18 +1,18 @@  - - Exe - win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - netcoreapp2.1 - + + Exe + win10-x64;osx.10.11-x64;ubuntu.16.04-x64 + net6.0 + - - - + + + - - - - + + + + \ No newline at end of file diff --git a/Samples/ActionClientTestbed/ActionClientTestbed.csproj b/Samples/ActionClientTestbed/ActionClientTestbed.csproj index 9067dfe5..4894939d 100644 --- a/Samples/ActionClientTestbed/ActionClientTestbed.csproj +++ b/Samples/ActionClientTestbed/ActionClientTestbed.csproj @@ -1,17 +1,17 @@  - - win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - Exe - netcoreapp2.1 - + + win10-x64;osx.10.11-x64;ubuntu.16.04-x64 + Exe + net6.0 + - - - + + + - - - - + + + + \ No newline at end of file diff --git a/Samples/ActionServerSample/ActionServerSample.csproj b/Samples/ActionServerSample/ActionServerSample.csproj index 0ad44c43..c100449d 100644 --- a/Samples/ActionServerSample/ActionServerSample.csproj +++ b/Samples/ActionServerSample/ActionServerSample.csproj @@ -1,19 +1,19 @@  - - win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - Exe - netcoreapp2.1 - + + win10-x64;osx.10.11-x64;ubuntu.16.04-x64 + Exe + net6.0 + - - - + + + + + + + + - - - - - \ No newline at end of file diff --git a/Samples/Listener/Listener.csproj b/Samples/Listener/Listener.csproj index 3e36a2ff..8706fd91 100644 --- a/Samples/Listener/Listener.csproj +++ b/Samples/Listener/Listener.csproj @@ -1,20 +1,20 @@  - - win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - - Exe - - netcoreapp2.1 - + + win10-x64;osx.10.11-x64;ubuntu.16.04-x64 + + Exe + + net6.0 + - - - + + + - - - - + + + + \ No newline at end of file diff --git a/Samples/RosParamClient/RosParamClient.csproj b/Samples/RosParamClient/RosParamClient.csproj index 74346ff1..d929623a 100644 --- a/Samples/RosParamClient/RosParamClient.csproj +++ b/Samples/RosParamClient/RosParamClient.csproj @@ -1,14 +1,14 @@  - - Exe - win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - netcoreapp2.1 - + + Exe + win10-x64;osx.10.11-x64;ubuntu.16.04-x64 + net6.0 + - - - - + + + + \ No newline at end of file diff --git a/Samples/RosoutSample/RosoutSample.csproj b/Samples/RosoutSample/RosoutSample.csproj index 34f41e67..58782069 100644 --- a/Samples/RosoutSample/RosoutSample.csproj +++ b/Samples/RosoutSample/RosoutSample.csproj @@ -1,18 +1,18 @@  - - Exe - win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - netcoreapp2.1 - + + Exe + win10-x64;osx.10.11-x64;ubuntu.16.04-x64 + net6.0 + - - - + + + - - - - + + + + \ No newline at end of file diff --git a/Samples/Talker/Properties/launchSettings.json b/Samples/Talker/Properties/launchSettings.json index eb4e2261..d55b731b 100644 --- a/Samples/Talker/Properties/launchSettings.json +++ b/Samples/Talker/Properties/launchSettings.json @@ -3,8 +3,8 @@ "Talker": { "commandName": "Project", "environmentVariables": { - "ROS_MASTER_URI": "http://192.168.1.115:11311" + "ROS_MASTER_URI": "http://localhost: 11311" } } } -} \ No newline at end of file +} diff --git a/Samples/Talker/Talker.csproj b/Samples/Talker/Talker.csproj index df7e90c6..8c5abce5 100644 --- a/Samples/Talker/Talker.csproj +++ b/Samples/Talker/Talker.csproj @@ -1,22 +1,24 @@  - - win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - exe - - netcoreapp2.1 - + + win10-x64;osx.10.11-x64;ubuntu.16.04-x64 + exe + + net6.0 + Exe + default + - - - - + + + + - - - - + + + + \ No newline at end of file diff --git a/Samples/TransformsSample/TransformsSample.csproj b/Samples/TransformsSample/TransformsSample.csproj index 87460403..7000b8fb 100644 --- a/Samples/TransformsSample/TransformsSample.csproj +++ b/Samples/TransformsSample/TransformsSample.csproj @@ -1,15 +1,15 @@  - - win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - exe - netcoreapp2.1 - + + win10-x64;osx.10.11-x64;ubuntu.16.04-x64 + exe + net6.0 + - - - - - + + + + + \ No newline at end of file diff --git a/Tests/IntegrationTests/IntegrationTests.csproj b/Tests/IntegrationTests/IntegrationTests.csproj index 000f8a14..b3cd6e90 100644 --- a/Tests/IntegrationTests/IntegrationTests.csproj +++ b/Tests/IntegrationTests/IntegrationTests.csproj @@ -1,23 +1,23 @@  - - netcoreapp2.1 - false - + + net6.0 + false + - - - - - - + + + + + + - - - + + + - - - + + + diff --git a/Tests/PubSubTestbed/PubSubTestbed.csproj b/Tests/PubSubTestbed/PubSubTestbed.csproj index 79bbf6f5..fd7bbcca 100644 --- a/Tests/PubSubTestbed/PubSubTestbed.csproj +++ b/Tests/PubSubTestbed/PubSubTestbed.csproj @@ -1,17 +1,17 @@  - - Exe - win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - netcoreapp2.1 - + + Exe + win10-x64;osx.10.11-x64;ubuntu.16.04-x64 + net6.0 + - - - + + + - - - + + + \ No newline at end of file diff --git a/Tests/Uml.Robotics.Ros.UnitTests/Uml.Robotics.Ros.UnitTests.csproj b/Tests/Uml.Robotics.Ros.UnitTests/Uml.Robotics.Ros.UnitTests.csproj index 3ee46c93..c5b020d7 100644 --- a/Tests/Uml.Robotics.Ros.UnitTests/Uml.Robotics.Ros.UnitTests.csproj +++ b/Tests/Uml.Robotics.Ros.UnitTests/Uml.Robotics.Ros.UnitTests.csproj @@ -1,23 +1,23 @@  - - Uml.Robotics.Ros.UnitTests - netcoreapp2.1 - false - + + Uml.Robotics.Ros.UnitTests + net6.0 + false + - - - - - - + + + + + + - - - - + + + + - + diff --git a/Uml.Robotics.Ros.MessageBase/Uml.Robotics.Ros.MessageBase.csproj b/Uml.Robotics.Ros.MessageBase/Uml.Robotics.Ros.MessageBase.csproj index 6313d79c..66e69b13 100644 --- a/Uml.Robotics.Ros.MessageBase/Uml.Robotics.Ros.MessageBase.csproj +++ b/Uml.Robotics.Ros.MessageBase/Uml.Robotics.Ros.MessageBase.csproj @@ -14,18 +14,18 @@ ROS.net Contributors https://raw.githubusercontent.com/Xamla/ROS.NET/master/Icon.png This package contains the the message base assembly which contains base clases for ROS messages, sevices and actions. Every assembly that contains ROS message types for ROS.NET must reference the MessageBase assembly. - netstandard2.0 + netstandard2.1 - - - - + + + + - + diff --git a/Uml.Robotics.Ros.Transforms/Uml.Robotics.Ros.Transforms.csproj b/Uml.Robotics.Ros.Transforms/Uml.Robotics.Ros.Transforms.csproj index 7ec3ec96..6ceaaa03 100644 --- a/Uml.Robotics.Ros.Transforms/Uml.Robotics.Ros.Transforms.csproj +++ b/Uml.Robotics.Ros.Transforms/Uml.Robotics.Ros.Transforms.csproj @@ -13,7 +13,7 @@ ROS.net Contributors https://raw.githubusercontent.com/Xamla/ROS.NET/master/Icon.png Basic ROS TF implemenation for ROS.NET - netstandard2.0 + netstandard2.1 diff --git a/Uml.Robotics.Ros/Uml.Robotics.Ros.csproj b/Uml.Robotics.Ros/Uml.Robotics.Ros.csproj index f6c65315..1cd5c02e 100644 --- a/Uml.Robotics.Ros/Uml.Robotics.Ros.csproj +++ b/Uml.Robotics.Ros/Uml.Robotics.Ros.csproj @@ -1,41 +1,39 @@  - - true - 1.1.2 - 1.1.2 - true - true - snupkg - ../nuget/ - - https://github.com/xamla/ROS.NET - https://raw.githubusercontent.com/Xamla/ROS.NET/master/LICENSE - ROS.net Contributors - https://raw.githubusercontent.com/Xamla/ROS.NET/master/Icon.png - ROS.NET is a CLR implementation of the ROS communication infratructure (topics, services, actions) that can communicate with standard ROS 1 nodes. - netstandard2.0;netcoreapp2.1 - - - - - - - - - - + + netstandard2.1;net6.0 + true + 1.1.2 + 1.1.2 + true + true + snupkg + ../nuget/ - - - - - - + https://github.com/xamla/ROS.NET + https://raw.githubusercontent.com/Xamla/ROS.NET/master/LICENSE + ROS.net Contributors + https://raw.githubusercontent.com/Xamla/ROS.NET/master/Icon.png + ROS.NET is a CLR implementation of the ROS communication infratructure (topics, services, actions) that can communicate with standard ROS 1 nodes. + - - - - + + + + + + + + + + + + + + + + + + diff --git a/Uml.Robotics.XmlRpc/Uml.Robotics.XmlRpc.csproj b/Uml.Robotics.XmlRpc/Uml.Robotics.XmlRpc.csproj index de659c9f..d766cfb6 100644 --- a/Uml.Robotics.XmlRpc/Uml.Robotics.XmlRpc.csproj +++ b/Uml.Robotics.XmlRpc/Uml.Robotics.XmlRpc.csproj @@ -1,25 +1,25 @@  - - netstandard2.0 - 1.0.8 - 1.0.8 - true - true - snupkg - ../nuget/ - - https://raw.githubusercontent.com/Xamla/ROS.NET/master/LICENSE - ROS.net Contributors - https://github.com/xamla/ROS.NET - https://raw.githubusercontent.com/Xamla/ROS.NET/master/Icon.png - XML RPC server and client implementation for ROS.NET - - - - - - - + + netstandard2.1;net6.0 + 1.0.8 + 1.0.8 + true + true + snupkg + ../nuget/ + + https://raw.githubusercontent.com/Xamla/ROS.NET/master/LICENSE + ROS.net Contributors + https://github.com/xamla/ROS.NET + https://raw.githubusercontent.com/Xamla/ROS.NET/master/Icon.png + XML RPC server and client implementation for ROS.NET + + + + + + + diff --git a/YAMLParser/Program.cs b/YAMLParser/Program.cs index 0399eea8..2ca74f7a 100644 --- a/YAMLParser/Program.cs +++ b/YAMLParser/Program.cs @@ -33,7 +33,7 @@ internal class Program public static void Main(params string[] args) { - var app = new CommandLineApplication(throwOnUnexpectedArg: true); + var app = new CommandLineApplication(); CommandOption projectName = app.Option("-n|--name", "Name of the generated project file. (required)", CommandOptionType.SingleValue); CommandOption messageDirectories = app.Option("-m|--message-dirs", "Directories where ROS message definitions are located. (required)", CommandOptionType.MultipleValue); @@ -58,8 +58,8 @@ public static void Main(params string[] args) } Program.Run( - messageDirectories.HasValue() ? messageDirectories.Values : null, - assemblies.HasValue() ? assemblies.Values : null, + messageDirectories.HasValue() ? messageDirectories.Values.ToList() : null, + assemblies.HasValue() ? assemblies.Values.ToList() : null, nugetPackages.HasValue() ? nugetPackages.Values : null, outputDirectory.HasValue() ? outputDirectory.Value() : null, interactive.HasValue(), @@ -492,4 +492,4 @@ static Process RunDotNet(string command, string args) return proc; } } -} \ No newline at end of file +} diff --git a/YAMLParser/YAMLParser.csproj b/YAMLParser/YAMLParser.csproj index 6a197b14..6928dc4b 100644 --- a/YAMLParser/YAMLParser.csproj +++ b/YAMLParser/YAMLParser.csproj @@ -1,45 +1,46 @@  - - win10-x64;osx.10.11-x64;ubuntu.16.04-x64 - - - netcoreapp2.1 - Exe - + + win10-x64;osx.10.11-x64;ubuntu.16.04-x64 + + + net6.0 + Exe + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - Always - - + + + + Always + + \ No newline at end of file diff --git a/rosmaster/rosmaster.csproj b/rosmaster/rosmaster.csproj index e04a16d1..8270dfde 100644 --- a/rosmaster/rosmaster.csproj +++ b/rosmaster/rosmaster.csproj @@ -1,14 +1,14 @@  - - Exe - netcoreapp2-0 - + + Exe + net6 + - - - - - + + + + + \ No newline at end of file diff --git a/rosmaster/rosmaster.sln b/rosmaster/rosmaster.sln index 7122e173..7bc65b6f 100644 --- a/rosmaster/rosmaster.sln +++ b/rosmaster/rosmaster.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26228.4 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32804.467 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "rosmaster", "rosmaster.csproj", "{778019E9-D445-4B87-81FD-AB3E0AA9E536}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uml.Robotics.Ros", "..\Uml.Robotics.Ros\Uml.Robotics.Ros.csproj", "{2D1EA725-5602-4865-B768-74F385EB4B8E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uml.Robotics.XmlRpc", "..\Uml.Robotics.XmlRpc\Uml.Robotics.XmlRpc.csproj", "{2D1EA725-5602-4865-B768-74F385EB4B8E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uml.Robotics.XmlRpc", "..\Uml.Robotics.XmlRpc\Uml.Robotics.XmlRpc.csproj", "{CE7D35DE-06AC-494E-866C-6382EC146406}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Messages", "..\Messages\Messages.csproj", "{31F063FF-8A78-4BCC-B6F6-A65CD6C83C95}" EndProject @@ -75,6 +75,30 @@ Global {2D1EA725-5602-4865-B768-74F385EB4B8E}.Release|x64.Build.0 = Release|Any CPU {2D1EA725-5602-4865-B768-74F385EB4B8E}.Release|x86.ActiveCfg = Release|Any CPU {2D1EA725-5602-4865-B768-74F385EB4B8E}.Release|x86.Build.0 = Release|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.3M4|Any CPU.ActiveCfg = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.3M4|Any CPU.Build.0 = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.3M4|Mixed Platforms.ActiveCfg = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.3M4|Mixed Platforms.Build.0 = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.3M4|x64.ActiveCfg = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.3M4|x64.Build.0 = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.3M4|x86.ActiveCfg = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.3M4|x86.Build.0 = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Debug|x64.ActiveCfg = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Debug|x64.Build.0 = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Debug|x86.ActiveCfg = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Debug|x86.Build.0 = Debug|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Release|Any CPU.Build.0 = Release|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Release|x64.ActiveCfg = Release|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Release|x64.Build.0 = Release|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Release|x86.ActiveCfg = Release|Any CPU + {CE7D35DE-06AC-494E-866C-6382EC146406}.Release|x86.Build.0 = Release|Any CPU {31F063FF-8A78-4BCC-B6F6-A65CD6C83C95}.3M4|Any CPU.ActiveCfg = Debug|Any CPU {31F063FF-8A78-4BCC-B6F6-A65CD6C83C95}.3M4|Any CPU.Build.0 = Debug|Any CPU {31F063FF-8A78-4BCC-B6F6-A65CD6C83C95}.3M4|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -99,32 +123,11 @@ Global {31F063FF-8A78-4BCC-B6F6-A65CD6C83C95}.Release|x64.Build.0 = Release|Any CPU {31F063FF-8A78-4BCC-B6F6-A65CD6C83C95}.Release|x86.ActiveCfg = Release|Any CPU {31F063FF-8A78-4BCC-B6F6-A65CD6C83C95}.Release|x86.Build.0 = Release|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.3M4|Any CPU.ActiveCfg = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.3M4|Any CPU.Build.0 = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.3M4|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.3M4|Mixed Platforms.Build.0 = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.3M4|x64.ActiveCfg = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.3M4|x64.Build.0 = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.3M4|x86.ActiveCfg = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.3M4|x86.Build.0 = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Debug|x64.ActiveCfg = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Debug|x64.Build.0 = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Debug|x86.ActiveCfg = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Debug|x86.Build.0 = Debug|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Release|Any CPU.Build.0 = Release|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Release|x64.ActiveCfg = Release|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Release|x64.Build.0 = Release|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Release|x86.ActiveCfg = Release|Any CPU - {8EF23959-2DC8-48E4-BB80-189EB9D2EDD6}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {38274F63-DBD0-4A72-BED4-6484D7FDEF0C} + EndGlobalSection EndGlobal