incorporated comments

microsoft · Dec 19, 2024 · 3a40d79 · 3a40d79
1 parent e83a216
commit 3a40d79
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 81 deletions.
diff --git a/WindowsAppRuntime.sln b/WindowsAppRuntime.sln
@@ -1958,22 +1958,6 @@ Global
 		{97AB4F8D-DF7E-4BA8-9B06-E7B79AF616D6}.Release|x64.Build.0 = Release|x64
 		{97AB4F8D-DF7E-4BA8-9B06-E7B79AF616D6}.Release|x86.ActiveCfg = Release|x86
 		{97AB4F8D-DF7E-4BA8-9B06-E7B79AF616D6}.Release|x86.Build.0 = Release|x86
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Debug|Any CPU.Build.0 = Debug|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Debug|ARM64.ActiveCfg = Debug|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Debug|ARM64.Build.0 = Debug|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Debug|x64.ActiveCfg = Debug|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Debug|x64.Build.0 = Debug|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Debug|x86.ActiveCfg = Debug|x86
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Debug|x86.Build.0 = Debug|x86
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Release|Any CPU.ActiveCfg = Release|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Release|Any CPU.Build.0 = Release|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Release|ARM64.ActiveCfg = Release|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Release|ARM64.Build.0 = Release|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Release|x64.ActiveCfg = Release|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Release|x64.Build.0 = Release|x64
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Release|x86.ActiveCfg = Release|x86
-		{EDD6D3BF-EBD9-4952-A9B7-76171031139B}.Release|x86.Build.0 = Release|x86
 		{4CAA3052-7FAE-4C5B-A1CB-02D7F910C991}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{4CAA3052-7FAE-4C5B-A1CB-02D7F910C991}.Debug|Any CPU.Build.0 = Debug|x64
 		{4CAA3052-7FAE-4C5B-A1CB-02D7F910C991}.Debug|ARM64.ActiveCfg = Debug|x64

diff --git a/test/OAuth2ManagerTests/OAuth2APITests.cpp b/test/OAuth2ManagerTests/OAuth2APITests.cpp
@@ -101,13 +101,13 @@ namespace OAuth2ManagerTests
             ULONG err = 0;
             for (std::uint16_t i = 0; i < 500; ++i)
             {
-                wchar_t buffer[18 + 5 + 1];
+                wchar_t buffer[18 + 5 + 1]; // 18 for base URL, 5 for port number, 1 for null terminator
                 std::swprintf(buffer, std::size(buffer), L"http://127.0.0.1:%d/", m_serverPort);
 
                 err = ::HttpAddUrlToUrlGroup(m_urlGroup, buffer, 0, 0);
                 if (err == NO_ERROR)
                 {
-                    m_serverUrlBase = buffer;
+                    m_serverUrlBase = std::wstring(buffer); // Copy the buffer to a std::wstring to avoid dangling pointer
                     break;
                 }
 
@@ -1187,7 +1187,6 @@ namespace OAuth2ManagerTests
             response.StatusCode = 200;
             response.pReason = "OK";
             response.ReasonLength = 2;
-
             auto& contentTypeHeader = response.Headers.KnownHeaders[HttpHeaderContentType];
             contentTypeHeader.pRawValue = "application/json; charset=UTF-8";
             contentTypeHeader.RawValueLength = static_cast<USHORT>(::strlen(contentTypeHeader.pRawValue));

diff --git a/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj b/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj
@@ -31,6 +31,14 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -57,9 +65,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="PropertySheet.props" />
-  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
@@ -111,10 +116,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="PropertySheet.props" />
-    <Text Include="readme.txt">
-      <DeploymentContent>false</DeploymentContent>
-    </Text>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\dev\WindowsAppRuntime_BootstrapDLL\WindowsAppRuntime_BootstrapDLL.vcxproj">

diff --git a/test/TestApps/OAuthTestApp/PropertySheet.props b/test/TestApps/OAuthTestApp/PropertySheet.props
diff --git a/test/TestApps/OAuthTestApp/main.cpp b/test/TestApps/OAuthTestApp/main.cpp
@@ -6,7 +6,7 @@
 #include <winrt/Microsoft.Windows.AppLifecycle.h>
 #include <winrt/Microsoft.Security.Authentication.OAuth.h>
 #include <winrt/Windows.ApplicationModel.Activation.h>
-#include <fstream> 
+
 using namespace winrt::Microsoft::Windows::AppLifecycle;
 using namespace winrt::Microsoft::Security::Authentication::OAuth;
 using namespace winrt::Windows::ApplicationModel::Activation;
@@ -29,7 +29,7 @@ int main()
         else
         {
             std::printf("WARNING: Application was launched with something other than protocol activation!\n");
-        };
+        }
     }
     catch (const std::exception& ex)
     {

diff --git a/test/TestApps/OAuthTestApp/readme.txt b/test/TestApps/OAuthTestApp/readme.txt
diff --git a/test/TestApps/OAuthTestAppPackage/Package.appxmanifest b/test/TestApps/OAuthTestAppPackage/Package.appxmanifest
@@ -47,13 +47,6 @@
 					<uap:DisplayName>OAuth Test App</uap:DisplayName>
 				</uap:Protocol>
 			</uap:Extension>
-			<com:Extension Category="windows.comServer">
-				<com:ComServer>
-					<com:ExeServer Executable="OAuthTestApp\OAuthTestApp.exe" DisplayName="SampleBackgroundApp" Arguments="----WindowsAppRuntimePushServer:">
-						<com:Class Id="ccd2ae3f-764f-4ae3-be45-9804761b28b2" DisplayName="Windows App Runtime Push" />
-					</com:ExeServer>
-				</com:ComServer>
-			</com:Extension>
 		</Extensions>
     </Application>
   </Applications>