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

Fixed sample not picking up source-defined MultiTarget value, fixed compiler error #27

Merged
merged 2 commits into from
Mar 20, 2023
Merged

Fixed sample not picking up source-defined MultiTarget value, fixed compiler error #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f478a7b
Fixed an issue where a MultiTarget value defined in a source project …
Arlodotexe Mar 20, 2023
8b63047
Allow generating empty sample registry when no sample are present
Arlodotexe Mar 20, 2023
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
4 changes: 0 additions & 4 deletions CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Sample.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,6 @@ void Execute(IncrementalValuesProvider<ISymbol> types, bool skipDiagnostics = fa

private static void CreateSampleRegistry(SourceProductionContext ctx, Dictionary<string, ToolkitSampleRecord> sampleMetadata)
{
// TODO: Emit a better error that no samples are here?
Arlodotexe marked this conversation as resolved.
Show resolved Hide resolved
if (sampleMetadata.Count == 0)
return;

var source = BuildRegistrationCallsFromMetadata(sampleMetadata);
ctx.AddSource($"ToolkitSampleRegistry.g.cs", source);
}
Expand Down
2 changes: 1 addition & 1 deletion MultiTarget/MultiTarget.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<!-- If in a sample project, pull the MultiTarget settings from the source project. -->
<!-- This behavior is also implemented in GeneratedAllProjectReferences.ps1 for <ProjectReference> generation. -->
<Import Project="../../src/MultiTarget.props" Condition="$(MultiTargetIsSampleProject) == 'true' AND !Exists('$(MSBuildProjectDirectory)\MultiTarget.props') AND Exists('../../src/MultiTarget.props') AND '$(MultiTarget)' == ''" />
<Import Project="$(MSBuildProjectDirectory)/../src/MultiTarget.props" Condition="$(MultiTargetIsSampleProject) == 'true' AND !Exists('$(MSBuildProjectDirectory)\MultiTarget.props') AND Exists('$(MSBuildProjectDirectory)/../src/MultiTarget.props') AND '$(MultiTarget)' == ''" />

<Import Project="$(MSBuildThisFileDirectory)\Defaults.props" Condition="'$(MultiTarget)' == ''" />

Expand Down