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

Revert "Fix msbuild failing when '@' is present in path" #31464

Merged
merged 1 commit into from Oct 26, 2022
Merged

Revert "Fix msbuild failing when '@' is present in path" #31464

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/csharp/Grpc.Tools/build/_protobuf/Google.Protobuf.Tools.targets
View file
Open in desktop
Expand Up @@ -189,7 +189,7 @@
Condition=" '$(Language)' == 'C#' ">
<ItemGroup>
<_Protobuf_CodeCompile Include="@(Protobuf_ExpectedOutputs->Distinct())"
Condition=" '%(Protobuf_Compile.Source)' != '' and '@(Protobuf_Compile->WithMetadataValue('CompileOutputs', 'true'))' != '' " />
Condition=" '%(Source)' != '' and '@(Protobuf_Compile->WithMetadataValue('CompileOutputs', 'true'))' != '' " />
<Compile Include="@(_Protobuf_CodeCompile)" />
</ItemGroup>
</Target>
Expand All @@ -208,9 +208,9 @@
not matching any proto marked for compilation. -->
<ItemGroup>
<Protobuf_ExpectedOutputs Remove="@(Protobuf_ExpectedOutputs)" Condition=" '%(Protobuf_ExpectedOutputs.Source)' == '' " />
<Protobuf_ExpectedOutputs Remove="@(Protobuf_ExpectedOutputs)" Condition=" '%(Protobuf_ExpectedOutputs.Source)' != '' and '@(Protobuf_Compile)' == '' " />
<Protobuf_ExpectedOutputs Remove="@(Protobuf_ExpectedOutputs)" Condition=" '%(Source)' != '' and '@(Protobuf_Compile)' == '' " />
<Protobuf_Dependencies Remove="@(Protobuf_Dependencies)" Condition=" '%(Protobuf_Dependencies.Source)' == '' " />
<Protobuf_Dependencies Remove="@(Protobuf_Dependencies)" Condition=" '%(Protobuf_Dependencies.Source)' != '' and '@(Protobuf_Compile)' == '' " />
<Protobuf_Dependencies Remove="@(Protobuf_Dependencies)" Condition=" '%(Source)' != '' and '@(Protobuf_Compile)' == '' " />
</ItemGroup>
</Target>

Expand All @@ -228,7 +228,7 @@
<!-- Simple selection: always compile files that have no declared outputs (but warn below). -->
<ItemGroup>
<_Protobuf_OutOfDateProto Include="@(Protobuf_Compile)"
Condition = " '%(Protobuf_Compile.Source)' != '' and '@(Protobuf_ExpectedOutputs)' == '' ">
Condition = " '%(Source)' != '' and '@(Protobuf_ExpectedOutputs)' == '' ">
<_Exec>true</_Exec>
</_Protobuf_OutOfDateProto>
</ItemGroup>
Expand All @@ -238,11 +238,11 @@
will be recompiled on every build, as there is nothing to run up-to-date check against.
Set Protobuf_NoOrphanWarning to 'true' to suppress if this is what you want. -->
<Warning Condition=" '@(_Protobuf_OutOfDateProto)' != '' and '$(Protobuf_NoOrphanWarning)' != 'true' "
Text="The following files have no known outputs, and will be always recompiled as if out-of-date:&#10;@(_Protobuf_OutOfDateProto->'&#10; %(Identity)', '')" />
Text="The following files have no known outputs, and will be always recompiled as if out-of-date:&#10;@(_Protobuf_Orphans->'&#10; %(Identity)', '')" />
</Target>

<Target Name="_Protobuf_GatherStaleBatched"
Inputs="@(Protobuf_Compile);%(Protobuf_Compile.Source);@(Protobuf_Dependencies);$(MSBuildAllProjects)"
Inputs="@(Protobuf_Compile);%(Source);@(Protobuf_Dependencies);$(MSBuildAllProjects)"
Outputs="@(Protobuf_ExpectedOutputs)" >
<!-- The '_Exec' metadatum is set to distinguish really executed items from those MSBuild so
"helpfully" infers in a bucketed task. For the same reason, cannot use the intrinsic
Expand Down Expand Up @@ -296,7 +296,7 @@
<!-- Compute files expected but not in fact produced by protoc. -->
<ItemGroup Condition=" '@(_Protobuf_OutOfDateProto)' != '' ">
<Protobuf_ExpectedNotGenerated Include="@(Protobuf_ExpectedOutputs)"
Condition=" '%(Protobuf_ExpectedOutputs.Source)' != '' and '@(_Protobuf_OutOfDateProto)' != '' " />
Condition=" '%(Source)' != '' and '@(_Protobuf_OutOfDateProto)' != '' " />
<Protobuf_ExpectedNotGenerated Remove="@(_Protobuf_GeneratedFiles)" />
</ItemGroup>
</Target>
Expand Down