Skip to content

[1.7] Fix TerminalVelocityFeatures-CallingPreviewSupport.h to be generated. #5108 #5109

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

Merged
codendone merged 2 commits into from
Feb 7, 2025
Merged

[1.7] Fix TerminalVelocityFeatures-CallingPreviewSupport.h to be generated. #5108 #5109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63d8f76
Fix TerminalVelocityFeatures-CallingPreviewSupport.h to be generated.
codendone Feb 6, 2025
6a2e70f
Define IsCallingPreviewSupported when needed.
codendone Feb 6, 2025
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
8 changes: 8 additions & 0 deletions build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ steps:
arguments: -Path $(Build.SourcesDirectory)\dev\common\TerminalVelocityFeatures-AppNotifications.xml -Channel $(channel) -Language C++ -Namespace Microsoft.Windows.AppNotifications -Output $(Build.SourcesDirectory)\dev\common\TerminalVelocityFeatures-AppNotifications.h
workingDirectory: '$(Build.SourcesDirectory)'

- task: powershell@2
displayName: 'Create CallingPreviewSupport TerminalVelocity features'
Comment thread
codendone marked this conversation as resolved.
inputs:
targetType: filePath
filePath: tools\TerminalVelocity\Generate-TerminalVelocityFeatures.ps1
arguments: -Path $(Build.SourcesDirectory)\dev\common\TerminalVelocityFeatures-AppNotifications.xml -Channel $(channel) -Language C++ -Namespace Microsoft.Windows.CallingPreviewSupport -Output $(Build.SourcesDirectory)\dev\common\TerminalVelocityFeatures-CallingPreviewSupport.h
Comment thread
codendone marked this conversation as resolved.
workingDirectory: '$(Build.SourcesDirectory)'

- task: powershell@2
displayName: 'Create PushNotifications TerminalVelocity features'
inputs:
Expand Down
13 changes: 13 additions & 0 deletions dev/AppNotifications/AppNotificationConferencingConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "AppNotificationConferencingConfig.h"
#include "Microsoft.Windows.AppNotifications.AppNotificationConferencingConfig.g.cpp"
#include <IsWindowsVersion.h>
#include "TerminalVelocityFeatures-CallingPreviewSupport.h"

namespace winrt::Microsoft::Windows::AppNotifications::implementation
{
Expand Down Expand Up @@ -48,3 +49,15 @@ namespace winrt::Microsoft::Windows::AppNotifications::implementation
return false;
}
}

// This function (not in the "implementation" namespace) is not defined when the feature is disabled,
// resulting in a linker error. Define the function for that scenario.
#if WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_CALLINGPREVIEWSUPPORT_FEATURE_CALLINGPREVIEWSUPPORT_ENABLED != 1
namespace winrt::Microsoft::Windows::AppNotifications
{
bool AppNotificationConferencingConfig::IsCallingPreviewSupported()
{
return false;
}
}
#endif