This is an automated email from the ASF dual-hosted git repository. havret pushed a commit to branch Housekeeping in repository https://gitbox.apache.org/repos/asf/activemq-nms-amqp.git
commit e8697bf06b8d9466704fecd0a9c3778f9ce55592 Author: Havret <[email protected]> AuthorDate: Thu Jun 26 00:13:24 2025 +0200 NO-JIRA Clean up project structure --- .editorconfig | 12 ++++++++++++ Directory.Build.props | 6 ++++++ apache-nms-amqp.sln | 9 +++++++++ src/HelloWorld/HelloWorld.csproj | 3 --- src/NMS.AMQP/Apache-NMS-AMQP.csproj | 4 +--- src/NMS.AMQP/Policies/DefaultRedeliveryPolicy.cs | 0 src/PingPong/PingPong.csproj | 1 - src/StructuredMessage/StructuredMessage.csproj | 3 --- src/Transactions/Transactions.csproj | 2 -- .../Apache-NMS-AMQP-Interop-Test.csproj | 3 --- test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj | 7 ++----- 11 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..65cffc0 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +# editorconfig.org +# top-most EditorConfig file +root = true + +# Visual Studio XML project files +[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] +indent_size = 2 +charset = utf-8 + +# Visual Studio and .NET related XML config files +[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct,stylecop}] +indent_size = 2 \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..d50ecae --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,6 @@ +<Project> + <PropertyGroup> + <LangVersion>13</LangVersion> + <TargetFramework>net9.0</TargetFramework> + </PropertyGroup> +</Project> \ No newline at end of file diff --git a/apache-nms-amqp.sln b/apache-nms-amqp.sln index 8cc386e..21a06ef 100644 --- a/apache-nms-amqp.sln +++ b/apache-nms-amqp.sln @@ -23,6 +23,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmark", "benchmark", "{ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PingPong", "src\PingPong\PingPong.csproj", "{CA6094FA-B615-47E6-A5D5-224BE62CDF70}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{54150DEF-1084-4756-A637-A07E080BB87F}" + ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + NOTICE.txt = NOTICE.txt + package.ps1 = package.ps1 + README.md = README.md + LICENSE.txt = LICENSE.txt + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/HelloWorld/HelloWorld.csproj b/src/HelloWorld/HelloWorld.csproj index 14b17d0..505f5ac 100644 --- a/src/HelloWorld/HelloWorld.csproj +++ b/src/HelloWorld/HelloWorld.csproj @@ -17,12 +17,9 @@ under the License. --> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks> - <TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework> <OutputType>Exe</OutputType> <RootNamespace>HelloWorld</RootNamespace> <AssemblyName>HelloWorld</AssemblyName> - <LangVersion>7.3</LangVersion> </PropertyGroup> <ItemGroup> diff --git a/src/NMS.AMQP/Apache-NMS-AMQP.csproj b/src/NMS.AMQP/Apache-NMS-AMQP.csproj index 2982cea..aa03182 100644 --- a/src/NMS.AMQP/Apache-NMS-AMQP.csproj +++ b/src/NMS.AMQP/Apache-NMS-AMQP.csproj @@ -17,12 +17,10 @@ with the License. You may obtain a copy of the License at --> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <OutputType>Library</OutputType> - <TargetFrameworks>netstandard2.0</TargetFrameworks> + <TargetFramework>netstandard2.0</TargetFramework> <RootNamespace>Apache.NMS.AMQP</RootNamespace> <AssemblyName>Apache.NMS.AMQP</AssemblyName> - <LangVersion>7.3</LangVersion> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> diff --git a/src/NMS.AMQP/Policies/DefaultRedeliveryPolicy.cs b/src/NMS.AMQP/Policies/DefaultRedeliveryPolicy.cs new file mode 100644 index 0000000..e69de29 diff --git a/src/PingPong/PingPong.csproj b/src/PingPong/PingPong.csproj index 38b0af5..d3cae64 100644 --- a/src/PingPong/PingPong.csproj +++ b/src/PingPong/PingPong.csproj @@ -18,7 +18,6 @@ with the License. You may obtain a copy of the License at <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFramework>netcoreapp2.1</TargetFramework> </PropertyGroup> <ItemGroup> diff --git a/src/StructuredMessage/StructuredMessage.csproj b/src/StructuredMessage/StructuredMessage.csproj index ea92a54..b3da8bd 100644 --- a/src/StructuredMessage/StructuredMessage.csproj +++ b/src/StructuredMessage/StructuredMessage.csproj @@ -17,12 +17,9 @@ under the License. --> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks> - <TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework> <OutputType>Exe</OutputType> <RootNamespace>StructuredMessage</RootNamespace> <AssemblyName>StructuredMessage</AssemblyName> - <LangVersion>7.3</LangVersion> </PropertyGroup> <ItemGroup> diff --git a/src/Transactions/Transactions.csproj b/src/Transactions/Transactions.csproj index 68b90ff..8a0b657 100644 --- a/src/Transactions/Transactions.csproj +++ b/src/Transactions/Transactions.csproj @@ -18,8 +18,6 @@ under the License. <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFramework>netcoreapp2.1</TargetFramework> - <TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework> </PropertyGroup> <ItemGroup> diff --git a/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj b/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj index 07a722b..b103422 100644 --- a/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj +++ b/test/Apache-NMS-AMQP-Interop-Test/Apache-NMS-AMQP-Interop-Test.csproj @@ -16,11 +16,8 @@ under the License. --> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks> - <TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework> <RootNamespace>NMS.AMQP.Test</RootNamespace> <AssemblyName>NMS.AMQP.Interop.Test</AssemblyName> - <LangVersion>7.3</LangVersion> </PropertyGroup> <ItemGroup> diff --git a/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj b/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj index 5452060..8bb08c1 100644 --- a/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj +++ b/test/Apache-NMS-AMQP-Test/Apache-NMS-AMQP-Test.csproj @@ -16,16 +16,12 @@ under the License. --> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks> - <TargetFramework Condition="'$(AppTargetFramework)' != ''">$(AppTargetFramework)</TargetFramework> <RootNamespace>NMS.AMQP.Test</RootNamespace> <AssemblyName>NMS.AMQP.Test</AssemblyName> - <LangVersion>7.3</LangVersion> + <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization> </PropertyGroup> <ItemGroup> <Compile Remove="Test\**" /> - <EmbeddedResource Remove="Test\**" /> - <None Remove="Test\**" /> </ItemGroup> <ItemGroup> @@ -35,6 +31,7 @@ under the License. <PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit.Console" Version="3.10.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> + <PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.6" /> </ItemGroup> <ItemGroup> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
