Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

C# Tooling: change the case to 'Protobuf' consistently

Browse Source 
Users will not be affected, as MSBuild is not case-sensitive.

The changes in C# code are also entirely for consistency; they
do not affect the tooling dll at runtime.

Closes #17884
pull/18471/head
kkm 6 years ago
parent 62ba0b89b1
commit c07a74d0e5
13 changed files with 51 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/csharp/Grpc.Tools.Tests/ProtoCompileBasicTest.cs
  2. 4
      src/csharp/Grpc.Tools.Tests/ProtoCompileCommandLineGeneratorTest.cs
  3. 2
      src/csharp/Grpc.Tools.Tests/ProtoCompileCommandLinePrinterTest.cs
  4. 2
      src/csharp/Grpc.Tools/Common.cs
  5. 2
      src/csharp/Grpc.Tools/GeneratorServices.cs
  6. 8
      src/csharp/Grpc.Tools/ProtoCompile.cs
  7. 4
      src/csharp/Grpc.Tools/ProtoCompilerOutputs.cs
  8. 4
      src/csharp/Grpc.Tools/ProtoReadDependencies.cs
  9. 6
      src/csharp/Grpc.Tools/build/_grpc/Grpc.CSharp.xml
  10. 6
      src/csharp/Grpc.Tools/build/_grpc/_Grpc.Tools.targets
  11. 6
      src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.props
  12. 38
      src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
  13. 18
      src/csharp/Grpc.Tools/build/_protobuf/Protobuf.CSharp.xml

2
src/csharp/Grpc.Tools.Tests/ProtoCompileBasicTest.cs
Unescape View File

@ -62,7 +62,7 @@ namespace Grpc.Tools.Tests
}; };
} }
[TestCase("ProtoBuf")] [TestCase("Protobuf")]
[TestCase("Generator")] [TestCase("Generator")]
[TestCase("OutputDir")] [TestCase("OutputDir")]
[Description("We trust MSBuild to initialize these properties.")] [Description("We trust MSBuild to initialize these properties.")]

4
src/csharp/Grpc.Tools.Tests/ProtoCompileCommandLineGeneratorTest.cs
Unescape View File

@ -30,7 +30,7 @@ namespace Grpc.Tools.Tests
{ {
_task.Generator = "csharp"; _task.Generator = "csharp";
_task.OutputDir = "outdir"; _task.OutputDir = "outdir";
_task.ProtoBuf = Utils.MakeSimpleItems("a.proto"); _task.Protobuf = Utils.MakeSimpleItems("a.proto");
} }
void ExecuteExpectSuccess() void ExecuteExpectSuccess()
@ -55,7 +55,7 @@ namespace Grpc.Tools.Tests
[Test] [Test]
public void CompileTwoFiles() public void CompileTwoFiles()
{ {
_task.ProtoBuf = Utils.MakeSimpleItems("a.proto", "foo/b.proto"); _task.Protobuf = Utils.MakeSimpleItems("a.proto", "foo/b.proto");
ExecuteExpectSuccess(); ExecuteExpectSuccess();
Assert.That(_task.LastResponseFile, Is.EqualTo(new[] { Assert.That(_task.LastResponseFile, Is.EqualTo(new[] {
"--csharp_out=outdir", "--error_format=msvs", "a.proto", "foo/b.proto" })); "--csharp_out=outdir", "--error_format=msvs", "a.proto", "foo/b.proto" }));

2
src/csharp/Grpc.Tools.Tests/ProtoCompileCommandLinePrinterTest.cs
Unescape View File

@ -29,7 +29,7 @@ namespace Grpc.Tools.Tests
{ {
_task.Generator = "csharp"; _task.Generator = "csharp";
_task.OutputDir = "outdir"; _task.OutputDir = "outdir";
_task.ProtoBuf = Utils.MakeSimpleItems("a.proto"); _task.Protobuf = Utils.MakeSimpleItems("a.proto");
_mockEngine _mockEngine
.Setup(me => me.LogMessageEvent(It.IsAny<BuildMessageEventArgs>())) .Setup(me => me.LogMessageEvent(It.IsAny<BuildMessageEventArgs>()))

2
src/csharp/Grpc.Tools/Common.cs
Unescape View File

@ -31,7 +31,7 @@ namespace Grpc.Tools
{ {
// On output dependency lists. // On output dependency lists.
public static string Source = "Source"; public static string Source = "Source";
// On ProtoBuf items. // On Protobuf items.
public static string ProtoRoot = "ProtoRoot"; public static string ProtoRoot = "ProtoRoot";
public static string OutputDir = "OutputDir"; public static string OutputDir = "OutputDir";
public static string GrpcServices = "GrpcServices"; public static string GrpcServices = "GrpcServices";

2
src/csharp/Grpc.Tools/GeneratorServices.cs
Unescape View File

@ -164,7 +164,7 @@ namespace Grpc.Tools
protoDir = EndWithSlash(protoDir); protoDir = EndWithSlash(protoDir);
if (!protoDir.StartsWith(rootDir)) if (!protoDir.StartsWith(rootDir))
{ {
Log.LogWarning("ProtoBuf item '{0}' has the ProtoRoot metadata '{1}' " + Log.LogWarning("Protobuf item '{0}' has the ProtoRoot metadata '{1}' " +
"which is not prefix to its path. Cannot compute relative path.", "which is not prefix to its path. Cannot compute relative path.",
proto, root); proto, root);
return ""; return "";

8
src/csharp/Grpc.Tools/ProtoCompile.cs
Unescape View File

@ -133,7 +133,7 @@ namespace Grpc.Tools
/// Protobuf files to compile. /// Protobuf files to compile.
/// </summary> /// </summary>
[Required] [Required]
public ITaskItem[] ProtoBuf { get; set; } public ITaskItem[] Protobuf { get; set; }
/// <summary> /// <summary>
/// Directory where protoc dependency files are cached. If provided, dependency /// Directory where protoc dependency files are cached. If provided, dependency
@ -237,7 +237,7 @@ namespace Grpc.Tools
Log.LogError("Properties ProtoDepDir and DependencyOut may not be both specified"); Log.LogError("Properties ProtoDepDir and DependencyOut may not be both specified");
} }
if (ProtoBuf.Length > 1 && (ProtoDepDir != null || DependencyOut != null)) if (Protobuf.Length > 1 && (ProtoDepDir != null || DependencyOut != null))
{ {
Log.LogError("Proto compiler currently allows only one input when " + Log.LogError("Proto compiler currently allows only one input when " +
"--dependency_out is specified (via ProtoDepDir or DependencyOut). " + "--dependency_out is specified (via ProtoDepDir or DependencyOut). " +
@ -247,7 +247,7 @@ namespace Grpc.Tools
// Use ProtoDepDir to autogenerate DependencyOut // Use ProtoDepDir to autogenerate DependencyOut
if (ProtoDepDir != null) if (ProtoDepDir != null)
{ {
DependencyOut = DepFileUtil.GetDepFilenameForProto(ProtoDepDir, ProtoBuf[0].ItemSpec); DependencyOut = DepFileUtil.GetDepFilenameForProto(ProtoDepDir, Protobuf[0].ItemSpec);
} }
if (GrpcPluginExe == null) if (GrpcPluginExe == null)
@ -319,7 +319,7 @@ namespace Grpc.Tools
} }
cmd.AddSwitchMaybe("dependency_out", DependencyOut); cmd.AddSwitchMaybe("dependency_out", DependencyOut);
cmd.AddSwitchMaybe("error_format", "msvs"); cmd.AddSwitchMaybe("error_format", "msvs");
foreach (var proto in ProtoBuf) foreach (var proto in Protobuf)
{ {
cmd.AddArg(proto.ItemSpec); cmd.AddArg(proto.ItemSpec);
} }

4
src/csharp/Grpc.Tools/ProtoCompilerOutputs.cs
Unescape View File

@ -38,7 +38,7 @@ namespace Grpc.Tools
/// files actually produced by the compiler. /// files actually produced by the compiler.
/// </summary> /// </summary>
[Required] [Required]
public ITaskItem[] ProtoBuf { get; set; } public ITaskItem[] Protobuf { get; set; }
/// <summary> /// <summary>
/// Output items per each potential output. We do not look at existing /// Output items per each potential output. We do not look at existing
@ -68,7 +68,7 @@ namespace Grpc.Tools
// Get language-specific possible output. The generator expects certain // Get language-specific possible output. The generator expects certain
// metadata be set on the proto item. // metadata be set on the proto item.
var possible = new List<ITaskItem>(); var possible = new List<ITaskItem>();
foreach (var proto in ProtoBuf) foreach (var proto in Protobuf)
{ {
var outputs = generator.GetPossibleOutputs(proto); var outputs = generator.GetPossibleOutputs(proto);
foreach (string output in outputs) foreach (string output in outputs)

4
src/csharp/Grpc.Tools/ProtoReadDependencies.cs
Unescape View File

@ -29,7 +29,7 @@ namespace Grpc.Tools
/// of proto files cached under ProtoDepDir. /// of proto files cached under ProtoDepDir.
/// </summary> /// </summary>
[Required] [Required]
public ITaskItem[] ProtoBuf { get; set; } public ITaskItem[] Protobuf { get; set; }
/// <summary> /// <summary>
/// Directory where protoc dependency files are cached. /// Directory where protoc dependency files are cached.
@ -55,7 +55,7 @@ namespace Grpc.Tools
if (ProtoDepDir != null) if (ProtoDepDir != null)
{ {
var dependencies = new List<ITaskItem>(); var dependencies = new List<ITaskItem>();
foreach (var proto in ProtoBuf) foreach (var proto in Protobuf)
{ {
string[] deps = DepFileUtil.ReadDependencyInputs(ProtoDepDir, proto.ItemSpec, Log); string[] deps = DepFileUtil.ReadDependencyInputs(ProtoDepDir, proto.ItemSpec, Log);
foreach (string dep in deps) foreach (string dep in deps)

6
src/csharp/Grpc.Tools/build/_grpc/Grpc.CSharp.xml
Unescape View File

@ -1,11 +1,11 @@
<ProjectSchemaDefinitions xmlns="http://schemas.microsoft.com/build/2009/properties"> <ProjectSchemaDefinitions xmlns="http://schemas.microsoft.com/build/2009/properties">
<Rule Name="ProtoBuf" <Rule Name="Protobuf"
DisplayName="File Properties" DisplayName="File Properties"
PageTemplate="generic" PageTemplate="generic"
Description="File Properties" Description="File Properties"
OverrideMode="Extend"> OverrideMode="Extend">
<Rule.DataSource> <Rule.DataSource>
<DataSource Persistence="ProjectFile" Label="Configuration" ItemType="ProtoBuf" <DataSource Persistence="ProjectFile" Label="Configuration" ItemType="Protobuf"
HasConfigurationCondition="false" SourceOfDefaultValue="AfterContext" /> HasConfigurationCondition="false" SourceOfDefaultValue="AfterContext" />
</Rule.DataSource> </Rule.DataSource>
@ -21,7 +21,7 @@
<EnumValue Name="Server" DisplayName="Server only" /> <EnumValue Name="Server" DisplayName="Server only" />
<EnumValue Name="None" DisplayName="Do not generate" /> <EnumValue Name="None" DisplayName="Do not generate" />
<EnumProperty.DataSource> <EnumProperty.DataSource>
<DataSource ItemType="ProtoBuf" SourceOfDefaultValue="AfterContext" <DataSource ItemType="Protobuf" SourceOfDefaultValue="AfterContext"
PersistenceStyle="Attribute" /> PersistenceStyle="Attribute" />
</EnumProperty.DataSource> </EnumProperty.DataSource>
</EnumProperty> </EnumProperty>

6
src/csharp/Grpc.Tools/build/_grpc/_Grpc.Tools.targets
Unescape View File

@ -13,9 +13,9 @@
</ItemGroup> </ItemGroup>
<ItemDefinitionGroup Condition=" '$(Protobuf_ProjectSupported)' == 'true' and '$(Language)' == 'C#' "> <ItemDefinitionGroup Condition=" '$(Protobuf_ProjectSupported)' == 'true' and '$(Language)' == 'C#' ">
<ProtoBuf> <Protobuf>
<GrpcServices Condition=" '%(ProtoBuf.GrpcServices)' == '' ">Both</GrpcServices> <GrpcServices Condition=" '%(Protobuf.GrpcServices)' == '' ">Both</GrpcServices>
</ProtoBuf> </Protobuf>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- This target is invoked in a C# project, or can be called in a customized project. --> <!-- This target is invoked in a C# project, or can be called in a customized project. -->

6
src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.props
Unescape View File

@ -15,10 +15,10 @@
<!-- NET SDK projects only: include proto files by default. Other project <!-- NET SDK projects only: include proto files by default. Other project
types are not setting or using $(EnableDefaultItems). types are not setting or using $(EnableDefaultItems).
Note that MSBuild evaluates all ItemGroups and their conditions in the Note that MSBuild evaluates all ItemGroups and their conditions in the
final pass over the build script, so properties like EnableDefaultProtoBufItems final pass over the build script, so properties like EnableDefaultProtobufItems
here can be changed later in the project. --> here can be changed later in the project. -->
<ItemGroup Condition=" '$(Protobuf_ProjectSupported)' == 'true' "> <ItemGroup Condition=" '$(Protobuf_ProjectSupported)' == 'true' ">
<ProtoBuf Include="**/*.proto" <Protobuf Include="**/*.proto"
Condition=" '$(EnableDefaultItems)' == 'true' and '$(EnableDefaultProtoBufItems)' == 'true' " /> Condition=" '$(EnableDefaultItems)' == 'true' and '$(EnableDefaultProtobufItems)' == 'true' " />
</ItemGroup> </ItemGroup>
</Project> </Project>

38
src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
Unescape View File

@ -22,27 +22,27 @@
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition=" '$(Protobuf_ProjectSupported)' == 'true' and '$(Language)' == 'C#' "> <ItemDefinitionGroup Condition=" '$(Protobuf_ProjectSupported)' == 'true' and '$(Language)' == 'C#' ">
<ProtoBuf> <Protobuf>
<Access Condition="'%(ProtoBuf.Access)' == '' ">Public</Access> <Access Condition="'%(Protobuf.Access)' == '' ">Public</Access>
<ProtoCompile Condition="'%(ProtoBuf.ProtoCompile)' == '' ">True</ProtoCompile> <ProtoCompile Condition="'%(Protobuf.ProtoCompile)' == '' ">True</ProtoCompile>
<ProtoRoot Condition="'%(ProtoBuf.ProtoRoot)' == '' " /> <ProtoRoot Condition="'%(Protobuf.ProtoRoot)' == '' " />
<CompileOutputs Condition="'%(ProtoBuf.CompileOutputs)' == ''">True</CompileOutputs> <CompileOutputs Condition="'%(Protobuf.CompileOutputs)' == ''">True</CompileOutputs>
<OutputDir Condition="'%(ProtoBuf.OutputDir)' == '' ">$(Protobuf_OutputPath)</OutputDir> <OutputDir Condition="'%(Protobuf.OutputDir)' == '' ">$(Protobuf_OutputPath)</OutputDir>
</ProtoBuf> </Protobuf>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup Condition=" '$(Protobuf_ProjectSupported)' == 'true' and '$(Language)' == 'C#' "> <ItemGroup Condition=" '$(Protobuf_ProjectSupported)' == 'true' and '$(Language)' == 'C#' ">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)Protobuf.CSharp.xml"> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Protobuf.CSharp.xml">
<Context>File;BrowseObject</Context> <Context>File;BrowseObject</Context>
</PropertyPageSchema> </PropertyPageSchema>
<AvailableItemName Include="ProtoBuf" /> <AvailableItemName Include="Protobuf" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<!-- NET SDK: by default, do not include proto files in the directory. <!-- NET SDK: by default, do not include proto files in the directory.
Current Microsoft's recommendation is against globbing: Current Microsoft's recommendation is against globbing:
https://docs.microsoft.com/en-us/dotnet/core/tools/csproj#recommendation --> https://docs.microsoft.com/en-us/dotnet/core/tools/csproj#recommendation -->
<EnableDefaultProtoBufItems Condition=" '$(EnableDefaultProtoBufItems)' == '' ">false</EnableDefaultProtoBufItems> <EnableDefaultProtobufItems Condition=" '$(EnableDefaultProtobufItems)' == '' ">false</EnableDefaultProtobufItems>
</PropertyGroup> </PropertyGroup>
<!-- Check configuration sanity before build. --> <!-- Check configuration sanity before build. -->
@ -96,7 +96,7 @@
<!-- Main compile sequence. Certain steps are gated by the value $(DisableProtobufDesignTimeBuild), <!-- Main compile sequence. Certain steps are gated by the value $(DisableProtobufDesignTimeBuild),
so the sequence is good for either design time or build time. --> so the sequence is good for either design time or build time. -->
<Target Name="Protobuf_Compile" <Target Name="Protobuf_Compile"
Condition=" '@(ProtoBuf)' != '' " Condition=" '@(Protobuf)' != '' "
DependsOnTargets=" Protobuf_BeforeCompile; DependsOnTargets=" Protobuf_BeforeCompile;
Protobuf_ResolvePlatform; Protobuf_ResolvePlatform;
_Protobuf_SelectFiles; _Protobuf_SelectFiles;
@ -120,13 +120,13 @@
to "." for the project's directory, as it is the current when compiling; for the to "." for the project's directory, as it is the current when compiling; for the
files outside of project directory, use each .proto file's directory as the root. --> files outside of project directory, use each .proto file's directory as the root. -->
<FindUnderPath Path="$(MSBuildProjectDirectory)" <FindUnderPath Path="$(MSBuildProjectDirectory)"
Files="@(ProtoBuf->WithMetadataValue('ProtoRoot',''))"> Files="@(Protobuf->WithMetadataValue('ProtoRoot',''))">
<Output TaskParameter="InPath" ItemName="_Protobuf_NoRootInProject"/> <Output TaskParameter="InPath" ItemName="_Protobuf_NoRootInProject"/>
<Output TaskParameter="OutOfPath" ItemName="_Protobuf_NoRootElsewhere"/> <Output TaskParameter="OutOfPath" ItemName="_Protobuf_NoRootElsewhere"/>
</FindUnderPath> </FindUnderPath>
<ItemGroup> <ItemGroup>
<!-- Files with explicit metadata. --> <!-- Files with explicit metadata. -->
<Protobuf_Compile Include="@(ProtoBuf->HasMetadata('ProtoRoot'))" /> <Protobuf_Compile Include="@(Protobuf->HasMetadata('ProtoRoot'))" />
<!-- In-project files will have ProtoRoot='.'. --> <!-- In-project files will have ProtoRoot='.'. -->
<Protobuf_Compile Include="@(_Protobuf_NoRootInProject)"> <Protobuf_Compile Include="@(_Protobuf_NoRootInProject)">
<ProtoRoot>.</ProtoRoot> <ProtoRoot>.</ProtoRoot>
@ -154,13 +154,13 @@
<Target Name="Protobuf_PrepareCompile" Condition=" '@(Protobuf_Compile)' != '' "> <Target Name="Protobuf_PrepareCompile" Condition=" '@(Protobuf_Compile)' != '' ">
<!-- Predict expected names. --> <!-- Predict expected names. -->
<ProtoCompilerOutputs Condition=" '$(Language)' == 'C#' " <ProtoCompilerOutputs Condition=" '$(Language)' == 'C#' "
ProtoBuf="@(Protobuf_Compile)" Protobuf="@(Protobuf_Compile)"
Generator="$(Protobuf_Generator)"> Generator="$(Protobuf_Generator)">
<Output TaskParameter="PossibleOutputs" ItemName="Protobuf_ExpectedOutputs" /> <Output TaskParameter="PossibleOutputs" ItemName="Protobuf_ExpectedOutputs" />
</ProtoCompilerOutputs> </ProtoCompilerOutputs>
<!-- Read any dependency files from previous compiles. --> <!-- Read any dependency files from previous compiles. -->
<ProtoReadDependencies Condition=" '$(Protobuf_DepFilesPath)' != '' and '$(DisableProtobufDesignTimeBuild)' != 'true' " <ProtoReadDependencies Condition=" '$(Protobuf_DepFilesPath)' != '' and '$(DisableProtobufDesignTimeBuild)' != 'true' "
ProtoBuf="@(Protobuf_Compile)" Protobuf="@(Protobuf_Compile)"
ProtoDepDir="$(Protobuf_DepFilesPath)" > ProtoDepDir="$(Protobuf_DepFilesPath)" >
<Output TaskParameter="Dependencies" ItemName="Protobuf_Dependencies" /> <Output TaskParameter="Dependencies" ItemName="Protobuf_Dependencies" />
</ProtoReadDependencies> </ProtoReadDependencies>
@ -263,7 +263,7 @@
<ProtoCompile Condition=" '@(_Protobuf_OutOfDateProto)' != '' " <ProtoCompile Condition=" '@(_Protobuf_OutOfDateProto)' != '' "
ToolExe="$(Protobuf_ProtocFullPath)" ToolExe="$(Protobuf_ProtocFullPath)"
Generator="$(Protobuf_Generator)" Generator="$(Protobuf_Generator)"
ProtoBuf="%(_Protobuf_OutOfDateProto.Source)" Protobuf="%(_Protobuf_OutOfDateProto.Source)"
ProtoPath="%(_Protobuf_OutOfDateProto.AdditionalImportDirs);$(Protobuf_StandardImportsPath);%(_Protobuf_OutOfDateProto.ProtoRoot)" ProtoPath="%(_Protobuf_OutOfDateProto.AdditionalImportDirs);$(Protobuf_StandardImportsPath);%(_Protobuf_OutOfDateProto.ProtoRoot)"
ProtoDepDir="$(Protobuf_DepFilesPath)" ProtoDepDir="$(Protobuf_DepFilesPath)"
OutputDir="%(_Protobuf_OutOfDateProto.OutputDir)" OutputDir="%(_Protobuf_OutOfDateProto.OutputDir)"
@ -327,7 +327,7 @@
<!-- Main cleanup sequence. --> <!-- Main cleanup sequence. -->
<Target Name="Protobuf_Clean" <Target Name="Protobuf_Clean"
Condition=" '@(ProtoBuf)' != '' " Condition=" '@(Protobuf)' != '' "
DependsOnTargets=" Protobuf_BeforeClean; DependsOnTargets=" Protobuf_BeforeClean;
Protobuf_PrepareClean; Protobuf_PrepareClean;
_Protobuf_CoreClean; _Protobuf_CoreClean;
@ -354,7 +354,7 @@
<Target Name="Protobuf_PrepareClean" Condition=" '@(Protobuf)' != '' "> <Target Name="Protobuf_PrepareClean" Condition=" '@(Protobuf)' != '' ">
<!-- Predict expected names. --> <!-- Predict expected names. -->
<ProtoCompilerOutputs Condition=" '$(Language)' == 'C#' " <ProtoCompilerOutputs Condition=" '$(Language)' == 'C#' "
ProtoBuf="@(Protobuf)" Protobuf="@(Protobuf)"
Generator="$(Protobuf_Generator)"> Generator="$(Protobuf_Generator)">
<Output TaskParameter="PossibleOutputs" ItemName="Protobuf_ExpectedOutputs" /> <Output TaskParameter="PossibleOutputs" ItemName="Protobuf_ExpectedOutputs" />
</ProtoCompilerOutputs> </ProtoCompilerOutputs>
@ -376,9 +376,9 @@
* The Pack target includes .proto files into the source package. --> * The Pack target includes .proto files into the source package. -->
<Target Name="_Protobuf_SourceFilesProjectOutputGroup" <Target Name="_Protobuf_SourceFilesProjectOutputGroup"
BeforeTargets="SourceFilesProjectOutputGroup" BeforeTargets="SourceFilesProjectOutputGroup"
Condition=" '@(ProtoBuf)' != '' " > Condition=" '@(Protobuf)' != '' " >
<ItemGroup> <ItemGroup>
<SourceFilesProjectOutputGroupOutput Include="@(ProtoBuf->'%(FullPath)')" /> <SourceFilesProjectOutputGroupOutput Include="@(Protobuf->'%(FullPath)')" />
</ItemGroup> </ItemGroup>
</Target> </Target>
</Project> </Project>

18
src/csharp/Grpc.Tools/build/_protobuf/Protobuf.CSharp.xml
Unescape View File

@ -4,18 +4,18 @@
<ContentType Name="ProtoFile" <ContentType Name="ProtoFile"
DisplayName="Protocol buffer definitions file" DisplayName="Protocol buffer definitions file"
ItemType="ProtoBuf" /> ItemType="Protobuf" />
<ItemType Name="ProtoBuf" <ItemType Name="Protobuf"
DisplayName="Protobuf compiler" /> DisplayName="Protobuf compiler" />
<Rule Name="ProtoBuf" <Rule Name="Protobuf"
DisplayName="File Properties" DisplayName="File Properties"
PageTemplate="generic" PageTemplate="generic"
Description="File Properties" Description="File Properties"
OverrideMode="Extend"> OverrideMode="Extend">
<Rule.DataSource> <Rule.DataSource>
<DataSource Persistence="ProjectFile" Label="Configuration" ItemType="ProtoBuf" <DataSource Persistence="ProjectFile" Label="Configuration" ItemType="Protobuf"
HasConfigurationCondition="false" SourceOfDefaultValue="AfterContext" /> HasConfigurationCondition="false" SourceOfDefaultValue="AfterContext" />
</Rule.DataSource> </Rule.DataSource>
@ -31,7 +31,7 @@
<StringProperty Name="Identity" Visible="false" ReadOnly="true"> <StringProperty Name="Identity" Visible="false" ReadOnly="true">
<StringProperty.DataSource> <StringProperty.DataSource>
<DataSource Persistence="Intrinsic" ItemType="ProtoBuf" <DataSource Persistence="Intrinsic" ItemType="Protobuf"
PersistedName="Identity" SourceOfDefaultValue="AfterContext" /> PersistedName="Identity" SourceOfDefaultValue="AfterContext" />
</StringProperty.DataSource> </StringProperty.DataSource>
</StringProperty> </StringProperty>
@ -42,7 +42,7 @@
Category="Misc" Category="Misc"
Description="Location of the file."> Description="Location of the file.">
<StringProperty.DataSource> <StringProperty.DataSource>
<DataSource Persistence="Intrinsic" ItemType="ProtoBuf" <DataSource Persistence="Intrinsic" ItemType="Protobuf"
PersistedName="FullPath" SourceOfDefaultValue="AfterContext" /> PersistedName="FullPath" SourceOfDefaultValue="AfterContext" />
</StringProperty.DataSource> </StringProperty.DataSource>
</StringProperty> </StringProperty>
@ -53,7 +53,7 @@
Category="Misc" Category="Misc"
Description="Name of the file or folder."> Description="Name of the file or folder.">
<StringProperty.DataSource> <StringProperty.DataSource>
<DataSource Persistence="Intrinsic" ItemType="ProtoBuf" <DataSource Persistence="Intrinsic" ItemType="Protobuf"
PersistedName="FileNameAndExtension" SourceOfDefaultValue="AfterContext" /> PersistedName="FileNameAndExtension" SourceOfDefaultValue="AfterContext" />
</StringProperty.DataSource> </StringProperty.DataSource>
</StringProperty> </StringProperty>
@ -81,7 +81,7 @@
<EnumValue Name="Public" DisplayName="Public" IsDefault="true" /> <EnumValue Name="Public" DisplayName="Public" IsDefault="true" />
<EnumValue Name="Internal" DisplayName="Internal" /> <EnumValue Name="Internal" DisplayName="Internal" />
<EnumProperty.DataSource> <EnumProperty.DataSource>
<DataSource ItemType="ProtoBuf" SourceOfDefaultValue="AfterContext" <DataSource ItemType="Protobuf" SourceOfDefaultValue="AfterContext"
PersistenceStyle="Attribute" /> PersistenceStyle="Attribute" />
</EnumProperty.DataSource> </EnumProperty.DataSource>
</EnumProperty> </EnumProperty>
@ -90,7 +90,7 @@
Category="Protobuf" Default="true" Category="Protobuf" Default="true"
Description="Specifies if this file is compiled or only imported by other files."> Description="Specifies if this file is compiled or only imported by other files.">
<BoolProperty.DataSource> <BoolProperty.DataSource>
<DataSource ItemType="ProtoBuf" SourceOfDefaultValue="AfterContext" <DataSource ItemType="Protobuf" SourceOfDefaultValue="AfterContext"
PersistenceStyle="Attribute" /> PersistenceStyle="Attribute" />
</BoolProperty.DataSource> </BoolProperty.DataSource>
</BoolProperty> </BoolProperty>

Write Preview
Loading…
Cancel
Save