diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml index 92252540cf..b9056fe090 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml @@ -147,14 +147,6 @@ 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 VersionInfo TerminalVelocity features' - inputs: - targetType: filePath - filePath: tools\TerminalVelocity\Generate-TerminalVelocityFeatures.ps1 - arguments: -Path $(Build.SourcesDirectory)\dev\common\TerminalVelocityFeatures-VersionInfo.xml -Channel $(channel) -Language C++ -Namespace Microsoft.Windows.ApplicationModel.WindowsAppRuntime -Output $(Build.SourcesDirectory)\dev\common\TerminalVelocityFeatures-VersionInfo.h - workingDirectory: '$(Build.SourcesDirectory)' - - task: powershell@2 displayName: 'Create PushNotifications TerminalVelocity features' inputs: diff --git a/dev/Common/TerminalVelocityFeatures-VersionInfo.h b/dev/Common/TerminalVelocityFeatures-VersionInfo.h deleted file mode 100644 index 543fb20249..0000000000 --- a/dev/Common/TerminalVelocityFeatures-VersionInfo.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -// THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT IT - -// INPUT FILE: dev\common\TerminalVelocityFeatures-VersionInfo.xml -// OPTIONS: -Channel Experimental -Language C++ -Namespace Microsoft.Windows.ApplicationModel.WindowsAppRuntime -Path dev\common\TerminalVelocityFeatures-VersionInfo.xml -Output dev\common\TerminalVelocityFeatures-VersionInfo.h - -#if defined(__midlrt) -namespace features -{ - feature_name Feature_VersionInfoAPI = { DisabledByDefault, FALSE }; -} -#endif // defined(__midlrt) - -// Feature constants -#define WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_APPLICATIONMODEL_WINDOWSAPPRUNTIME_FEATURE_VERSIONINFOAPI_ENABLED 1 - -#if defined(__cplusplus) - -namespace Microsoft::Windows::ApplicationModel::WindowsAppRuntime -{ - -__pragma(detect_mismatch("ODR_violation_WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_APPLICATIONMODEL_WINDOWSAPPRUNTIME_FEATURE_VERSIONINFOAPI_ENABLED_mismatch", "AlwaysEnabled")) -struct Feature_VersionInfoAPI -{ - static constexpr bool IsEnabled() { return WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_APPLICATIONMODEL_WINDOWSAPPRUNTIME_FEATURE_VERSIONINFOAPI_ENABLED == 1; } -}; - -} // namespace Microsoft.Windows.ApplicationModel.WindowsAppRuntime - -#endif // defined(__cplusplus) diff --git a/dev/Common/TerminalVelocityFeatures-VersionInfo.xml b/dev/Common/TerminalVelocityFeatures-VersionInfo.xml deleted file mode 100644 index d330d70be2..0000000000 --- a/dev/Common/TerminalVelocityFeatures-VersionInfo.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - Feature_VersionInfoAPI - VersionInfo APIs to access Windows App SDK version information at runtime - AlwaysEnabled - - Preview - Stable - - - diff --git a/dev/VersionInfo/VersionInfo.ReleaseInfo.cpp b/dev/VersionInfo/VersionInfo.ReleaseInfo.cpp index 4f4cb36727..94600ac481 100644 --- a/dev/VersionInfo/VersionInfo.ReleaseInfo.cpp +++ b/dev/VersionInfo/VersionInfo.ReleaseInfo.cpp @@ -9,8 +9,6 @@ #include -#include - namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implementation { uint16_t ReleaseInfo::Major() @@ -48,8 +46,6 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem const ::Microsoft::WindowsAppSDK::VersionInfo& ReleaseInfo::GetVersionInfo() { - THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::Feature_VersionInfoAPI::IsEnabled()); - const ::Microsoft::WindowsAppSDK::VersionInfo* versionInfo{ ::Microsoft::WindowsAppSDK::GetVersionInfo() }; return *versionInfo; } diff --git a/dev/VersionInfo/VersionInfo.RuntimeInfo.cpp b/dev/VersionInfo/VersionInfo.RuntimeInfo.cpp index daeba69309..9566e83ebf 100644 --- a/dev/VersionInfo/VersionInfo.RuntimeInfo.cpp +++ b/dev/VersionInfo/VersionInfo.RuntimeInfo.cpp @@ -7,8 +7,6 @@ #include -#include - namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implementation { winrt::Windows::ApplicationModel::PackageVersion RuntimeInfo::Version() @@ -31,8 +29,6 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem const ::Microsoft::WindowsAppSDK::VersionInfo& RuntimeInfo::GetVersionInfo() { - THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::Feature_VersionInfoAPI::IsEnabled()); - const ::Microsoft::WindowsAppSDK::VersionInfo* versionInfo{ ::Microsoft::WindowsAppSDK::GetVersionInfo() }; return *versionInfo; } diff --git a/dev/VersionInfo/VersionInfo.idl b/dev/VersionInfo/VersionInfo.idl index 3e2782aa3f..ebd084d018 100644 --- a/dev/VersionInfo/VersionInfo.idl +++ b/dev/VersionInfo/VersionInfo.idl @@ -1,16 +1,12 @@ // Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. -#include - namespace Microsoft.Windows.ApplicationModel.WindowsAppRuntime { - [feature(Feature_VersionInfoAPI)] [contractversion(1)] apicontract VersionInfoContract{}; /// Version information for the Windows App SDK release. - [feature(Feature_VersionInfoAPI)] [contract(VersionInfoContract, 1)] static runtimeclass ReleaseInfo { @@ -31,7 +27,6 @@ namespace Microsoft.Windows.ApplicationModel.WindowsAppRuntime }; /// Version information for the Windows App SDK runtime. - [feature(Feature_VersionInfoAPI)] [contract(VersionInfoContract, 1)] static runtimeclass RuntimeInfo { diff --git a/dev/VersionInfo/VersionInfo.vcxitems b/dev/VersionInfo/VersionInfo.vcxitems index df8b032875..959a203d3c 100644 --- a/dev/VersionInfo/VersionInfo.vcxitems +++ b/dev/VersionInfo/VersionInfo.vcxitems @@ -8,7 +8,7 @@ - %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(RepoRoot)\dev\common + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) diff --git a/test/VersionInfo/VersionInfoTests.cpp b/test/VersionInfo/VersionInfoTests.cpp index 4508b6ee2c..8ff4bb5f7c 100644 --- a/test/VersionInfo/VersionInfoTests.cpp +++ b/test/VersionInfo/VersionInfoTests.cpp @@ -30,20 +30,10 @@ namespace Test::VersionInfo TEST_METHOD(VersionInfo_Release) { - if (::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::Feature_VersionInfoAPI::IsEnabled()) - { - WEX::Logging::Log::Comment(WEX::Common::String(L"Feature_VersionInfoAPI is disabled. Skipping...")); - return; - } - try { -#if defined(WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_APPLICATIONMODEL_WINDOWSAPPRUNTIME_FEATURE_VERSIONINFOAPI_ENABLED) auto release{ winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::ReleaseInfo::AsString() }; VERIFY_FAIL(L"Success is not expected without Microsoft.WindowsAppRuntime.Insights.Resource.dll"); -#else - WEX::Logging::Log::Comment(WEX::Common::String(L"Feature_VersionInfoAPI is disabled. Skipping...")); -#endif } catch (winrt::hresult_error& e) { @@ -53,20 +43,10 @@ namespace Test::VersionInfo TEST_METHOD(VersionInfo_Runtime) { - if (::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::Feature_VersionInfoAPI::IsEnabled()) - { - WEX::Logging::Log::Comment(WEX::Common::String(L"Feature_VersionInfoAPI is disabled. Skipping...")); - return; - } - try { -#if defined(WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_APPLICATIONMODEL_WINDOWSAPPRUNTIME_FEATURE_VERSIONINFOAPI_ENABLED) auto runtime{ winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::RuntimeInfo::AsString() }; VERIFY_FAIL(L"Success is not expected without Microsoft.WindowsAppRuntime.Insights.Resource.dll"); -#else - WEX::Logging::Log::Comment(WEX::Common::String(L"Feature_VersionInfoAPI is disabled. Skipping...")); -#endif } catch (winrt::hresult_error& e) { diff --git a/test/VersionInfo/VersionInfoTests.vcxproj b/test/VersionInfo/VersionInfoTests.vcxproj index e34cfd6a0c..011ff3cc8b 100644 --- a/test/VersionInfo/VersionInfoTests.vcxproj +++ b/test/VersionInfo/VersionInfoTests.vcxproj @@ -77,7 +77,7 @@ Use true pch.h - $(RepoRoot)\test\inc;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common + $(RepoRoot)\test\inc;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL $(RepoRoot);%(AdditionalIncludeDirectories) diff --git a/test/VersionInfo/pch.h b/test/VersionInfo/pch.h index 18a235203c..5623dd49cb 100644 --- a/test/VersionInfo/pch.h +++ b/test/VersionInfo/pch.h @@ -19,6 +19,4 @@ #include #include -#include - #endif //PCH_H