From 3db10b1071c2f994b6e2ca055b22499a5997fec5 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Fri, 13 Sep 2024 14:39:19 -0400 Subject: [PATCH 1/2] Reformat XML files --- examples/slice/Secure/Server/Server.csproj | 2 +- .../IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.targets | 3 ++- .../IceRpc.ProtobufBuildTelemetry.Reporter.csproj | 6 ++---- tools/IceRpc.Slice.Tools/IceRpc.Slice.Tools.targets | 9 +++------ .../IceRpc.SliceBuildTelemetry.Reporter.csproj | 6 ++---- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/examples/slice/Secure/Server/Server.csproj b/examples/slice/Secure/Server/Server.csproj index 41a385eb4..fb0a6059a 100644 --- a/examples/slice/Secure/Server/Server.csproj +++ b/examples/slice/Secure/Server/Server.csproj @@ -13,7 +13,7 @@ - + diff --git a/tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.targets b/tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.targets index 2b70d7a08..dde1be5c1 100644 --- a/tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.targets +++ b/tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.targets @@ -79,7 +79,8 @@ WorkingDirectory="$(MSBuildThisFileDirectory)../tools/" Command="dotnet IceRpc.ProtobufBuildTelemetry.Reporter.dll --compilation-hash $(CompilationHash) --file-count $(FileCount)" Condition="'$(IceRpcBuildTelemetry)' != 'false'" - ContinueOnError="true" /> + ContinueOnError="true" + /> + ContinueOnError="true" + /> + --> netstandard2.0 10.0 AllEnabledByDefault diff --git a/tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.props b/tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.props index 34c235c20..82298593c 100644 --- a/tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.props +++ b/tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.props @@ -13,7 +13,10 @@ - + $(MSBuildThisFileDirectory)obj/tools/ - + $(MSBuildThisFileDirectory)../tools/ $(MSBuildThisFileDirectory)../tools/ diff --git a/tools/IceRpc.Protobuf.Tools/ProtoFile.ItemDefinition.xaml b/tools/IceRpc.Protobuf.Tools/ProtoFile.ItemDefinition.xaml index c7cab525a..93d298611 100644 --- a/tools/IceRpc.Protobuf.Tools/ProtoFile.ItemDefinition.xaml +++ b/tools/IceRpc.Protobuf.Tools/ProtoFile.ItemDefinition.xaml @@ -1,7 +1,7 @@ - + - - - + + + diff --git a/tools/IceRpc.Slice.Tools/IceRpc.Slice.Tools.targets b/tools/IceRpc.Slice.Tools/IceRpc.Slice.Tools.targets index b3022ebcb..a2f49419d 100644 --- a/tools/IceRpc.Slice.Tools/IceRpc.Slice.Tools.targets +++ b/tools/IceRpc.Slice.Tools/IceRpc.Slice.Tools.targets @@ -79,7 +79,7 @@ + --> + + Name="SliceFileSettings" + DisplayName="General" + PageTemplate="generic" + Description="General properties for Slice files" + xmlns="http://schemas.microsoft.com/build/2009/properties" +> + + + - - - + + + + + - - - - - + - + + + + + - - - - - + + + + + - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/tools/IceRpc.Slice.Tools/SliceFile.ItemDefinition.xaml b/tools/IceRpc.Slice.Tools/SliceFile.ItemDefinition.xaml index a158e785f..b8dc26851 100644 --- a/tools/IceRpc.Slice.Tools/SliceFile.ItemDefinition.xaml +++ b/tools/IceRpc.Slice.Tools/SliceFile.ItemDefinition.xaml @@ -1,7 +1,7 @@ - + - - - + + + diff --git a/tools/IceRpc.Slice.Tools/SliceFile.ProjectProperties.xaml b/tools/IceRpc.Slice.Tools/SliceFile.ProjectProperties.xaml index 8ab3f9967..79e57bdab 100644 --- a/tools/IceRpc.Slice.Tools/SliceFile.ProjectProperties.xaml +++ b/tools/IceRpc.Slice.Tools/SliceFile.ProjectProperties.xaml @@ -1,49 +1,54 @@ - + + Name="SliceFileProjectSettings" + DisplayName="IceRPC Slice Tools" + PageTemplate="generic" + Order="201" + Description="Slice tools project settings" + xmlns="http://schemas.microsoft.com/build/2009/properties" +> + + + - - - + + + + + - - - - - - - - - - - + + + + +