Skip to content

Revert "Fix build issues and update core package versions" #616

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

Open
qiutongMS wants to merge 1 commit into
base: release/experimental
Choose a base branch
from
Open

Revert "Fix build issues and update core package versions" #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ private async void DeleteIndexButton_Click(object sender, RoutedEventArgs e)
}
}

internal partial class MenuItemTemplateSelector : DataTemplateSelector
internal class MenuItemTemplateSelector : DataTemplateSelector
{
public DataTemplate? NoteTemplate { get; set; }
public DataTemplate? DefaultTemplate { get; set; }
Expand Down
1 change: 0 additions & 1 deletion Samples/AppContentSearch/cs-winui/Notes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25114.11" />
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.0-experimental3" />
<PackageReference Include="OpenAI" Version="2.2.0-beta.2" />
Expand Down
8 changes: 0 additions & 8 deletions Samples/AppContentSearch/cs-winui/NotesApp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,15 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|ARM64.ActiveCfg = Debug|ARM64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|ARM64.Build.0 = Debug|ARM64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|ARM64.Deploy.0 = Debug|ARM64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|x64.ActiveCfg = Debug|x64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|x64.Build.0 = Debug|x64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Debug|x64.Deploy.0 = Debug|x64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|ARM64.ActiveCfg = Release|ARM64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|ARM64.Build.0 = Release|ARM64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|ARM64.Deploy.0 = Release|ARM64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|x64.ActiveCfg = Release|x64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|x64.Build.0 = Release|x64
{DB0EC506-054D-44C7-50E7-440A96C593E2}.Release|x64.Deploy.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion Samples/AppContentSearch/cs-winui/Pages/NotesPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

namespace Notes.Pages
{
public partial class RelativePathConverter : IValueConverter
public class RelativePathConverter : IValueConverter
{
public object? Convert(object value, Type targetType, object parameter, string language)
{
Expand Down
2 changes: 1 addition & 1 deletion ...s/BackgroundTask/InProc BackgroundTask/cpp-winui/BackgroundTaskBuilder/BackgroundTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace winrt::BackgroundTaskBuilder
m_mainWindow = window.as<winrt::BackgroundTaskBuilder::IMainWindow>();

Windows::Foundation::TimeSpan period{ std::chrono::seconds{2} };
m_periodicTimer = Windows::System::Threading::ThreadPoolTimer::CreatePeriodicTimer([this, lifetime = get_strong()](Windows::System::Threading::ThreadPoolTimer /* timer */)
m_periodicTimer = Windows::System::Threading::ThreadPoolTimer::CreatePeriodicTimer([this, lifetime = get_strong()](Windows::System::Threading::ThreadPoolTimer timer)
{
if (!m_cancelRequested && m_progress < 100)
{
Expand Down
10 changes: 5 additions & 5 deletions Samples/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<!-- Core -->
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250916003" />
<PackageVersion Include="Microsoft.WindowsAppSDK.Foundation" Version="1.8.250906002" />
<PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.240111.5" />
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
<PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.221104.6" />
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />

<!-- Build tooling -->
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4654" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools.MSIX" Version="1.7.20250829.1" />
<PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.240803.1" />
<PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="1.0.220914.1" />

<!-- Controls/web -->
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
Expand All @@ -27,12 +27,12 @@
<!-- Optional feature packs (only if you really use them) -->
<PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.38" />
<PackageVersion Include="Microsoft.WindowsAppSDK.ML" Version="1.8.2091" />

<!-- Other libraries -->
<PackageVersion Include="System.Numerics.Tensors" Version="9.0.0" />
<PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI.WinML" Version="0.6.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
<PackageVersion Include="Microsoft.DXSDK.D3DX" Version="9.29.952.8" />
<PackageVersion Include="Microsoft.VCRTForwarders.140" Version="1.1.0"/>
<PackageVersion Include="Microsoft.VCRTForwarders.140" version = "1.1.0"/>
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ const UINT32 majorMinorVersion{ 0x00010000 };
PCWSTR versionTag{ L"" };

int APIENTRY wWinMain( HINSTANCE hInstance,
HINSTANCE /* hPrevInstance */,
LPWSTR /* lpCmdLine */,
HINSTANCE hPrevInstance,
LPWSTR lpCmdLine,
int nCmdShow )
{
// Use Dynamic Dependencies API to use DirectX framework package
Expand Down Expand Up @@ -745,7 +745,7 @@ void Render( IDirect3DDevice9Ex* pDev )
g_liLastTimerUpdate.QuadPart = liCurrentTime.QuadPart;
}

void RenderText( IDirect3DDevice9Ex* /* pDev */ )
void RenderText( IDirect3DDevice9Ex* pDev )
{
// The helper object simply helps keep track of text position, and color
// and then it calls pFont->DrawText( m_pSprite, strMsg, -1, &rc, DT_NOCLIP, m_clr );
Expand Down
2 changes: 0 additions & 2 deletions Samples/DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<LanguageStandard>stdcpp17</LanguageStandard>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
Expand All @@ -172,7 +171,6 @@
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<LanguageStandard>stdcpp17</LanguageStandard>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
Expand Down
3 changes: 1 addition & 2 deletions Samples/WindowsAIFoundry/cs-wpf-dotnet/WindowsAISampleForWPF/WindowsAISampleForWPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@
<Exec Command="$(_SignMsixCommand)" Condition="'$(RepoTestCertificatePassword)' != ''"/>
<Copy SourceFiles="@(BinplaceItem)"
DestinationFiles="@(BinplaceItem->'$(AppxPackageDir)$(AppxPackageName)_Test\%(Filename)%(Extension)')"
SkipUnchangedFiles="true"
Condition="Exists('$(RepoTestCertificateCer)')">
SkipUnchangedFiles="true">
<Output TaskParameter="CopiedFiles" ItemName="BinplaceItemCopied" />
</Copy>
</Target>
Expand Down
Loading