Fix issues with moving of Diagnostics project #405
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ilijagrbic
changed the title
olegsych
approved these changes
Apr 15, 2025
| @@ -11,9 +11,11 @@ | |||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | |||
| <NoWarn>1591</NoWarn> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <ProjectReference Include="..\Microsoft.ServiceFabric.Diagnostics\Microsoft.ServiceFabric.Diagnostics.csproj" /> | |||
There was a problem hiding this comment.
Could you move the new ProjectReference to the same ItemGroup with the other project references and sort the list alphabetically? I use the sort selected lines command in VS and VSCode for this.
There was a problem hiding this comment.
Awesome, I was unaware of this feature. Thanks for point it out. :)
| <PackageReference Include="Microsoft.ServiceFabric.FabricTransport.Internal" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\Microsoft.ServiceFabric.Services.Remoting\Microsoft.ServiceFabric.Services.Remoting.csproj" /> | ||
| <ProjectReference Include="..\Microsoft.ServiceFabric.Services\Microsoft.ServiceFabric.Services.csproj" /> | ||
| <ProjectReference Include="..\Microsoft.ServiceFabric.Diagnostics\Microsoft.ServiceFabric.Diagnostics.csproj" /> |
There was a problem hiding this comment.
Could you re-sort these project references? It looks like it was sorted before.
There was a problem hiding this comment.
I will do this for both this and other project files.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR Addresses several issues with ongoing move of Diagnostics project.
1. Versioning
We had an issue with Microsoft.ServiceFabric.Diagnostics package version.
It was generated as version 1.0.0.0, which would fail AsmSpy verification if imported into WindowsFabric repo. It turns out version for this assembly was not generated properly, which this pull request addresses by modifying csproj of this project to be in line with other projects in this repo.
Furthermore, since this project is moved from WindowsFabric repo, where it had version 11.0.0.0 (same as SF version), we need to keep the versioning consistent, so this is addressed by using a conditional MajorVersion property - 12 for this project, 9 for all the rest.
2. References to old Diagnostics package
References to old diagnostics package need to be removed and replaces with references to the Diagnostics project. The reference itself was also removed from Directory.Packages.props
3. Bump version -> 9.3.0