Skip to content

Commit 29eb83e

Browse files
Merge pull request CommunityToolkit#102 from CommunityToolkit/experiment/sizerbase
🧪 [Experiment] SizerBase class for GridSplitter + ContentSizer + PropertySizer
2 parents a9b07a2 + db522f3 commit 29eb83e

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

CommunityToolkit.Labs.Shared/Renderers/ToolkitSampleRenderer.xaml.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ private async Task LoadData()
189189

190190
return textContents;
191191
}
192-
catch
192+
catch (Exception e)
193193
{
194-
return null;
194+
return $"Exception Encountered Loading file '{filePath}':\n{e.Message}\n{e.StackTrace}";
195195
}
196196
}
197197

@@ -214,7 +214,12 @@ private static string GetRelativePathToFileWithoutExtension(Type type)
214214

215215
var folderPath = typeNamespace.Replace(simpleAssemblyName, "").Trim('.').Replace('.', '/');
216216

217-
return $"SourceAssets/{sampleName}/samples/{simpleAssemblyName}/{folderPath}/{type.Name}";
217+
if (folderPath.Length != 0)
218+
{
219+
folderPath += "/";
220+
}
221+
222+
return $"SourceAssets/{sampleName}/samples/{simpleAssemblyName}/{folderPath}{type.Name}";
218223
}
219224
}
220225
}

Labs.MultiTarget.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030

3131
<ItemGroup>
3232
<PackageReference Condition="'$(TargetFramework)' == '$(UwpTargetFramework)'" Include="Microsoft.UI.Xaml" Version="2.7.0" />
33-
<PackageReference Condition="'$(TargetFramework)' == '$(WinAppSdkTargetFramework)'" Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
33+
<PackageReference Condition="'$(TargetFramework)' == '$(WinAppSdkTargetFramework)'" Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
3434
</ItemGroup>
3535
</Project>

Labs.WinAppSdk.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.1" />
19+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
2020
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
2121
<Manifest Include="$(ApplicationManifest)" />
2222
</ItemGroup>

0 commit comments

Comments
 (0)