Skip to content

Commit 406d953

Browse files
Arlodotexemichael-hawker
authored andcommitted
Fixed an issue where using a custom file name for the component source csproj prevented the solution from generating
1 parent 52a9f57 commit 406d953

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

ProjectHeads/GenerateSingleSampleHeads.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ $projects = [System.Collections.ArrayList]::new()
8585
[void]$projects.Add(".\**.*proj")
8686

8787
# Include common dependencies required for solution to build
88-
[void]$projects.Add("..\..\common\CommunityToolkit.Labs.*Shared\**\*.*proj")
88+
[void]$projects.Add("..\..\common\CommunityToolkit.App.Shared\**\*.*proj")
89+
[void]$projects.Add("..\..\common\CommunityToolkit.Tests.Shared\**\*.*proj")
8990
[void]$projects.Add("..\..\common\CommunityToolkit.Tooling.SampleGen\*.csproj")
9091
[void]$projects.Add("..\..\common\CommunityToolkit.Tooling.TestGen\*.csproj")
9192
[void]$projects.Add("..\..\common\CommunityToolkit.Tooling.XamlNamedPropertyRelay\*.csproj")

ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<Import Project="..\..\tests\ProjectTemplate.Tests.projitems" Label="Shared" />
4646

4747
<ItemGroup>
48-
<ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />
48+
<ProjectReference Include="..\..\src\*.csproj" />
4949
</ItemGroup>
5050

5151
<!-- Must be imported after any shared projects in non-sdk style projects -->

ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
<Import Project="..\..\tests\ProjectTemplate.Tests.projitems" Label="Shared" />
4343

4444
<ItemGroup>
45-
<ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />
45+
<ProjectReference Include="..\..\src\*.csproj" />
4646
</ItemGroup>
4747
</Project>

ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
</AppxManifest>
3939
</ItemGroup>
4040
<ItemGroup>
41-
<ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj"/>
42-
<ProjectReference Include="..\..\samples\ProjectTemplate.Samples.csproj"/>
41+
<ProjectReference Include="..\..\src\*.csproj"/>
42+
<ProjectReference Include="..\..\samples\*.csproj"/>
4343
</ItemGroup>
4444

4545
<!-- Must be imported after any shared projects in non-sdk style projects -->

ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />
31-
<ProjectReference Include="..\..\samples\ProjectTemplate.Samples.csproj" />
30+
<ProjectReference Include="..\..\src\*.csproj" />
31+
<ProjectReference Include="..\..\samples\*.csproj" />
3232
</ItemGroup>
3333
</Project>

ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<Import Project="$(RepositoryDirectory)common\ProjectHeads\App.Head.WinAppSdk.props" />
2525

2626
<ItemGroup>
27-
<ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />
28-
<ProjectReference Include="..\..\samples\ProjectTemplate.Samples.csproj" />
27+
<ProjectReference Include="..\..\src\*.csproj" />
28+
<ProjectReference Include="..\..\samples\*.csproj" />
2929
</ItemGroup>
3030

3131
<PropertyGroup>

ToolkitComponent.SampleProject.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<!-- Needed for Source Generators to find Markdown files -->
3030
<AdditionalFiles Include="**\*.md" Exclude="bin\**\*.md;obj\**\*.md" />
31-
<ProjectReference Condition="Exists('$(MSBuildProjectDirectory)\..\src\CommunityToolkit.Labs.WinUI.$(ToolkitComponentName).csproj')" Include="$(MSBuildProjectDirectory)\..\src\CommunityToolkit.Labs.WinUI.$(ToolkitComponentName).csproj" />
31+
<ProjectReference Include="$(MSBuildProjectDirectory)\..\src\*.csproj" />
3232
</ItemGroup>
3333

3434
<PropertyGroup>

0 commit comments

Comments
 (0)