Skip to content
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.

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

Experimental API for OAuth 2.0 in WindowsAppSDK #3202

Open
wants to merge 10 commits into
base: main-old
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
106 changes: 95 additions & 11 deletions WindowsAppRuntime.sln
Original file line number Diff line number Diff line change
Expand Up @@ -246,17 +246,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Framework.Widgets", "test\D
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DynamicDependencyLifetimeManagerShadow", "dev\DynamicDependency\DynamicDependencyLifetimeManagerShadow\DynamicDependencyLifetimeManagerShadow.vcxproj", "{6539E9E1-BF36-40E5-86BC-070E99DB7B7B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToastNotificationTests", "test\ToastNotificationTests\ToastNotificationTests.vcxproj", "{E977B1BD-00DC-4085-A105-E0A18E0183D7}"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This project seems to be mostly deleted and was causing issues with VS trying to re-add it back in when building

ProjectSection(ProjectDependencies) = postProject
{4B30C685-8490-440F-9879-A75D45DAA361} = {4B30C685-8490-440F-9879-A75D45DAA361}
{9C1A6C58-52D6-4514-9120-5C339C5DF4BE} = {9C1A6C58-52D6-4514-9120-5C339C5DF4BE}
{A7391725-4EF5-438F-8DE1-645423E46955} = {A7391725-4EF5-438F-8DE1-645423E46955}
{B71E818A-882E-456A-87E5-4DE4A6602B99} = {B71E818A-882E-456A-87E5-4DE4A6602B99}
{B73AD907-6164-4294-88FB-F3C9C10DA1F1} = {B73AD907-6164-4294-88FB-F3C9C10DA1F1}
{D6A64926-4988-4C64-A5A8-2C14B1388696} = {D6A64926-4988-4C64-A5A8-2C14B1388696}
{F76B776E-86F5-48C5-8FC7-D2795ECC9746} = {F76B776E-86F5-48C5-8FC7-D2795ECC9746}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToastNotificationsTestApp", "test\TestApps\ToastNotificationsTestApp\ToastNotificationsTestApp.vcxproj", "{4B30C685-8490-440F-9879-A75D45DAA361}"
ProjectSection(ProjectDependencies) = postProject
{9C1A6C58-52D6-4514-9120-5C339C5DF4BE} = {9C1A6C58-52D6-4514-9120-5C339C5DF4BE}
Expand Down Expand Up @@ -406,6 +395,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test_DeploymentManagerAutoI
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Windows.AppNotifications.Builder.Projection", "dev\Projections\CS\Microsoft.Windows.AppNotifications.Builder.Projection\Microsoft.Windows.AppNotifications.Builder.Projection.csproj", "{50BF3E96-3050-4053-B012-BF6993483DA5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAuth", "OAuth", "{4A3ACD67-5C57-474D-87BF-675676D7451A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OAuth", "dev\OAuth\OAuth.vcxitems", "{3E7FD510-8B66-40E7-A80B-780CB8972F83}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NotificationTests", "NotificationTests", "{1FDC307C-2DB7-4B40-8F18-F1057E9E0969}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LRPTests", "test\LRPTests\LRPTests.vcxproj", "{978B013F-9B68-4B3E-8DA4-6F3BE4EB22B4}"
Expand All @@ -422,6 +415,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VersionInfoTests", "test\Ve
{5E2CC9D5-7C05-41D9-9DB5-EC5DF64BA1DC} = {5E2CC9D5-7C05-41D9-9DB5-EC5DF64BA1DC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OAuthTests", "test\OAuthTests\OAuthTests.vcxproj", "{21651459-648E-475C-91DB-2BDE359C75A4}"
ProjectSection(ProjectDependencies) = postProject
{C4454D2C-8024-41B8-BAC1-FC2E544C810F} = {C4454D2C-8024-41B8-BAC1-FC2E544C810F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OAuthTestApp", "test\TestApps\OAuthTestApp\OAuthTestApp.vcxproj", "{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}"
EndProject
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "OAuthTestAppPackage", "test\TestApps\OAuthTestAppPackage\OAuthTestAppPackage.wapproj", "{C4454D2C-8024-41B8-BAC1-FC2E544C810F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Windows.Security.Authentication.OAuth.Projection", "dev\Projections\CS\Microsoft.Windows.Security.Authentication.OAuth\Microsoft.Windows.Security.Authentication.OAuth.Projection.csproj", "{E7283533-E1C6-4843-B988-13D95BAB2B9A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1570,6 +1574,78 @@ Global
{442FB943-1197-48FE-B3B6-8C1BCA1E81E4}.Release|x64.Build.0 = Release|x64
{442FB943-1197-48FE-B3B6-8C1BCA1E81E4}.Release|x86.ActiveCfg = Release|Win32
{442FB943-1197-48FE-B3B6-8C1BCA1E81E4}.Release|x86.Build.0 = Release|Win32
{21651459-648E-475C-91DB-2BDE359C75A4}.Debug|Any CPU.ActiveCfg = Debug|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Debug|Any CPU.Build.0 = Debug|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Debug|ARM64.ActiveCfg = Debug|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Debug|ARM64.Build.0 = Debug|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Debug|x64.ActiveCfg = Debug|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Debug|x64.Build.0 = Debug|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Debug|x86.ActiveCfg = Debug|Win32
{21651459-648E-475C-91DB-2BDE359C75A4}.Debug|x86.Build.0 = Debug|Win32
{21651459-648E-475C-91DB-2BDE359C75A4}.Release|Any CPU.ActiveCfg = Release|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Release|Any CPU.Build.0 = Release|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Release|ARM64.ActiveCfg = Release|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Release|ARM64.Build.0 = Release|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Release|x64.ActiveCfg = Release|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Release|x64.Build.0 = Release|x64
{21651459-648E-475C-91DB-2BDE359C75A4}.Release|x86.ActiveCfg = Release|Win32
{21651459-648E-475C-91DB-2BDE359C75A4}.Release|x86.Build.0 = Release|Win32
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Debug|Any CPU.ActiveCfg = Debug|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Debug|Any CPU.Build.0 = Debug|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Debug|ARM64.ActiveCfg = Debug|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Debug|ARM64.Build.0 = Debug|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Debug|x64.ActiveCfg = Debug|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Debug|x64.Build.0 = Debug|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Debug|x86.ActiveCfg = Debug|Win32
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Debug|x86.Build.0 = Debug|Win32
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Release|Any CPU.ActiveCfg = Release|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Release|Any CPU.Build.0 = Release|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Release|ARM64.ActiveCfg = Release|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Release|ARM64.Build.0 = Release|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Release|x64.ActiveCfg = Release|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Release|x64.Build.0 = Release|x64
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Release|x86.ActiveCfg = Release|Win32
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2}.Release|x86.Build.0 = Release|Win32
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|ARM64.Build.0 = Debug|ARM64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|ARM64.Deploy.0 = Debug|ARM64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|x64.ActiveCfg = Debug|x64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|x64.Build.0 = Debug|x64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|x64.Deploy.0 = Debug|x64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|x86.ActiveCfg = Debug|x86
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|x86.Build.0 = Debug|x86
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Debug|x86.Deploy.0 = Debug|x86
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|Any CPU.Build.0 = Release|Any CPU
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|Any CPU.Deploy.0 = Release|Any CPU
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|ARM64.ActiveCfg = Release|ARM64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|ARM64.Build.0 = Release|ARM64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|ARM64.Deploy.0 = Release|ARM64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|x64.ActiveCfg = Release|x64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|x64.Build.0 = Release|x64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|x64.Deploy.0 = Release|x64
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|x86.ActiveCfg = Release|x86
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|x86.Build.0 = Release|x86
{C4454D2C-8024-41B8-BAC1-FC2E544C810F}.Release|x86.Deploy.0 = Release|x86
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Debug|Any CPU.ActiveCfg = Debug|x64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Debug|Any CPU.Build.0 = Debug|x64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Debug|ARM64.ActiveCfg = Debug|arm64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Debug|ARM64.Build.0 = Debug|arm64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Debug|x64.ActiveCfg = Debug|x64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Debug|x64.Build.0 = Debug|x64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Debug|x86.ActiveCfg = Debug|x86
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Debug|x86.Build.0 = Debug|x86
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Release|Any CPU.ActiveCfg = Release|x64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Release|Any CPU.Build.0 = Release|x64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Release|ARM64.ActiveCfg = Release|arm64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Release|ARM64.Build.0 = Release|arm64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Release|x64.ActiveCfg = Release|x64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Release|x64.Build.0 = Release|x64
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Release|x86.ActiveCfg = Release|x86
{E7283533-E1C6-4843-B988-13D95BAB2B9A}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1699,19 +1775,27 @@ Global
{676BA502-4220-465A-A9ED-ED22CDE4A24B} = {3A37083C-AA67-461E-BA78-0E0A65FE0C22}
{5A4FBF6D-04A2-4061-B11F-1A0E64129610} = {3A37083C-AA67-461E-BA78-0E0A65FE0C22}
{50BF3E96-3050-4053-B012-BF6993483DA5} = {716C26A0-E6B0-4981-8412-D14A4D410531}
{4A3ACD67-5C57-474D-87BF-675676D7451A} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
{3E7FD510-8B66-40E7-A80B-780CB8972F83} = {4A3ACD67-5C57-474D-87BF-675676D7451A}
{1FDC307C-2DB7-4B40-8F18-F1057E9E0969} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
{978B013F-9B68-4B3E-8DA4-6F3BE4EB22B4} = {1FDC307C-2DB7-4B40-8F18-F1057E9E0969}
{2A2D1131-273C-4E17-BCD3-8812170A4B95} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
{E3EDEC7F-A24E-4766-BB1D-6BDFBA157C51} = {2A2D1131-273C-4E17-BCD3-8812170A4B95}
{442FB943-1197-48FE-B3B6-8C1BCA1E81E4} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
{21651459-648E-475C-91DB-2BDE359C75A4} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
{077BDBFD-C1AA-49C8-BD62-7C14221C45F2} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
{C4454D2C-8024-41B8-BAC1-FC2E544C810F} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
{E7283533-E1C6-4843-B988-13D95BAB2B9A} = {716C26A0-E6B0-4981-8412-D14A4D410531}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
test\inc\inc.vcxitems*{08bc78e0-63c6-49a7-81b3-6afc3deac4de}*SharedItemsImports = 4
dev\PushNotifications\PushNotifications.vcxitems*{103c0c23-7ba8-4d44-a63c-83488e2e3a81}*SharedItemsImports = 9
test\inc\inc.vcxitems*{21651459-648e-475c-91db-2bde359c75a4}*SharedItemsImports = 4
dev\EnvironmentManager\API\Microsoft.Process.Environment.vcxitems*{2f3fad1b-d3df-4866-a3a3-c2c777d55638}*SharedItemsImports = 9
dev\OAuth\OAuth.vcxitems*{3e7fd510-8b66-40e7-a80b-780cb8972f83}*SharedItemsImports = 9
test\inc\inc.vcxitems*{412d023e-8635-4ad2-a0ea-e19e08d36915}*SharedItemsImports = 4
test\inc\inc.vcxitems*{4b30c685-8490-440f-9879-a75d45daa361}*SharedItemsImports = 4
dev\UndockedRegFreeWinRT\UndockedRegFreeWinRT.vcxitems*{56371ca6-144b-4989-a4e9-391ad4fa7651}*SharedItemsImports = 9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ steps:
arguments: -Path $(Build.SourcesDirectory)\dev\common\TerminalVelocityFeatures-EnvironmentManager.xml -Channel $(channel) -Language C++ -Namespace Microsoft.Windows.System -Output $(Build.SourcesDirectory)\dev\common\TerminalVelocityFeatures-EnvironmentManager.h
workingDirectory: '$(Build.SourcesDirectory)'

- task: powershell@2
displayName: 'Create OAuth TerminalVelocity features'
inputs:
targetType: filePath
filePath: tools\TerminalVelocity\Generate-TerminalVelocityFeatures.ps1
arguments: -Path $(Build.SourcesDirectory)\dev\common\TerminalVelocityFeatures-OAuth.xml -Channel ${{ parameters.channel }} -Language C++ -Namespace Microsoft.Windows.Security.Authentication.OAuth -Output $(Build.SourcesDirectory)\dev\common\TerminalVelocityFeatures-OAuth.h
workingDirectory: '$(Build.SourcesDirectory)'

- task: powershell@2
name: UpdateTraceloggingConfig
inputs:
Expand Down
4 changes: 4 additions & 0 deletions build/CopyFilesToStagingDir.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windo
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.System.winmd $FullPublishDir\Microsoft.WindowsAppRuntime\
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.System.Power.winmd $FullPublishDir\Microsoft.WindowsAppRuntime\
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.Security.AccessControl.winmd $FullPublishDir\Microsoft.WindowsAppRuntime\
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.Security.Authentication.OAuth.winmd $FullPublishDir\Microsoft.WindowsAppRuntime\
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\MsixDynamicDependency.h $FullPublishDir\Microsoft.WindowsAppRuntime\
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\wil_msixdynamicdependency.h $FullPublishDir\Microsoft.WindowsAppRuntime\
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\Security.AccessControl.h $FullPublishDir\Microsoft.WindowsAppRuntime\
Expand Down Expand Up @@ -116,6 +117,8 @@ PublishFile $FullBuildOutput\Microsoft.Windows.System.Power.Projection\Microsoft
PublishFile $FullBuildOutput\Microsoft.Windows.System.Power.Projection\Microsoft.Windows.System.Power.Projection.pdb $NugetDir\lib\net6.0-windows10.0.17763.0
PublishFile $FullBuildOutput\Microsoft.Windows.Security.AccessControl.Projection\Microsoft.Windows.Security.AccessControl.Projection.dll $NugetDir\lib\net6.0-windows10.0.17763.0
PublishFile $FullBuildOutput\Microsoft.Windows.Security.AccessControl.Projection\Microsoft.Windows.Security.AccessControl.Projection.pdb $NugetDir\lib\net6.0-windows10.0.17763.0
PublishFile $FullBuildOutput\Microsoft.Windows.Security.Authentication.OAuth.Projection\Microsoft.Windows.Security.Authentication.OAuth.Projection.dll $NugetDir\lib\net6.0-windows10.0.17763.0
PublishFile $FullBuildOutput\Microsoft.Windows.Security.Authentication.OAuth.Projection\Microsoft.Windows.Security.Authentication.OAuth.Projection.pdb $NugetDir\lib\net6.0-windows10.0.17763.0

#
# Dynamic Dependency build overrides
Expand Down Expand Up @@ -183,6 +186,7 @@ PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windo
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.System.winmd $NugetDir\lib\uap10.0
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.System.Power.winmd $NugetDir\lib\uap10.0
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.Security.AccessControl.winmd $NugetDir\lib\uap10.0
PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.Security.Authentication.OAuth.winmd $NugetDir\lib\uap10.0
#
# Bootstrap Auto-Initializer Files
PublishFile $FullBuildOutput\WindowsAppRuntime_BootstrapDLL\MddBootstrapAutoInitializer.cpp $NugetDir\include
Expand Down
6 changes: 6 additions & 0 deletions build/NuSpecs/AppxManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@
<!-- AccessControl -->
<ActivatableClass ActivatableClassId="Microsoft.Windows.Security.AccessControl.SecurityDescriptorHelpers" ThreadingModel="both" />

<!-- OAuth -->
<ActivatableClass ActivatableClassId="Microsoft.Windows.Security.Authentication.OAuth.AuthManager" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.Security.Authentication.OAuth.AuthRequestParams" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.Security.Authentication.OAuth.ClientAuthentication" ThreadingModel="both" />
<ActivatableClass ActivatableClassId="Microsoft.Windows.Security.Authentication.OAuth.TokenRequestParams" ThreadingModel="both" />

<!-- Environment Manager -->
<ActivatableClass ActivatableClassId="Microsoft.Windows.System.EnvironmentManager" ThreadingModel="both" />

Expand Down
8 changes: 7 additions & 1 deletion build/NuSpecs/WindowsAppSDK-Nuget-Native.WinRt.props
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<IsWinMDFile>true</IsWinMDFile>
</Reference>
<!-- conditionally include experimental metadata -->
<Reference Include="Microsoft.Windows.System.winmd"
<Reference Include="Microsoft.Windows.System.winmd"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.System.winmd')">
<HintPath>$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.System.winmd</HintPath>
<Implementation Condition="'$(WindowsAppSDKFrameworkPackage)' != 'true'">$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_WindowsAppSDKFoundationPlatform)\native\Microsoft.WindowsAppRuntime.dll</Implementation>
Expand All @@ -48,6 +48,12 @@
<Implementation Condition="'$(WindowsAppSDKFrameworkPackage)' != 'true'">$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_WindowsAppSDKFoundationPlatform)\native\Microsoft.WindowsAppRuntime.dll</Implementation>
<IsWinMDFile>true</IsWinMDFile>
</Reference>
<Reference Include="Microsoft.Windows.Security.Authentication.OAuth.winmd"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.Security.Authentication.OAuth.winmd')">
<HintPath>$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.Security.Authentication.OAuth.winmd</HintPath>
<Implementation Condition="'$(WindowsAppSDKFrameworkPackage)' != 'true'">$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(_WindowsAppSDKFoundationPlatform)\native\Microsoft.WindowsAppRuntime.dll</Implementation>
<IsWinMDFile>true</IsWinMDFile>
</Reference>
</ItemGroup>

</Project>
8 changes: 8 additions & 0 deletions build/NuSpecs/WindowsAppSDK-Nuget-Native.targets
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@
</Reference>
</ItemGroup>

<ItemGroup>
<Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.Security.Authentication.OAuth.winmd"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.Windows.Security.Authentication.OAuth.winmd')">
<Private>false</Private>
<Implementation>Microsoft.WindowsAppRuntime.dll</Implementation>
</Reference>
</ItemGroup>

<Import Project="$(MSBuildThisFileDirectory)..\Microsoft.WindowsAppSDK.BootstrapCommon.targets" />
<Import Project="$(MSBuildThisFileDirectory)WindowsAppSDK-Nuget-Native.Bootstrap.targets" Condition="'$(WindowsAppSdkBootstrapInitialize)' == 'true'"/>

Expand Down
32 changes: 32 additions & 0 deletions dev/Common/TerminalVelocityFeatures-OAuth.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// 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-OAuth.xml
// OPTIONS: -Channel Experimental -Language C++ -Namespace Microsoft.Windows.Security.Authentication.OAuth -Path dev\common\TerminalVelocityFeatures-OAuth.xml -Output dev\common\TerminalVelocityFeatures-OAuth.h

#if defined(__midlrt)
namespace features
{
feature_name Feature_OAuth = { DisabledByDefault, FALSE };
}
#endif // defined(__midlrt)

// Feature constants
#define WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_SECURITY_AUTHENTICATION_OAUTH_FEATURE_OAUTH_ENABLED 1

#if defined(__cplusplus)

namespace Microsoft::Windows::Security::Authentication::OAuth
{

__pragma(detect_mismatch("ODR_violation_WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_SECURITY_AUTHENTICATION_OAUTH_FEATURE_OAUTH_ENABLED_mismatch", "AlwaysEnabled"))
struct Feature_OAuth
{
static constexpr bool IsEnabled() { return WINDOWSAPPRUNTIME_MICROSOFT_WINDOWS_SECURITY_AUTHENTICATION_OAUTH_FEATURE_OAUTH_ENABLED == 1; }
};

} // namespace Microsoft.Windows.Security.Authentication.OAuth

#endif // defined(__cplusplus)
Loading