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

Added support for Protobuf-includes in C# projects #190

Merged
merged 3 commits into from
Apr 30, 2022
Merged

Added support for Protobuf-includes in C# projects #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51db97d
Added support for Protobuf-includes in C# projects, see: https://docs…
Trithek Mar 25, 2022
f7ce9e6
Added a forgotten line that caused .proto files to not be automatical…
Trithek Mar 28, 2022
82b06c5
Merge branch 'dev' into protobuf
belkiss Apr 30, 2022
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
5 changes: 5 additions & 0 deletions Sharpmake.Generators/VisualStudio/Csproj.Template.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,13 @@ public static class ItemGroups
public static string EntityDeployEnd =
@" </EntityDeploy>
";

public static string FrameworkReference =
@" <FrameworkReference Include=""[include]"" />
";

public static string Protobuf =
@" <Protobuf Include=""[include]"" GrpcServices=""Both"" />
";
}

Expand Down
22 changes: 22 additions & 0 deletions Sharpmake.Generators/VisualStudio/Csproj.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ internal class ItemGroups
internal ItemGroup<Analyzer> Analyzers = new ItemGroup<Analyzer>();
internal ItemGroup<VSIXSourceItem> VSIXSourceItems = new ItemGroup<VSIXSourceItem>();
internal ItemGroup<FolderInclude> FolderIncludes = new ItemGroup<FolderInclude>();
internal ItemGroup<Protobuf> Protobufs = new ItemGroup<Protobuf>();

internal string Resolve(Resolver resolver)
{
Expand Down Expand Up @@ -94,6 +95,7 @@ internal string Resolve(Resolver resolver)
writer.Write(VSIXSourceItems.Resolve(resolver));
writer.Write(FolderIncludes.Resolve(resolver));
writer.Write(WCFMetadataStorages.Resolve(resolver));
writer.Write(Protobufs.Resolve(resolver));

return writer.ToString();
}
Expand Down Expand Up @@ -926,6 +928,18 @@ public string Resolve(Resolver resolver)
}
}

internal class Protobuf : ItemGroupItem, IResolvable
{
/// <inheritdoc />
public string Resolve(Resolver resolver)
{
using (resolver.NewScopedParameter("include", Include))
{
return resolver.Resolve(Template.ItemGroups.Protobuf);
}
}
}

private static void AddTargetFrameworksCondition<T>(ItemGroupConditional<TargetFrameworksCondition<T>> itemGroupConditional, DotNetFramework dotNetFramework, T elem) where T : IResolvable
{
if (itemGroupConditional.Any(it => it.Contains(elem)))
Expand Down Expand Up @@ -1769,6 +1783,14 @@ List<string> skipFiles
itemGroups.VSIXSourceItems.Add(new ItemGroups.VSIXSourceItem { Include = vsixSourceItem });
}

foreach (var protoFile in project.ProtoFiles)
{
itemGroups.Protobufs.Add(new ItemGroups.Protobuf
{
Include = Util.PathGetRelative(_projectPathCapitalized, Project.GetCapitalizedFile(protoFile))
});
}

HashSet<string> allContents = new HashSet<string>(itemGroups.Contents.Select(c => c.Include));
List<string> resolvedSources = project.ResolvedSourceFiles.Select(source => Util.PathGetRelative(_projectPathCapitalized, Project.GetCapitalizedFile(source))).ToList();
List<string> resolvedResources = project.ResourceFiles.Concat(project.ResolvedResourcesFullFileNames).Select(resource => Util.PathGetRelative(_projectPathCapitalized, Project.GetCapitalizedFile(resource))).Distinct().ToList();
Expand Down
14 changes: 14 additions & 0 deletions Sharpmake/Project.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ public int SourceFilesFiltersCount
public Strings NoneFilesCopyIfNewer = new Strings();
public Strings NoneExtensionsCopyIfNewer = new Strings();

// .Net builds support protofiles, https://docs.microsoft.com/en-us/aspnet/core/grpc/dotnet-grpc?view=aspnetcore-5.0
public Strings ProtoFiles = new Strings();
public Strings ProtoExtensions = new Strings();

public Strings XResourcesResw = new Strings();

public class XResourcesImgContainer : IEnumerable<string>
Expand Down Expand Up @@ -898,6 +902,7 @@ internal virtual void ResolveSourceFiles(Builder builder)
AddMatchExtensionFiles(additionalFiles, ref NatvisFiles, NatvisFilesExtensions);
AddMatchExtensionFiles(additionalFiles, ref NoneFiles, NoneExtensions);
AddMatchExtensionFiles(additionalFiles, ref NoneFilesCopyIfNewer, NoneExtensionsCopyIfNewer);
AddMatchExtensionFiles(additionalFiles, ref ProtoFiles, ProtoExtensions);
}

// Apply Filters
Expand Down Expand Up @@ -931,6 +936,9 @@ internal virtual void ResolveSourceFiles(Builder builder)

AddMatchExtensionFiles(files, ref NoneFilesCopyIfNewer, NoneExtensionsCopyIfNewer);
Util.ResolvePath(SourceRootPath, ref NoneFilesCopyIfNewer);

AddMatchExtensionFiles(files, ref ProtoFiles, ProtoExtensions);
Util.ResolvePath(SourceRootPath, ref ProtoFiles);
}

_preFilterSourceFiles.AddRange(SourceFiles);
Expand All @@ -956,6 +964,7 @@ internal virtual void ResolveSourceFiles(Builder builder)
NatvisFiles.IntersectWith(SourceFilesFilters);
NoneFiles.IntersectWith(SourceFilesFilters);
NoneFilesCopyIfNewer.IntersectWith(SourceFilesFilters);
ProtoFiles.IntersectWith(SourceFilesFilters);
}

using (builder.CreateProfilingScope("Project.ResolveSourceFiles:AdditionalFiltering"))
Expand All @@ -976,6 +985,8 @@ internal virtual void ResolveSourceFiles(Builder builder)
Debugger.Break();
if (AddMatchFiles(RootPath, Util.PathGetRelative(RootPath, NoneFiles), NoneFiles, ref SourceFilesExclude, sourceFilesExcludeRegex))
Debugger.Break();
if (AddMatchFiles(RootPath, Util.PathGetRelative(RootPath, ProtoFiles), ProtoFiles, ref SourceFilesExclude, sourceFilesExcludeRegex))
Debugger.Break();

// Remove exclude file
foreach (string excludeSourceFile in SourceFilesExclude)
Expand All @@ -984,6 +995,7 @@ internal virtual void ResolveSourceFiles(Builder builder)
ResourceFiles.Remove(excludeSourceFile);
NatvisFiles.Remove(excludeSourceFile);
NoneFiles.Remove(excludeSourceFile);
ProtoFiles.Remove(excludeSourceFile);
}
var resolvedSourceFilesRelative = Util.PathGetRelative(RootPath, ResolvedSourceFiles);

Expand Down Expand Up @@ -2408,6 +2420,8 @@ private void InitCSharpSpecifics()
".disco",
".manifest"
);

ProtoExtensions.Add(".proto");
}

public CSharpProject()
Expand Down