Skip to content

Commit 05d93b1

Browse files
committed
Merge
2 parents 729f096 + 456673a commit 05d93b1

File tree

8 files changed

+35
-9
lines changed

8 files changed

+35
-9
lines changed

Build-Toolkit-Components.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ function Invoke-MSBuildWithBinlog {
132132
# Ensure output is relative to $pwd, not to the csproj of each component.
133133
$NupkgOutput = (Resolve-Path $NupkgOutput).Path
134134

135-
$msbuildArgs += "-t:Clean,Build,Pack"
135+
$msbuildArgs += "-t:Build,Pack"
136136
$msbuildArgs += "/p:PackageOutputPath=$NupkgOutput"
137137
$msbuildArgs += "/p:DateForVersion=$DateForVersion"
138138
$msbuildArgs += "/p:PreviewVersion=$PreviewVersion"
139139
}
140140
else {
141-
$msbuildArgs += "-t:Clean,Build"
141+
$msbuildArgs += "-t:Build"
142142
}
143143

144144
# Add additional properties to the msbuild arguments

CommunityToolkit.App.Shared/Converters/StringToUriConverter.cs

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

77
namespace CommunityToolkit.App.Shared.Converters;
88

9-
public class StringToUriConverter : IValueConverter
9+
public partial class StringToUriConverter : IValueConverter
1010
{
1111
public object Convert(object value, Type targetType, object parameter, string language)
1212
{

CommunityToolkit.App.Shared/DocOrSampleTemplateSelector.cs

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

1515
namespace CommunityToolkit.App.Shared;
1616

17-
public class DocOrSampleTemplateSelector : DataTemplateSelector
17+
public partial class DocOrSampleTemplateSelector : DataTemplateSelector
1818
{
1919
public DataTemplate? Document { get; set; }
2020
public DataTemplate? Sample { get; set; }

CommunityToolkit.App.Shared/Renderers/GeneratedSampleOptionTemplateSelector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace CommunityToolkit.App.Shared.Renderers;
99
/// <summary>
1010
/// Selects a sample option template for the provided <see cref="IGeneratedToolkitSampleOptionViewModel"/>.
1111
/// </summary>
12-
internal class GeneratedSampleOptionTemplateSelector : DataTemplateSelector
12+
internal partial class GeneratedSampleOptionTemplateSelector : DataTemplateSelector
1313
{
1414
public DataTemplate? BoolOptionTemplate { get; set; }
1515

GenerateAllSolution.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ if ($UseDiagnostics.IsPresent)
142142
$sdkoptions = "-d"
143143
$diagnostics = @(
144144
'-bl:slngen.binlog'
145-
'--consolelogger:ShowEventId;Summary;Verbosity=Detailed'
145+
# Console logger + binlog causes exception and failure
146+
# Track https://github.com/microsoft/slngen/issues/451
147+
#'--consolelogger:ShowEventId;Summary;Verbosity=Detailed'
146148
)
147149
}
148150
else

MultiTarget/EnabledTargetFrameworks.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
<PropertyGroup>
33
<UwpTargetFramework>uap10.0.17763;net8.0-windows10.0.22621.0;</UwpTargetFramework>
44
<WinAppSdkTargetFramework>net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0;</WinAppSdkTargetFramework>
5-
5+
66
<WasmHeadTargetFramework>net8.0</WasmHeadTargetFramework>
77
<LinuxHeadTargetFramework>net8.0</LinuxHeadTargetFramework>
88
<WpfHeadTargetFramework>net8.0</WpfHeadTargetFramework>
9+
10+
11+
12+
913

1014
<!-- Used for comparison to current TargetFramework -->
1115
<LinuxLibTargetFramework>net8.0</LinuxLibTargetFramework>
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240531000-experimental1" />
3+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240807006-preview1" />
44
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
5+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2730-prerelease" />
56
</ItemGroup>
67
<ItemGroup>
7-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.0-prerelease-ci.240731.2" PrivateAssets="all" />
8+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
89
</ItemGroup>
910
</Project>

MultiTarget/WinUI.Extra.props

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,23 @@
6161
<HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
6262
</Reference>
6363
</ItemGroup>
64+
65+
<!--
66+
Workaround for WindowsAppSdk 1.6
67+
Track https://github.com/CommunityToolkit/Labs-Windows/pull/561#issuecomment-2274727870
68+
-->
69+
<Target Condition="'$(IsWinAppSdk)' == 'true'" Name="CsWinRTRemoveXamlDllReferences" AfterTargets="ResolveTargetingPackAssets;ResolveReferences" BeforeTargets="XamlPreCompile;CoreCompile" Outputs="@(Reference)">
70+
<ItemGroup>
71+
<Reference Remove="@(Reference)"
72+
Condition="'%(Reference.Filename)%(Reference.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
73+
<ReferencePathWithRefAssemblies Remove="@(ReferencePathWithRefAssemblies)"
74+
Condition="'%(ReferencePathWithRefAssemblies.Filename)%(ReferencePathWithRefAssemblies.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
75+
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
76+
Condition="'%(ReferenceCopyLocalPaths.Filename)%(ReferenceCopyLocalPaths.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
77+
<ReferencePath Remove="@(ReferencePath)"
78+
Condition="'%(ReferencePath.Filename)%(ReferencePath.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
79+
<RuntimePackAsset Remove="@(RuntimePackAsset)"
80+
Condition="'%(RuntimePackAsset.Filename)%(RuntimePackAsset.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
81+
</ItemGroup>
82+
</Target>
6483
</Project>

0 commit comments

Comments
 (0)