Revert "Make the VersionInfo API experimental (#3072)" (#3194)

2022-11-30 17:25:14 -08:00 · 2022-11-30 17:25:14 -08:00 · 84314b8ced
--- a/dev/Common/TerminalVelocityFeatures-VersionInfo.h
+++ b/dev/Common/TerminalVelocityFeatures-VersionInfo.h
@ -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)
--- a/dev/Common/TerminalVelocityFeatures-VersionInfo.xml
+++ b/dev/Common/TerminalVelocityFeatures-VersionInfo.xml
@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<features xmlns="http://microsoft.com/windowsappsdk/TerminalVelocity/20210729/TerminalVelocityFeatures.xsd">
-
-<!-- Copyright (c) Microsoft Corporation. All rights reserved.
-     Licensed under the MIT License. See LICENSE in the project root for license information.
-->
-
-    <!-- See docs/TerminalVelocity.md for more info.  -->
-
-    <!-- Enabled variants -->
-    <feature>
-        <name>Feature_VersionInfoAPI</name>
-        <description>VersionInfo APIs to access Windows App SDK version information at runtime</description>
-        <state>AlwaysEnabled</state>
-        <alwaysDisabledChannelTokens>
-            <channelToken>Preview</channelToken>
-            <channelToken>Stable</channelToken>
-        </alwaysDisabledChannelTokens>
-    </feature>
-</features>
--- a/dev/VersionInfo/VersionInfo.ReleaseInfo.cpp
+++ b/dev/VersionInfo/VersionInfo.ReleaseInfo.cpp
@ -9,8 +9,6 @@

 #include <WindowsAppRuntime.VersionInfo.h>

-#include <TerminalVelocityFeatures-VersionInfo.h>
-
 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;
    }
--- a/dev/VersionInfo/VersionInfo.RuntimeInfo.cpp
+++ b/dev/VersionInfo/VersionInfo.RuntimeInfo.cpp
@ -7,8 +7,6 @@

 #include <Microsoft.Windows.ApplicationModel.WindowsAppRuntime.RuntimeInfo.g.cpp>

-#include <TerminalVelocityFeatures-VersionInfo.h>
-
 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;
    }
--- 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 <TerminalVelocityFeatures-VersionInfo.h>
-
 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
    {
--- a/dev/VersionInfo/VersionInfo.vcxitems
+++ b/dev/VersionInfo/VersionInfo.vcxitems
@ -8,7 +8,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(RepoRoot)\dev\common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/test/VersionInfo/VersionInfoTests.cpp
+++ b/test/VersionInfo/VersionInfoTests.cpp
@ -30,12 +30,6 @@ 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
            {
                auto release{ winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::ReleaseInfo::AsString() };
@ -49,12 +43,6 @@ 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
            {
                auto runtime{ winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::RuntimeInfo::AsString() };
--- a/test/VersionInfo/VersionInfoTests.vcxproj
+++ b/test/VersionInfo/VersionInfoTests.vcxproj
@ -77,7 +77,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <UseFullPaths>true</UseFullPaths>
      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(RepoRoot)\test\inc;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL;$(RepoRoot)\dev\common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)\test\inc;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL</AdditionalIncludeDirectories>
      <AdditionalIncludeDirectories Condition="$(WindowsAppSDKBuildPipeline) == '1'">$(RepoRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@ -144,4 +144,4 @@
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
  </Target>
-</Project>
+</Project>
--- a/test/VersionInfo/pch.h
+++ b/test/VersionInfo/pch.h
@ -19,6 +19,4 @@
 #include <WindowsAppRuntime.Test.Package.h>
 #include <WindowsAppRuntime.Test.Bootstrap.h>

-#include <TerminalVelocityFeatures-VersionInfo.h>
-
 #endif //PCH_H