diff --git a/Directory.Build.props b/Directory.Build.props
index efca7bd0..7ef99cf6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -59,6 +59,17 @@
netstandard2.0;
netstandard2.1
+
+
+
+ uap10.0.17763
+
@@ -78,6 +89,7 @@
$([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory)))
false
false
+ $(MSBuildThisFileDirectory)\eng\AfterTargetFrameworkInference.targets
annotations
@@ -121,14 +122,17 @@
+ ('$(TargetFrameworkIdentifier)' == '.NETFramework') ">
$(DefineConstants);SUPPORTS_WINDOWS_RUNTIME
@@ -148,6 +152,16 @@
Encoding="Unicode" />
+
+
+
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
index f400c072..fca47652 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -467,4 +467,25 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenIddict.sln b/OpenIddict.sln
index 8139285f..8d3dd6a3 100644
--- a/OpenIddict.sln
+++ b/OpenIddict.sln
@@ -59,6 +59,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.Owin", "src\Open
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{6E8E862C-3F26-47D9-9C20-E3E87FD7CDFC}"
ProjectSection(SolutionItems) = preProject
+ eng\AfterTargetFrameworkInference.targets = eng\AfterTargetFrameworkInference.targets
eng\CodeAnalysis.ruleset = eng\CodeAnalysis.ruleset
eng\key.snk = eng\key.snk
eng\Signing.props = eng\Signing.props
diff --git a/eng/AfterTargetFrameworkInference.targets b/eng/AfterTargetFrameworkInference.targets
new file mode 100644
index 00000000..0619f910
--- /dev/null
+++ b/eng/AfterTargetFrameworkInference.targets
@@ -0,0 +1,15 @@
+
+
+
+
+
+ $(MSBuildThisFileDirectory)msbuild\uwp\Microsoft.Windows.UI.Xaml.CSharp.targets
+
+
+
diff --git a/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.81.Build.Tasks.dll b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.81.Build.Tasks.dll
new file mode 100644
index 00000000..4b2ec52e
Binary files /dev/null and b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.81.Build.Tasks.dll differ
diff --git a/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.CPP.targets b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.CPP.targets
new file mode 100644
index 00000000..a6a1e28d
--- /dev/null
+++ b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.CPP.targets
@@ -0,0 +1,181 @@
+
+
+
+
+
+ MarkupCompilePass1;
+ $(BeforeClCompileTargets)
+
+
+
+ ComputeXamlGeneratedCompileInputs;
+ $(ComputeCompileInputsTargets)
+
+
+
+ $(ComputeLinkInputsTargets);
+ CreateWinMD;
+ ComputeGeneratedWinMD;
+ MarkupCompilePass2;
+ ComputeInvalidXamlGenerated;
+ CompileXamlGeneratedFiles;
+ $(AfterBuildCompileTargets)
+
+
+
+ $(XamlPreLinkDependsOn);
+ ComputeXamlGeneratedCLOutputs
+
+
+ True
+ true
+ true
+
+
+
+
+ $(ValidatePresenceOfAppxManifestItemsDependsOn);
+ _CreateContentItemOutOfCustomAppxManifest
+
+
+
+
+
+
+
+
+
+
+
+
+ %(Link.WindowsMetadataFile)
+
+
+
+
+
+
+
+
+
+
+
+
+ Generated Files\
+ $(GeneratedFilesDir)
+ $(ExtensionsToDeleteOnClean);*.g.h;*.g.cpp;*.xaml
+
+
+
+
+
+
+
+
+
+
+ XamlGeneratedFilesOutputGroup;$(GeneratedFilesOutputGroupDependsOn)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ XamlGenerated
+
+
+ XamlGenerated
+
+
+ XamlGenerated
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+ DesignTimeMarkupCompilation
+
+
+ DesignTimeMarkupCompilation
+
+
+
+
+ CppDesignTimeMarkupCompilation;$(MarkupCompilePass1DependsOn)
+
+
+
+
+
+
+
+
diff --git a/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.CSharp.targets b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.CSharp.targets
new file mode 100644
index 00000000..177d37ed
--- /dev/null
+++ b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.CSharp.targets
@@ -0,0 +1,47 @@
+
+
+
+
+
+ 8.1
+ WindowsPhoneApp
+ v8.1
+
+
+
+ 8.1
+ .NETCore
+ v4.5.1
+
+
+
+ true
+ true
+ true
+ false
+ true
+ True
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.Common.targets b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.Common.targets
new file mode 100644
index 00000000..1de50a60
--- /dev/null
+++ b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.Common.targets
@@ -0,0 +1,664 @@
+
+
+
+
+
+
+
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VSWinExpress\14.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VSWinExpress\14.0\Setup\VC@ProductDir)
+
+ true
+ true
+ false
+
+ XamlSaveStateFile.xml
+ $(IntermediateOutputPath)\$(XamlSavedStateFileName)
+
+
+ @(ReferenceAssemblyPaths);
+ $(WindowsSDK80Path)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(AssemblyName).xr.xml
+
+
+
+
+
+
+
+ $(TargetName)
+
+ $(RootNamespace)
+ $(RootNamespace)
+
+ $(TargetName)
+
+
+
+ $(AvailablePlatforms),ARM
+
+
+
+ ResolveKeySource;
+ MarkupCompilePass1;
+ XamlPreCompile;
+ MarkupCompilePass2;
+ $(PrepareResourcesDependsOn)
+
+
+ true
+ true
+ 6.02
+ 6.00
+
+ _OnXamlPreCompileError
+
+
+ $(IntermediateOutputPath)
+
+
+
+
+
+
+
+
+ $(FrameworkSDKRoot)bin
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GetXamlCppIncludeDirectories;
+ $(GetXamlCppIncludeDirectories)
+
+
+
+ GetXamlCppIncludeDirectories;
+ $(GetXamlCppIncludeDirectories)
+
+
+
+ GetXamlCppIncludeDirectories;
+ $(Prep_ComputeProcessXamlFilesDependsOn)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DesignTimeMarkupCompilation;
+ $(CoreCompileDependsOn)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(WarningLevel)
+ 0
+
+
+
+
+
+
+
+
+ $(PrevWarningLevel)
+ 1
+
+
+
+
+
+ @(XamlIntermediateAssembly->'%(Identity)')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_Temp Remove="@(_Temp)" />
+
+
+
+
+
+ %(AllProjectXamlPages.DefaultXamlLink)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(XamlGeneratedOutputPath)
+ $(OutputPath)\
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GetPackagingOutputs;
+ $(PrepareLibraryLayoutDependsOn)
+
+
+
+
+
+
+
+ <_LayoutFile Include="@(PackagingOutputs)" Condition="'%(OutputGroup)' == 'ContentFilesProjectOutputGroup'" />
+ <_LayoutFile Include="@(PackagingOutputs)" Condition="'%(OutputGroup)' == 'CustomOutputGroupForPackaging'" />
+
+
+
+
+
+
+
+
+
+
+ $(ResolveReferencesDependsOn);
+ ImplicitlyExpandTargetFramework;
+ ImplicitlyExpandTargetPlatform
+
+
+
+ $(ImplicitlyExpandTargetFrameworkDependsOn);
+ GetReferenceAssemblyPaths
+
+
+
+
+
+
+
+ false
+ false
+ .NET for Windows Store apps
+ $(TargetFrameworkMoniker)
+ ImplicitlyExpandTargetFramework
+ True
+
+
+
+
+
+
+
+
+ <_ResolveAssemblyReferenceResolvedFiles Include="@(ReferencePath)"
+ Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandTargetFramework'"/>
+
+
+
+
+
+
+
+ true
+ false
+ $(TargetPlatformMoniker)
+ $(TargetPlatformDisplayName)
+ ImplicitlyExpandTargetPlatform
+ True
+
+
+
+
+
+
+
+
+ <_ResolveAssemblyReferenceResolvedFiles Include="@(ReferencePath)"
+ Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandTargetPlatform'"/>
+
+
+
+
+
+ true
+
+
+
+
+ true
+
+
+
+
+
+
diff --git a/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.Cps.targets b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.Cps.targets
new file mode 100644
index 00000000..1940c6f7
--- /dev/null
+++ b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.Cps.targets
@@ -0,0 +1,52 @@
+
+
+
+
+ ;BrowseObject
+
+
+ ProjectCapabilitySubscriptionService;BrowseObject
+
+
+
+
+
+
+
+
+
+
+ File;BrowseObject
+
+
+
+
+
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+
diff --git a/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.VisualBasic.targets b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.VisualBasic.targets
new file mode 100644
index 00000000..73148929
--- /dev/null
+++ b/eng/msbuild/uwp/8.1/Microsoft.Windows.UI.Xaml.VisualBasic.targets
@@ -0,0 +1,48 @@
+
+
+
+
+
+ 8.1
+ WindowsPhoneApp
+ v8.1
+
+
+
+ 8.1
+ .NETCore
+ v4.5.1
+
+
+
+ true
+ true
+ true
+ false
+ true
+ True
+
+ true
+ true
+
+ Empty
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.Build.Tasks.dll b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.Build.Tasks.dll
new file mode 100644
index 00000000..76707f72
Binary files /dev/null and b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.Build.Tasks.dll differ
diff --git a/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.CPP.targets b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.CPP.targets
new file mode 100644
index 00000000..51c45c0f
--- /dev/null
+++ b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.CPP.targets
@@ -0,0 +1,174 @@
+
+
+
+
+
+ MarkupCompilePass1;
+ $(BeforeClCompileTargets)
+
+
+
+ ComputeXamlGeneratedCompileInputs;
+ $(ComputeCompileInputsTargets)
+
+
+
+ $(ComputeLinkInputsTargets);
+ CreateWinMD;
+ ComputeGeneratedWinMD;
+ MarkupCompilePass2;
+ ComputeInvalidXamlGenerated;
+ CompileXamlGeneratedFiles;
+ $(AfterBuildCompileTargets)
+
+
+
+ $(XamlPreLinkDependsOn);
+ ComputeXamlGeneratedCLOutputs
+
+
+ True
+ true
+ false
+
+
+
+
+ $(ValidatePresenceOfAppxManifestItemsDependsOn);
+ _CreateContentItemOutOfCustomAppxManifest
+
+
+
+
+
+
+
+
+
+
+
+
+ %(Link.WindowsMetadataFile)
+
+
+
+
+
+
+
+
+
+
+
+
+ Generated Files\
+ $(GeneratedFilesDir)
+ $(ExtensionsToDeleteOnClean);*.g.h;*.g.cpp;*.xaml
+
+
+
+
+
+
+
+
+
+
+ XamlGeneratedFilesOutputGroup;$(GeneratedFilesOutputGroupDependsOn)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ XamlGenerated
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+ DesignTimeMarkupCompilation
+
+
+ DesignTimeMarkupCompilation
+
+
+
+
+ CppDesignTimeMarkupCompilation;$(MarkupCompilePass1DependsOn)
+
+
+
+
+
+
+
diff --git a/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.CSharp.targets b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.CSharp.targets
new file mode 100644
index 00000000..6c877010
--- /dev/null
+++ b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.CSharp.targets
@@ -0,0 +1,61 @@
+
+
+
+
+
+ 8.1
+ WindowsPhoneApp
+ v8.1
+
+
+
+ 8.2
+ .NETCore
+ v4.5.1
+
+
+
+ .NETCore
+ v5.0
+
+
+
+ Windows
+ 10.0
+
+
+
+ $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\NuGet\Repository', 'UWPNugetPackages', null, RegistryView.Registry32, RegistryView.Default))
+ $(RestoreAdditionalProjectFallbackFolders);$(UWPNugetRepo)
+
+
+
+ true
+ true
+ true
+ false
+ true
+ True
+
+
+ true
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.Common.targets b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.Common.targets
new file mode 100644
index 00000000..7c006909
--- /dev/null
+++ b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.Common.targets
@@ -0,0 +1,753 @@
+
+
+
+
+
+
+
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\15.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\15.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VSWinExpress\15.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VSWinExpress\15.0\Setup\VC@ProductDir)
+ $(VsInstallRoot)\Common7\IDE\VC\
+
+ $(TargetPlatformSdkRootOverride)
+ $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\$(SDKIdentifier)\v$(SDKVersion)', 'InstallationFolder', null, RegistryView.Registry32, RegistryView.Default))
+
+ true
+ true
+ false
+
+ XamlSaveStateFile.xml
+ $(IntermediateOutputPath)\$(XamlSavedStateFileName)
+
+
+ @(ReferenceAssemblyPaths);
+ $(WindowsSdkPath)
+
+
+
+ $(WindowsSdkPath)\UnionMetadata\facade\Windows.winmd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(AssemblyName).xr.xml
+
+
+
+
+
+
+
+ $(TargetName)
+
+ $(RootNamespace)
+ $(RootNamespace)
+
+ $(TargetName)
+
+
+
+ $(AvailablePlatforms),ARM
+
+
+
+ ResolveKeySource;
+ MarkupCompilePass1;
+ XamlPreCompile;
+ MarkupCompilePass2;
+ $(PrepareResourcesDependsOn)
+
+
+ true
+ true
+ 6.02
+ 6.00
+
+ _OnXamlPreCompileError
+
+
+ $(IntermediateOutputPath)
+
+
+
+
+
+
+
+
+ $(FrameworkSDKRoot)bin
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8.2
+ $(TargetPlatformVersion)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GetXamlCppIncludeDirectories;
+ $(GetXamlCppIncludeDirectories)
+
+
+
+ GetXamlCppIncludeDirectories;
+ $(GetXamlCppIncludeDirectories)
+
+
+
+ GetXamlCppIncludeDirectories;
+ $(Prep_ComputeProcessXamlFilesDependsOn)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DesignTimeMarkupCompilation;
+ $(CoreCompileDependsOn)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(WarningLevel)
+ 0
+
+
+
+
+
+
+
+
+ $(PrevWarningLevel)
+ 1
+
+
+
+
+
+ @(XamlIntermediateAssembly->'%(Identity)')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_Temp Remove="@(_Temp)" />
+
+
+
+
+
+ %(AllProjectXamlPages.DefaultXamlLink)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ExpandSDKReference
+
+
+ ExpandSDKReference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(XamlGeneratedOutputPath)
+ $(OutputPath)\
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GetPackagingOutputs;
+ $(PrepareLibraryLayoutDependsOn)
+
+
+
+
+
+
+
+ <_LayoutFile Include="@(PackagingOutputs)" Condition="'%(OutputGroup)' == 'ContentFilesProjectOutputGroup'" />
+ <_LayoutFile Include="@(PackagingOutputs)" Condition="'%(OutputGroup)' == 'CustomOutputGroupForPackaging'" />
+
+
+
+
+
+
+
+
+
+
+ $(ResolveReferencesDependsOn);
+ ImplicitlyExpandTargetFramework;
+ ImplicitlyExpandTargetPlatform
+
+
+
+ $(ImplicitlyExpandTargetFrameworkDependsOn);
+ GetReferenceAssemblyPaths
+
+
+
+
+
+
+
+ false
+ false
+ .NET for Windows Store apps
+ $(TargetFrameworkMoniker)
+ ImplicitlyExpandTargetFramework
+ True
+
+
+
+
+
+
+
+
+ <_ResolveAssemblyReferenceResolvedFiles Include="@(ReferencePath)"
+ Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandTargetFramework'"/>
+
+
+
+
+
+
+
+ <_TargetPlatformWinMDs Condition="'$(TargetPlatformSdkRootOverride)' != ''" Include="$(TargetPlatformSdkRootOverride)\References\**\*.winmd">
+ true
+ false
+ $(TargetPlatformMoniker)
+ $(TargetPlatformDisplayName)
+ ImplicitlyExpandTargetPlatform
+ True
+
+ <_TargetPlatformWinMDs Condition="'$(TargetPlatformSdkRootOverride)' == ''" Include="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetTargetPlatformReferences($(SDKIdentifier), $(SDKVersion), $(TargetPlatformIdentifier), $(TargetPlatformMinVersion), $(TargetPlatformVersion)))">
+ true
+ false
+ $(TargetPlatformMoniker)
+ $(TargetPlatformDisplayName)
+ ImplicitlyExpandTargetPlatform
+ True
+
+
+
+
+
+
+
+
+
+
+ true
+ false
+ $(TargetPlatformMoniker)
+ $(TargetPlatformDisplayName)
+ ImplicitlyExpandTargetPlatform
+ True
+
+ <_ResolveAssemblyReferenceResolvedFiles Include="@(_TargetPlatformWinMDs)" />
+
+
+ <_TargetPlatformWinMDs Remove="@(_TargetPlatformWinMDs)" />
+
+
+
+
+
+ true
+
+
+
+
+ true
+
+
+
+
+
+ <_AppxWinmdFilesToHarvest Include="@(PackagingOutputs)"
+ Condition="'%(PackagingOutputs.Extension)' == '.winmd'
+ and '%(PackagingOutputs.ProjectName)' == '$(ProjectName)'
+ and '%(PackagingOutputs.ResolvedFrom)' != 'GetSDKReferenceFiles'">
+
+ WindowsRuntime 1.4;CLR v4.0.30319
+
+ WindowsRuntime 1.4
+
+ WindowsRuntime 1.4;CLR v4.0.30319
+
+ WindowsRuntime 1.4
+
+ WindowsRuntime 1.4
+
+ $(PrimaryProjectWinmdImageRuntimeOverride)
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.Cps.targets b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.Cps.targets
new file mode 100644
index 00000000..1940c6f7
--- /dev/null
+++ b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.Cps.targets
@@ -0,0 +1,52 @@
+
+
+
+
+ ;BrowseObject
+
+
+ ProjectCapabilitySubscriptionService;BrowseObject
+
+
+
+
+
+
+
+
+
+
+ File;BrowseObject
+
+
+
+
+
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+
diff --git a/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.VisualBasic.targets b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.VisualBasic.targets
new file mode 100644
index 00000000..f8cf3ab8
--- /dev/null
+++ b/eng/msbuild/uwp/8.2/Microsoft.Windows.UI.Xaml.VisualBasic.targets
@@ -0,0 +1,73 @@
+
+
+
+
+
+ 8.1
+ WindowsPhoneApp
+ v8.1
+
+
+
+ 8.2
+ .NETCore
+ v4.5.1
+
+
+
+ .NETCore
+ v5.0
+
+
+
+ Windows
+ 10.0
+
+
+
+ $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\NuGet\Repository', 'UWPNugetPackages', null, RegistryView.Registry32, RegistryView.Default))
+ $(RestoreAdditionalProjectFallbackFolders);$(UWPNugetRepo)
+
+
+
+ true
+ true
+ true
+ false
+ true
+ True
+
+ true
+ true
+
+ Empty
+
+
+
+
+
+
+
+
+
+
+
+
+ $(IntermediateOutputPath)$(TargetName).pdb
+
+
+
+
diff --git a/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.CPP.targets b/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.CPP.targets
new file mode 100644
index 00000000..0409f7ef
--- /dev/null
+++ b/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.CPP.targets
@@ -0,0 +1,204 @@
+
+
+
+
+
+ MarkupCompilePass1;
+ $(BeforeClCompileTargets)
+
+
+
+ ComputeXamlGeneratedCompileInputs;
+ $(ComputeCompileInputsTargets)
+
+
+
+
+
+
+
+ $(ComputeLinkInputsTargets);
+ CreateWinMD;
+ ComputeGeneratedWinMD;
+ MarkupCompilePass2;
+ ComputeInvalidXamlGenerated;
+ CompileXamlGeneratedFiles;
+ $(AfterClCompileTargets)
+
+
+
+
+
+
+ $(ComputeLinkInputsTargets);
+ CreateWinMD;
+ ComputeGeneratedWinMD;
+ MarkupCompilePass2;
+ ComputeInvalidXamlGenerated;
+ CompileXamlGeneratedFiles;
+ $(AfterBuildCompileTargets)
+
+
+
+
+
+
+
+ $(XamlPreLinkDependsOn);
+ ComputeXamlGeneratedCLOutputs
+
+
+
+ $(XamlPreLibDependsOn);
+ ComputeXamlGeneratedCLOutputs
+
+
+ True
+ true
+ false
+
+
+
+
+ $(ValidatePresenceOfAppxManifestItemsDependsOn);
+ _CreateContentItemOutOfCustomAppxManifest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %(Link.WindowsMetadataFile)
+
+
+
+
+
+
+
+
+
+
+
+
+ Generated Files\
+ $(GeneratedFilesDir)
+ $(ExtensionsToDeleteOnClean);*.g.h;*.g.cpp;*.xaml
+
+
+
+
+
+
+
+
+
+
+ XamlGeneratedFilesOutputGroup;$(GeneratedFilesOutputGroupDependsOn)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ XamlGenerated
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+ DesignTimeMarkupCompilation
+
+
+ DesignTimeMarkupCompilation
+
+
+
+
+ CppDesignTimeMarkupCompilation;$(MarkupCompilePass1DependsOn)
+
+
+
+
+
+
+
diff --git a/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.CSharp.targets b/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.CSharp.targets
new file mode 100644
index 00000000..6c877010
--- /dev/null
+++ b/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.CSharp.targets
@@ -0,0 +1,61 @@
+
+
+
+
+
+ 8.1
+ WindowsPhoneApp
+ v8.1
+
+
+
+ 8.2
+ .NETCore
+ v4.5.1
+
+
+
+ .NETCore
+ v5.0
+
+
+
+ Windows
+ 10.0
+
+
+
+ $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\NuGet\Repository', 'UWPNugetPackages', null, RegistryView.Registry32, RegistryView.Default))
+ $(RestoreAdditionalProjectFallbackFolders);$(UWPNugetRepo)
+
+
+
+ true
+ true
+ true
+ false
+ true
+ True
+
+
+ true
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.Common.targets b/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.Common.targets
new file mode 100644
index 00000000..66a72e31
--- /dev/null
+++ b/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.Common.targets
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+ $(AvailablePlatforms),ARM64
+
+
+
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\15.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\15.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VSWinExpress\15.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VSWinExpress\15.0\Setup\VC@ProductDir)
+ $(VsInstallRoot)\Common7\IDE\VC\
+
+ $(TargetPlatformSdkRootOverride)\
+ $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32, RegistryView.Default))
+
+
+ $(WindowsKitsPath)bin\$(TargetPlatformVersion)\XamlCompiler\Microsoft.Windows.UI.Xaml.Common.targets
+ $(WindowsKitsPath)bin\$(TargetPlatformMinVersion)\XamlCompiler\Microsoft.Windows.UI.Xaml.Common.targets
+
+
+
+
+
+
+
+
+ <_AppxWinmdFilesToHarvest Include="@(PackagingOutputs)"
+ Condition="'%(PackagingOutputs.Extension)' == '.winmd'
+ and '%(PackagingOutputs.ProjectName)' == '$(ProjectName)'
+ and '%(PackagingOutputs.ResolvedFrom)' != 'GetSDKReferenceFiles'">
+
+ WindowsRuntime 1.4;CLR v4.0.30319
+
+ WindowsRuntime 1.4
+
+ WindowsRuntime 1.4;CLR v4.0.30319
+
+ WindowsRuntime 1.4
+
+ WindowsRuntime 1.4
+
+ $(PrimaryProjectWinmdImageRuntimeOverride)
+
+
+
+
+
+
+ ContentFilesProjectOutputGroup;
+ Prep_ComputeProcessXamlFiles;
+ $(AddProcessedXamlFilesToCopyLocalDependsOn)
+
+
+ _CalculateXbfSupport;
+ $(AddProcessedXamlFilesToCopyLocalDependsOn)
+
+
+
+
+
+ <_ProcessedXamlFilesToCopyLocal Include="@(GeneratedXamlSrc->'%(FullPath)')" />
+ <_ProcessedXamlFilesToCopyLocal Condition="'$(GenerateLibraryLayout)' == 'true' and '$(DisableXbfGeneration)' != 'true'" Include="@(GeneratedXamlSrc0->'%(FullPath)')" />
+
+
+
+
+
+
+
+ <_AllChildProjectItemsWithTargetPath Include="@(_ProcessedXamlFilesToCopyLocalWithTargetPath)" Condition="'%(Extension)' != '.xbf' OR ('%(Extension)' == '.xbf' AND '$(_SupportXbfAsEmbedFileResources)' != 'true')">
+ $(AppxPriInitialPath)\%(_ProcessedXamlFilesToCopyLocalWithTargetPath.TargetPath)
+ PreserveNewest
+
+
+
+
+ <_AllChildProjectItemsWithTargetPath Include="@(ContentFilesProjectOutputGroupOutput)">
+ $(AppxPriInitialPath)\%(ContentFilesProjectOutputGroupOutput.TargetPath)
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
+ <_LayoutFile Include="@(PackagingOutputs)" Condition="'%(OutputGroup)' == 'ContentFilesProjectOutputGroup'" />
+ <_LayoutFile Include="@(PackagingOutputs)" Condition="'%(OutputGroup)' == 'CustomOutputGroupForPackaging'" />
+
+
+
+
+
+
+
+
diff --git a/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.Cps.targets b/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.Cps.targets
new file mode 100644
index 00000000..1940c6f7
--- /dev/null
+++ b/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.Cps.targets
@@ -0,0 +1,52 @@
+
+
+
+
+ ;BrowseObject
+
+
+ ProjectCapabilitySubscriptionService;BrowseObject
+
+
+
+
+
+
+
+
+
+
+ File;BrowseObject
+
+
+
+
+
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+ Never
+
+
+
diff --git a/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.VisualBasic.targets b/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.VisualBasic.targets
new file mode 100644
index 00000000..f8cf3ab8
--- /dev/null
+++ b/eng/msbuild/uwp/8.21/Microsoft.Windows.UI.Xaml.VisualBasic.targets
@@ -0,0 +1,73 @@
+
+
+
+
+
+ 8.1
+ WindowsPhoneApp
+ v8.1
+
+
+
+ 8.2
+ .NETCore
+ v4.5.1
+
+
+
+ .NETCore
+ v5.0
+
+
+
+ Windows
+ 10.0
+
+
+
+ $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\NuGet\Repository', 'UWPNugetPackages', null, RegistryView.Registry32, RegistryView.Default))
+ $(RestoreAdditionalProjectFallbackFolders);$(UWPNugetRepo)
+
+
+
+ true
+ true
+ true
+ false
+ true
+ True
+
+ true
+ true
+
+ Empty
+
+
+
+
+
+
+
+
+
+
+
+
+ $(IntermediateOutputPath)$(TargetName).pdb
+
+
+
+
diff --git a/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.CPP.targets b/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.CPP.targets
new file mode 100644
index 00000000..c90dc830
--- /dev/null
+++ b/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.CPP.targets
@@ -0,0 +1,38 @@
+
+
+ True
+
+
+
+
+
+ $(MarkupCompilePass1DependsOn);_WriteXamlTlogs
+
+
+
+
+ <_XamlReadTlog Include="^%(Page.FullPath)"
+ Condition="'%(Page.ExcludedFromBuild)' != 'true'"/>
+
+
+ <_XamlReadTlog Include="^%(ApplicationDefinition.FullPath)"
+ Condition="'%(ApplicationDefinition.ExcludedFromBuild)' != 'true'"/>
+
+
+
+
+
+
+
+ <_XamlReadTlog Remove="@(_XamlReadTlog)" />
+
+
+
+
\ No newline at end of file
diff --git a/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.CSharp.targets b/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.CSharp.targets
new file mode 100644
index 00000000..4fb0488b
--- /dev/null
+++ b/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.CSharp.targets
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.Common.targets b/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.Common.targets
new file mode 100644
index 00000000..c16526ba
--- /dev/null
+++ b/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.Common.targets
@@ -0,0 +1,49 @@
+
+
+ 8.0
+
+
+
+ 8.21
+
+
+
+ 8.2
+
+
+
+ $(TargetPlatformVersion)
+
+
+
+
+ 8.1
+
+
+
+
+ $(VisualStudioVersion)
+
+
+
+
+
+ true
+
+
+
+ 16.11.0
+
+
+
+
+
+
+
+ $(UwpUnitTestSdkPkgVersion)
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.VisualBasic.targets b/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.VisualBasic.targets
new file mode 100644
index 00000000..9b70728d
--- /dev/null
+++ b/eng/msbuild/uwp/Microsoft.Windows.UI.Xaml.VisualBasic.targets
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/global.json b/global.json
index 781f2dad..6cd690f3 100644
--- a/global.json
+++ b/global.json
@@ -19,6 +19,7 @@
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23516.4",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23516.4",
+ "MSBuild.Sdk.Extras": "3.0.44",
"MSBuild.SDK.SystemWeb": "4.0.88"
}
}
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddict.Client.SystemIntegration.csproj b/src/OpenIddict.Client.SystemIntegration/OpenIddict.Client.SystemIntegration.csproj
index 107577e9..9a758f5d 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddict.Client.SystemIntegration.csproj
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddict.Client.SystemIntegration.csproj
@@ -1,11 +1,12 @@
-
+
$(NetFrameworkTargetFrameworks);
$(NetCoreTargetFrameworks);
$(NetCoreWindowsTargetFrameworks);
- $(NetStandardTargetFrameworks)
+ $(NetStandardTargetFrameworks);
+ $(UniversalWindowsPlatformTargetFrameworks)
true
true
@@ -25,15 +26,15 @@
+ ('$(TargetFrameworkIdentifier)' == '.NETFramework') ">
diff --git a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs
index b7467543..976e7819 100644
--- a/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs
+++ b/src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs
@@ -242,7 +242,7 @@ public static class OpenIddictClientSystemIntegrationHelpers
// Note: with the materialization of Project Centennial/Desktop Bridge in Windows 10 1607
// (also known as Anniversary Update), desktop applications that don't have a package
// identity are now allowed to use most of the WinRT APIs. Since OpenIddict's UWP support
- // is implemented via a .NET Standard 2.0 TFM (which requires Windows 10 1809), it is assumed
+ // is implemented via a UAP 10.0.17763 TFM (which requires Windows 10 1809), it is assumed
// at this point that Launcher.LaunchUriAsync() can be used in both types of applications.
try
diff --git a/src/OpenIddict/OpenIddict.csproj b/src/OpenIddict/OpenIddict.csproj
index 482fb782..cd6179bf 100644
--- a/src/OpenIddict/OpenIddict.csproj
+++ b/src/OpenIddict/OpenIddict.csproj
@@ -1,11 +1,12 @@
-
+
$(NetFrameworkTargetFrameworks);
$(NetCoreTargetFrameworks);
$(NetCoreWindowsTargetFrameworks);
- $(NetStandardTargetFrameworks)
+ $(NetStandardTargetFrameworks);
+ $(UniversalWindowsPlatformTargetFrameworks)
false
false
@@ -48,6 +49,7 @@ To use these features on ASP.NET Core or OWIN/Katana/ASP.NET 4.x, reference the
+