Skip to content

Commit 0fab336

Browse files
qiutongMSQiutong Shen
qiutongMS
and
Qiutong Shen
authored
Fix build issues and update core package versions in Directory.Packages.props (#615)
Co-authored-by: Qiutong Shen <qiutongshen@microsoft.com>
1 parent 59fff6b commit 0fab336

9 files changed

Lines changed: 24 additions & 12 deletions

File tree

‎Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ private async void DeleteIndexButton_Click(object sender, RoutedEventArgs e)
254254
}
255255
}
256256

257-
internal class MenuItemTemplateSelector : DataTemplateSelector
257+
internal partial class MenuItemTemplateSelector : DataTemplateSelector
258258
{
259259
public DataTemplate? NoteTemplate { get; set; }
260260
public DataTemplate? DefaultTemplate { get; set; }

‎Samples/AppContentSearch/cs-winui/Notes.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
7676
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25114.11" />
7777
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
78+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
7879
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
7980
<PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.0-experimental3" />
8081
<PackageReference Include="OpenAI" Version="2.2.0-beta.2" />

‎Samples/AppContentSearch/cs-winui/NotesApp.sln‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,23 @@ EndProject
77
Global
88
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99
Debug|ARM64 = Debug|ARM64
10+
Debug|x64 = Debug|x64
1011
Release|ARM64 = Release|ARM64
12+
Release|x64 = Release|x64
1113
EndGlobalSection
1214
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1315
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|ARM64.ActiveCfg = Debug|ARM64
1416
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|ARM64.Build.0 = Debug|ARM64
1517
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|ARM64.Deploy.0 = Debug|ARM64
18+
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|x64.ActiveCfg = Debug|x64
19+
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|x64.Build.0 = Debug|x64
20+
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|x64.Deploy.0 = Debug|x64
1621
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|ARM64.ActiveCfg = Release|ARM64
1722
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|ARM64.Build.0 = Release|ARM64
1823
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|ARM64.Deploy.0 = Release|ARM64
24+
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|x64.ActiveCfg = Release|x64
25+
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|x64.Build.0 = Release|x64
26+
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|x64.Deploy.0 = Release|x64
1927
EndGlobalSection
2028
GlobalSection(SolutionProperties) = preSolution
2129
HideSolutionNode = FALSE

‎Samples/AppContentSearch/cs-winui/Pages/NotesPage.xaml.cs‎

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

1616
namespace Notes.Pages
1717
{
18-
public class RelativePathConverter : IValueConverter
18+
public partial class RelativePathConverter : IValueConverter
1919
{
2020
public object? Convert(object value, Type targetType, object parameter, string language)
2121
{

‎Samples/BackgroundTask/InProc BackgroundTask/cpp-winui/BackgroundTaskBuilder/BackgroundTask.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace winrt::BackgroundTaskBuilder
3030
m_mainWindow = window.as<winrt::BackgroundTaskBuilder::IMainWindow>();
3131

3232
Windows::Foundation::TimeSpan period{ std::chrono::seconds{2} };
33-
m_periodicTimer = Windows::System::Threading::ThreadPoolTimer::CreatePeriodicTimer([this, lifetime = get_strong()](Windows::System::Threading::ThreadPoolTimer timer)
33+
m_periodicTimer = Windows::System::Threading::ThreadPoolTimer::CreatePeriodicTimer([this, lifetime = get_strong()](Windows::System::Threading::ThreadPoolTimer /* timer */)
3434
{
3535
if (!m_cancelRequested && m_progress < 100)
3636
{

‎Samples/Directory.Packages.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
<!-- Core -->
88
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250916003" />
99
<PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="1.8.250906002" />
10-
<PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.221104.6" />
11-
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
10+
<PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.240111.5" />
11+
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
1212
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
1313

1414
<!-- Build tooling -->
1515
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4654" />
1616
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools.MSIX" Version="1.7.20250829.1" />
17-
<PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.220914.1" />
17+
<PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.240803.1" />
1818

1919
<!-- Controls/web -->
2020
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
@@ -27,12 +27,12 @@
2727
<!-- Optional feature packs (only if you really use them) -->
2828
<PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.38" />
2929
<PackageVersion Include="Microsoft.WindowsAppSDK.ML" Version="1.8.2091" />
30-
30+
3131
<!-- Other libraries -->
3232
<PackageVersion Include="System.Numerics.Tensors" Version="9.0.0" />
3333
<PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI.WinML" Version="0.6.0" />
3434
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
3535
<PackageVersion Include="Microsoft.DXSDK.D3DX" Version="9.29.952.8" />
36-
<PackageVersion Include="Microsoft.VCRTForwarders.140" version = "1.1.0"/>
36+
<PackageVersion Include="Microsoft.VCRTForwarders.140" Version="1.1.0"/>
3737
</ItemGroup>
3838
</Project>

‎Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ const UINT32 majorMinorVersion{ 0x00010000 };
103103
PCWSTR versionTag{ L"" };
104104

105105
int APIENTRY wWinMain( HINSTANCE hInstance,
106-
HINSTANCE hPrevInstance,
107-
LPWSTR lpCmdLine,
106+
HINSTANCE /* hPrevInstance */,
107+
LPWSTR /* lpCmdLine */,
108108
int nCmdShow )
109109
{
110110
// Use Dynamic Dependencies API to use DirectX framework package
@@ -745,7 +745,7 @@ void Render( IDirect3DDevice9Ex* pDev )
745745
g_liLastTimerUpdate.QuadPart = liCurrentTime.QuadPart;
746746
}
747747

748-
void RenderText( IDirect3DDevice9Ex* pDev )
748+
void RenderText( IDirect3DDevice9Ex* /* pDev */ )
749749
{
750750
// The helper object simply helps keep track of text position, and color
751751
// and then it calls pFont->DrawText( m_pSprite, strMsg, -1, &rc, DT_NOCLIP, m_clr );

‎Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
152152
<PrecompiledHeader />
153153
<WarningLevel>Level3</WarningLevel>
154+
<LanguageStandard>stdcpp17</LanguageStandard>
154155
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
155156
</ClCompile>
156157
<Link>
@@ -171,6 +172,7 @@
171172
<PrecompiledHeader>
172173
</PrecompiledHeader>
173174
<WarningLevel>Level3</WarningLevel>
175+
<LanguageStandard>stdcpp17</LanguageStandard>
174176
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
175177
</ClCompile>
176178
<Link>

‎Samples/WindowsAIFoundry/cs-wpf-dotnet/WindowsAISampleForWPF/WindowsAISampleForWPF.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@
8282
<Exec Command="$(_SignMsixCommand)" Condition="'$(RepoTestCertificatePassword)' != ''"/>
8383
<Copy SourceFiles="@(BinplaceItem)"
8484
DestinationFiles="@(BinplaceItem->'$(AppxPackageDir)$(AppxPackageName)_Test\%(Filename)%(Extension)')"
85-
SkipUnchangedFiles="true">
85+
SkipUnchangedFiles="true"
86+
Condition="Exists('$(RepoTestCertificateCer)')">
8687
<Output TaskParameter="CopiedFiles" ItemName="BinplaceItemCopied" />
8788
</Copy>
8889
</Target>

0 commit comments

Comments
 (0)