Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reformat XML files #4065

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Reformat XML files #4065

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3db10b1
Reformat XML files
bernardnormier Sep 13, 2024
c26d115
More reformatting
bernardnormier Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/slice/Secure/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
</ItemGroup>

<ItemGroup>
<SliceFile Include="../slice/Greeter.slice" />
<PackageReference Include="IceRpc.Slice.Tools" Version="$(IceRpcVersion)" PrivateAssets="All" />
Expand Down
3 changes: 2 additions & 1 deletion tools/IceRpc.Protobuf.Tools/IceRpc.Protobuf.Tools.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>

<!--
Include all C# generated source items that have not been already included. We delay this until we are
Expand Down
6 changes: 2 additions & 4 deletions tools/IceRpc.ProtobufBuildTelemetry.Reporter/IceRpc.ProtobufBuildTelemetry.Reporter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(MSBuildThisFileDirectory)../../build/IceRpc.Version.props" />
<Import Project="../IceRpc.Slice.Tools/IceRpc.Slice.Tools.props" />
Expand All @@ -11,9 +11,7 @@
<CopyDebugSymbolFilesFromPackages>true</CopyDebugSymbolFilesFromPackages>
</PropertyGroup>
<ItemGroup>
<SliceFile
Include="../slice/BuildTelemetry.slice"
OutputDir="$(MSBuildProjectDirectory)/generated" />
<SliceFile Include="../slice/BuildTelemetry.slice" OutputDir="$(MSBuildProjectDirectory)/generated" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<ProjectReference Include="../../src/IceRpc.Slice/IceRpc.Slice.csproj" />
</ItemGroup>
Expand Down
9 changes: 3 additions & 6 deletions tools/IceRpc.Slice.Tools/IceRpc.Slice.Tools.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@
Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"
/>
</ItemGroup>
<Target
Name="SliceC"
BeforeTargets="CoreCompile"
Condition="@(SliceFile) != ''"
>
<Target Name="SliceC" BeforeTargets="CoreCompile" Condition="@(SliceFile) != ''">
<MakeDir Directories="%(SliceFile.OutputDir)" />
<!-- Compile the Slice files -->
<SliceCCSharpTask
Expand All @@ -77,7 +73,8 @@
WorkingDirectory="$(MSBuildThisFileDirectory)../tools/"
Command="dotnet IceRpc.SliceBuildTelemetry.Reporter.dll --compilation-hash $(CompilationHash) --contains-slice1 $(ContainsSlice1) --contains-slice2 $(ContainsSlice2) --ref-file-count $(ReferenceFileCount) --src-file-count $(SourceFileCount)"
Condition="'$(IceRpcBuildTelemetry)' != 'false'"
ContinueOnError="true" />
ContinueOnError="true"
/>

<!--
Include all C# generated source items that have not been already included. We delay this until we are
Expand Down
6 changes: 2 additions & 4 deletions tools/IceRpc.SliceBuildTelemetry.Reporter/IceRpc.SliceBuildTelemetry.Reporter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(MSBuildThisFileDirectory)../../build/IceRpc.Version.props" />
<Import Project="../IceRpc.Slice.Tools/IceRpc.Slice.Tools.props" />
Expand All @@ -11,9 +11,7 @@
<CopyDebugSymbolFilesFromPackages>true</CopyDebugSymbolFilesFromPackages>
</PropertyGroup>
<ItemGroup>
<SliceFile
Include="../slice/BuildTelemetry.slice"
OutputDir="$(MSBuildProjectDirectory)/generated" />
<SliceFile Include="../slice/BuildTelemetry.slice" OutputDir="$(MSBuildProjectDirectory)/generated" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<ProjectReference Include="../../src/IceRpc.Slice/IceRpc.Slice.csproj" />
</ItemGroup>
Expand Down