diff options
author | Mario Emmenlauer <memmenlauer@biodataanalysis.de> | 2021-08-25 11:53:41 +0200 |
---|---|---|
committer | Mario Emmenlauer <memmenlauer@biodataanalysis.de> | 2021-08-25 11:55:05 +0200 |
commit | db997bde47674ed61acb93dea1522b4f16f8e489 (patch) | |
tree | ed59434f7e0d8f4d1d32276e8da971e250bb4f0d | |
parent | ace8613f0f21601296744eedc1ce80dd1ca0fdae (diff) | |
download | thrift-db997bde47674ed61acb93dea1522b4f16f8e489.tar.gz |
Minor whitespace cleanup in csproj files
-rw-r--r-- | lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj | 4 | ||||
-rw-r--r-- | lib/netstd/Thrift/Thrift.csproj | 66 | ||||
-rw-r--r-- | test/netstd/Client/Client.csproj | 3 | ||||
-rw-r--r-- | test/netstd/Server/Server.csproj | 3 | ||||
-rw-r--r-- | tutorial/netstd/Client/Client.csproj | 1 | ||||
-rw-r--r-- | tutorial/netstd/Interfaces/Interfaces.csproj | 1 | ||||
-rw-r--r-- | tutorial/netstd/Server/Server.csproj | 1 |
7 files changed, 43 insertions, 36 deletions
diff --git a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj index 97bd28653..f1dc73155 100644 --- a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj +++ b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj @@ -17,10 +17,12 @@ specific language governing permissions and limitations under the License. --> + <PropertyGroup> <TargetFramework>net5.0</TargetFramework> <Version>0.16.0.0</Version> </PropertyGroup> + <ItemGroup> <PackageReference Include="CompareNETObjects" Version="4.72.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" /> @@ -28,10 +30,12 @@ <PackageReference Include="MSTest.TestFramework" Version="2.1.2" /> <PackageReference Include="NSubstitute" Version="4.2.2" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="..\..\Thrift\Thrift.csproj" /> <ProjectReference Include="..\Thrift.PublicInterfaces.Compile.Tests\Thrift.PublicInterfaces.Compile.Tests.csproj" /> </ItemGroup> + <ItemGroup> <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> </ItemGroup> diff --git a/lib/netstd/Thrift/Thrift.csproj b/lib/netstd/Thrift/Thrift.csproj index 328dd4447..ec9771261 100644 --- a/lib/netstd/Thrift/Thrift.csproj +++ b/lib/netstd/Thrift/Thrift.csproj @@ -18,40 +18,40 @@ under the License. --> -<PropertyGroup> - <TargetFrameworks>netstandard2.1;netstandard2.0;net5.0</TargetFrameworks> - <AssemblyName>Thrift</AssemblyName> - <PackageId>ApacheThrift</PackageId> - <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType> - <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute> - <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute> - <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> - <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> - <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> - <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute> - <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute> - <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute> -</PropertyGroup> + <PropertyGroup> + <TargetFrameworks>netstandard2.1;netstandard2.0;net5.0</TargetFrameworks> + <AssemblyName>Thrift</AssemblyName> + <PackageId>ApacheThrift</PackageId> + <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> + <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType> + <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute> + <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute> + <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> + <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> + <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> + <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute> + <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute> + <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute> + </PropertyGroup> -<PropertyGroup> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <SignAssembly>true</SignAssembly> - <AssemblyOriginatorKeyFile>thrift.snk</AssemblyOriginatorKeyFile> - <DelaySign>false</DelaySign> - <Title>Apache Thrift 0.16.0</Title> - <Version>0.16.0.0</Version> - <GeneratePackageOnBuild>false</GeneratePackageOnBuild> - <PackageProjectUrl>http://thrift.apache.org/</PackageProjectUrl> - <Authors>Apache Thrift Developers</Authors> - <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> - <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression> - <PackageDescription>C# .NET Core bindings for the Apache Thrift RPC system</PackageDescription> - <PackageReleaseNotes></PackageReleaseNotes> - <PackageTags>Apache Thrift RPC</PackageTags> - <PackageReleaseNotes>https://github.com/apache/thrift/blob/0.16.0/CHANGES.md</PackageReleaseNotes> - <Copyright>Copyright 2021 The Apache Software Foundation</Copyright> -</PropertyGroup> + <PropertyGroup> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <SignAssembly>true</SignAssembly> + <AssemblyOriginatorKeyFile>thrift.snk</AssemblyOriginatorKeyFile> + <DelaySign>false</DelaySign> + <Title>Apache Thrift 0.16.0</Title> + <Version>0.16.0.0</Version> + <GeneratePackageOnBuild>false</GeneratePackageOnBuild> + <PackageProjectUrl>http://thrift.apache.org/</PackageProjectUrl> + <Authors>Apache Thrift Developers</Authors> + <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> + <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression> + <PackageDescription>C# .NET Core bindings for the Apache Thrift RPC system</PackageDescription> + <PackageReleaseNotes></PackageReleaseNotes> + <PackageTags>Apache Thrift RPC</PackageTags> + <PackageReleaseNotes>https://github.com/apache/thrift/blob/0.16.0/CHANGES.md</PackageReleaseNotes> + <Copyright>Copyright 2021 The Apache Software Foundation</Copyright> + </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" /> diff --git a/test/netstd/Client/Client.csproj b/test/netstd/Client/Client.csproj index 50798f469..a33143613 100644 --- a/test/netstd/Client/Client.csproj +++ b/test/netstd/Client/Client.csproj @@ -32,15 +32,18 @@ <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute> </PropertyGroup> + <ItemGroup> <PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0" /> <PackageReference Include="System.Runtime.Serialization.Primitives" Version="[4.3,)" /> <PackageReference Include="System.ServiceModel.Primitives" Version="4.8.1" /> <PackageReference Include="System.Threading" Version="[4.3,)" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="..\..\..\lib\netstd\Thrift\Thrift.csproj" /> </ItemGroup> + <Target Name="PreBuild" BeforeTargets="_GenerateRestoreProjectSpec;Restore;Compile"> <Exec Condition="'$(OS)' == 'Windows_NT'" Command="where thrift" ConsoleToMSBuild="true"> <Output TaskParameter="ConsoleOutput" PropertyName="PathToThrift" /> diff --git a/test/netstd/Server/Server.csproj b/test/netstd/Server/Server.csproj index a176dda69..f5ddc0f72 100644 --- a/test/netstd/Server/Server.csproj +++ b/test/netstd/Server/Server.csproj @@ -32,6 +32,7 @@ <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute> </PropertyGroup> + <ItemGroup> <PackageReference Include="System.IO.Pipes" Version="4.3.0" /> <PackageReference Include="System.IO.Pipes.AccessControl" Version="5.0.0" /> @@ -40,9 +41,11 @@ <PackageReference Include="System.ServiceModel.Primitives" Version="4.8.1" /> <PackageReference Include="System.Threading" Version="[4.3,)" /> </ItemGroup> + <ItemGroup> <ProjectReference Include="..\..\..\lib\netstd\Thrift\Thrift.csproj" /> </ItemGroup> + <Target Name="PreBuild" BeforeTargets="_GenerateRestoreProjectSpec;Restore;Compile"> <Exec Condition="'$(OS)' == 'Windows_NT'" Command="where thrift" ConsoleToMSBuild="true"> <Output TaskParameter="ConsoleOutput" PropertyName="PathToThrift" /> diff --git a/tutorial/netstd/Client/Client.csproj b/tutorial/netstd/Client/Client.csproj index 9e903b930..1f877517e 100644 --- a/tutorial/netstd/Client/Client.csproj +++ b/tutorial/netstd/Client/Client.csproj @@ -39,5 +39,4 @@ <ProjectReference Include="..\Interfaces\Interfaces.csproj" /> <ProjectReference Include="..\..\..\lib\netstd\Thrift\Thrift.csproj" /> </ItemGroup> - </Project> diff --git a/tutorial/netstd/Interfaces/Interfaces.csproj b/tutorial/netstd/Interfaces/Interfaces.csproj index ad46bd583..989f6db40 100644 --- a/tutorial/netstd/Interfaces/Interfaces.csproj +++ b/tutorial/netstd/Interfaces/Interfaces.csproj @@ -45,5 +45,4 @@ <Exec Condition="Exists('thrift')" Command="thrift -out $(ProjectDir) -gen netstd:wcf,union,serial -r ./../../tutorial.thrift" /> <Exec Condition="Exists('./../../../compiler/cpp/thrift')" Command="./../../../compiler/cpp/thrift -out $(ProjectDir) -gen netstd:wcf,union,serial -r ./../../tutorial.thrift" /> </Target> - </Project> diff --git a/tutorial/netstd/Server/Server.csproj b/tutorial/netstd/Server/Server.csproj index d4ada3e29..e5e54a5b1 100644 --- a/tutorial/netstd/Server/Server.csproj +++ b/tutorial/netstd/Server/Server.csproj @@ -42,5 +42,4 @@ <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" /> </ItemGroup> - </Project> |