Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Edits to fix conflicts in generated Vector.cs file #16666

Merged
merged 1 commit into from
Mar 1, 2018

Conversation

WinCPP
Copy link

@WinCPP WinCPP commented Feb 28, 2018

Fixed minor space changes and one syntax error that causes conflict between checked in Vector.cs file and the freshly auto-generated Vector.cs file.

This is as per the discussion at this link.

@eerhardt Please review the changes.

Thanks,
Mandar

Fixed minor space changes and one syntax error that causes conflict between checked in Vector.cs file and the freshly auto-generated Vector.cs file.
Copy link
Member

@eerhardt eerhardt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for fixing these conflicts.

I assume you ran the .tt file, and the generated .cs file is completely up-to-date.

@WinCPP
Copy link
Author

WinCPP commented Feb 28, 2018

I have used the online editor to do the changes. Hence will be monitoring this PR for the builds. These are the changes that are identical to what I have in my sandbox and compile fine...

@WinCPP WinCPP changed the title Edits to fix conflicts in generated Vector.cs file WIP: Edits to fix conflicts in generated Vector.cs file Feb 28, 2018
@eerhardt
Copy link
Member

Note that the .tt generator only runs manually in VS, it doesn't run as part of the build. That's why/how the files got out of sync.

@WinCPP
Copy link
Author

WinCPP commented Feb 28, 2018

@eerhardt purposely put a WIP while I'm monitoring the builds...

Note that the .tt generator only runs manually in VS, it doesn't run as part of the build. That's why/how the files got out of sync.

Ah. ok. now I understand. The code edits that I have done to tt file will generate the matching cs file. So that way we are good, I guess...

@WinCPP WinCPP changed the title WIP: Edits to fix conflicts in generated Vector.cs file Edits to fix conflicts in generated Vector.cs file Mar 1, 2018
@jkotas jkotas merged commit 1746cb7 into dotnet:master Mar 1, 2018
dotnet-bot pushed a commit to dotnet/corefx that referenced this pull request Mar 1, 2018
)

Fixed minor space changes and one syntax error that causes conflict between checked in Vector.cs file and the freshly auto-generated Vector.cs file.

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
jkotas pushed a commit to dotnet/corefx that referenced this pull request Mar 1, 2018
)

Fixed minor space changes and one syntax error that causes conflict between checked in Vector.cs file and the freshly auto-generated Vector.cs file.

Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
dotnet-bot pushed a commit to dotnet/corert that referenced this pull request Mar 1, 2018
)

Fixed minor space changes and one syntax error that causes conflict between checked in Vector.cs file and the freshly auto-generated Vector.cs file.

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
stephentoub pushed a commit to dotnet/corert that referenced this pull request Mar 1, 2018
)

Fixed minor space changes and one syntax error that causes conflict between checked in Vector.cs file and the freshly auto-generated Vector.cs file.

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
kbaladurin pushed a commit to kbaladurin/corert that referenced this pull request Mar 15, 2018
)

Fixed minor space changes and one syntax error that causes conflict between checked in Vector.cs file and the freshly auto-generated Vector.cs file.

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants