VersionInfo WinRT API can be used in non-experimental builds or compile errors (#3691) (#3692)

kythant · DrusTheAxe · web-flow · commit 96b3638821d3 · 2023-07-04T20:22:58.000-07:00
Co-authored-by: Howard Kapustein &lt;howardk@microsoft.com&gt;
diff --git a/test/VersionInfo/VersionInfoTests.cpp b/test/VersionInfo/VersionInfoTests.cpp
@@ -38,8 +38,12 @@ namespace Test::VersionInfo
 
             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)
             {
@@ -57,8 +61,12 @@ namespace Test::VersionInfo
 
             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)
             {

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,12 @@ namespace Test::VersionInfo`
`38`	`38`
`39`	`39`	`try`
`40`	`40`	`{`
	`41`	`+#if defined(WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_APPLICATIONMODEL_WINDOWSAPPRUNTIME_FEATURE_VERSIONINFOAPI_ENABLED)`
`41`	`42`	`auto release{ winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::ReleaseInfo::AsString() };`
`42`	`43`	`VERIFY_FAIL(L"Success is not expected without Microsoft.WindowsAppRuntime.Insights.Resource.dll");`
	`44`	`+#else`
	`45`	`+ WEX::Logging::Log::Comment(WEX::Common::String(L"Feature_VersionInfoAPI is disabled. Skipping..."));`
	`46`	`+#endif`
`43`	`47`	`}`
`44`	`48`	`catch (winrt::hresult_error& e)`
`45`	`49`	`{`
`@@ -57,8 +61,12 @@ namespace Test::VersionInfo`
`57`	`61`
`58`	`62`	`try`
`59`	`63`	`{`
	`64`	`+#if defined(WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_APPLICATIONMODEL_WINDOWSAPPRUNTIME_FEATURE_VERSIONINFOAPI_ENABLED)`
`60`	`65`	`auto runtime{ winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::RuntimeInfo::AsString() };`
`61`	`66`	`VERIFY_FAIL(L"Success is not expected without Microsoft.WindowsAppRuntime.Insights.Resource.dll");`
	`67`	`+#else`
	`68`	`+ WEX::Logging::Log::Comment(WEX::Common::String(L"Feature_VersionInfoAPI is disabled. Skipping..."));`
	`69`	`+#endif`
`62`	`70`	`}`
`63`	`71`	`catch (winrt::hresult_error& e)`
`64`	`72`	`{`