Skip to content

Commit c2cd9ee

Browse files
mediaexplorer74mediaexplorer74
committed
.
1 parent e5fd622 commit c2cd9ee

File tree

162 files changed

+376
-1728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+376
-1728
lines changed

‎ADUWPSample.sln‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.1.32120.378
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ADUWPSample", "ADUWPSample\ADUWPSample.csproj", "{D43D178A-DF90-4333-A151-1E5D423F1C40}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|ARM = Debug|ARM
10+
Debug|x64 = Debug|x64
11+
Debug|x86 = Debug|x86
12+
Release|ARM = Release|ARM
13+
Release|x64 = Release|x64
14+
Release|x86 = Release|x86
15+
EndGlobalSection
16+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
17+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Debug|ARM.ActiveCfg = Debug|ARM
18+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Debug|ARM.Build.0 = Debug|ARM
19+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Debug|ARM.Deploy.0 = Debug|ARM
20+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Debug|x64.ActiveCfg = Debug|x64
21+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Debug|x64.Build.0 = Debug|x64
22+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Debug|x64.Deploy.0 = Debug|x64
23+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Debug|x86.ActiveCfg = Debug|x86
24+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Debug|x86.Build.0 = Debug|x86
25+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Debug|x86.Deploy.0 = Debug|x86
26+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Release|ARM.ActiveCfg = Release|ARM
27+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Release|ARM.Build.0 = Release|ARM
28+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Release|ARM.Deploy.0 = Release|ARM
29+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Release|x64.ActiveCfg = Release|x64
30+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Release|x64.Build.0 = Release|x64
31+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Release|x64.Deploy.0 = Release|x64
32+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Release|x86.ActiveCfg = Release|x86
33+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Release|x86.Build.0 = Release|x86
34+
{D43D178A-DF90-4333-A151-1E5D423F1C40}.Release|x86.Deploy.0 = Release|x86
35+
EndGlobalSection
36+
GlobalSection(SolutionProperties) = preSolution
37+
HideSolutionNode = FALSE
38+
EndGlobalSection
39+
GlobalSection(ExtensibilityGlobals) = postSolution
40+
SolutionGuid = {871456BC-9164-4F6A-8DFE-67511F46BD6B}
41+
EndGlobalSection
42+
EndGlobal

GraphTutorial/GraphTutorial.csproj renamed to ADUWPSample/ADUWPSample.csproj

Lines changed: 32 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,32 @@
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
7-
<ProjectGuid>{36E0A970-B783-472A-87A6-CE246773001B}</ProjectGuid>
7+
<ProjectGuid>{D43D178A-DF90-4333-A151-1E5D423F1C40}</ProjectGuid>
88
<OutputType>AppContainerExe</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>GraphTutorial</RootNamespace>
11-
<AssemblyName>GraphTutorial</AssemblyName>
10+
<RootNamespace>active_directory_dotnet_native_uwp_v2</RootNamespace>
11+
<AssemblyName>ADUWPSample</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
1414
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
15+
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1919
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
20+
<PackageCertificateKeyFile>ADUWPSample_TemporaryKey.pfx</PackageCertificateKeyFile>
21+
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
22+
<PackageCertificateThumbprint>
23+
</PackageCertificateThumbprint>
2024
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
21-
<PackageCertificateThumbprint>6EBACE857D759C93B259B796AAE7ADEE824A665B</PackageCertificateThumbprint>
22-
<PackageCertificateKeyFile>GraphTutorial_TemporaryKey.pfx</PackageCertificateKeyFile>
25+
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
26+
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
27+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
28+
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
29+
<GenerateTestArtifacts>True</GenerateTestArtifacts>
30+
<AppxBundle>Always</AppxBundle>
31+
<AppxBundlePlatforms>arm</AppxBundlePlatforms>
32+
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
2333
</PropertyGroup>
2434
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2535
<DebugSymbols>true</DebugSymbols>
@@ -67,30 +77,6 @@
6777
<Prefer32Bit>true</Prefer32Bit>
6878
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
6979
</PropertyGroup>
70-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
71-
<DebugSymbols>true</DebugSymbols>
72-
<OutputPath>bin\ARM64\Debug\</OutputPath>
73-
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
74-
<NoWarn>;2008</NoWarn>
75-
<DebugType>full</DebugType>
76-
<PlatformTarget>ARM64</PlatformTarget>
77-
<UseVSHostingProcess>false</UseVSHostingProcess>
78-
<ErrorReport>prompt</ErrorReport>
79-
<Prefer32Bit>true</Prefer32Bit>
80-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
81-
</PropertyGroup>
82-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
83-
<OutputPath>bin\ARM64\Release\</OutputPath>
84-
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
85-
<Optimize>true</Optimize>
86-
<NoWarn>;2008</NoWarn>
87-
<DebugType>pdbonly</DebugType>
88-
<PlatformTarget>ARM64</PlatformTarget>
89-
<UseVSHostingProcess>false</UseVSHostingProcess>
90-
<ErrorReport>prompt</ErrorReport>
91-
<Prefer32Bit>true</Prefer32Bit>
92-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
93-
</PropertyGroup>
9480
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
9581
<DebugSymbols>true</DebugSymbols>
9682
<OutputPath>bin\x64\Debug\</OutputPath>
@@ -114,32 +100,21 @@
114100
<Prefer32Bit>true</Prefer32Bit>
115101
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
116102
</PropertyGroup>
117-
<PropertyGroup>
118-
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
119-
</PropertyGroup>
120103
<ItemGroup>
121104
<Compile Include="App.xaml.cs">
122105
<DependentUpon>App.xaml</DependentUpon>
123106
</Compile>
124-
<Compile Include="CalendarPage.xaml.cs">
125-
<DependentUpon>CalendarPage.xaml</DependentUpon>
126-
</Compile>
127-
<Compile Include="GraphDateTimeTimeZoneConverter.cs" />
128-
<Compile Include="HomePage.xaml.cs">
129-
<DependentUpon>HomePage.xaml</DependentUpon>
130-
</Compile>
107+
<Compile Include="DefaultRedirectUri.cs" />
131108
<Compile Include="MainPage.xaml.cs">
132109
<DependentUpon>MainPage.xaml</DependentUpon>
133110
</Compile>
134-
<Compile Include="NewEventPage.xaml.cs">
135-
<DependentUpon>NewEventPage.xaml</DependentUpon>
136-
</Compile>
137111
<Compile Include="Properties\AssemblyInfo.cs" />
138112
</ItemGroup>
139113
<ItemGroup>
140114
<AppxManifest Include="Package.appxmanifest">
141115
<SubType>Designer</SubType>
142116
</AppxManifest>
117+
<None Include="ADUWPSample_TemporaryKey.pfx" />
143118
</ItemGroup>
144119
<ItemGroup>
145120
<Content Include="Assets\LargeTile.scale-100.png" />
@@ -200,43 +175,33 @@
200175
<Generator>MSBuild:Compile</Generator>
201176
<SubType>Designer</SubType>
202177
</ApplicationDefinition>
203-
<Page Include="CalendarPage.xaml">
204-
<SubType>Designer</SubType>
205-
<Generator>MSBuild:Compile</Generator>
206-
</Page>
207-
<Page Include="HomePage.xaml">
208-
<SubType>Designer</SubType>
209-
<Generator>MSBuild:Compile</Generator>
210-
</Page>
211178
<Page Include="MainPage.xaml">
212179
<Generator>MSBuild:Compile</Generator>
213180
<SubType>Designer</SubType>
214181
</Page>
215-
<Page Include="NewEventPage.xaml">
216-
<SubType>Designer</SubType>
217-
<Generator>MSBuild:Compile</Generator>
218-
</Page>
219182
</ItemGroup>
220183
<ItemGroup>
221-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
222-
<Version>6.2.13</Version>
184+
<PackageReference Include="Microsoft.Graph">
185+
<Version>1.21.0</Version>
223186
</PackageReference>
224-
<PackageReference Include="Microsoft.Toolkit.Graph.Controls">
225-
<Version>6.1.0-preview2</Version>
187+
<PackageReference Include="Microsoft.Identity.Client">
188+
<Version>4.27.0</Version>
226189
</PackageReference>
227-
<PackageReference Include="Microsoft.Toolkit.Uwp.Ui.Controls.DataGrid">
228-
<Version>7.0.0</Version>
190+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
191+
<Version>6.2.12</Version>
229192
</PackageReference>
230193
</ItemGroup>
231-
<ItemGroup>
232-
<PRIResource Include="OAuth.resw" />
233-
</ItemGroup>
234-
<ItemGroup>
235-
<None Include="GraphTutorial_TemporaryKey.pfx" />
236-
</ItemGroup>
194+
<ItemGroup />
237195
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
238196
<VisualStudioVersion>14.0</VisualStudioVersion>
239197
</PropertyGroup>
198+
<PropertyGroup>
199+
<SignAssembly>false</SignAssembly>
200+
</PropertyGroup>
201+
<PropertyGroup>
202+
<AssemblyOriginatorKeyFile>
203+
</AssemblyOriginatorKeyFile>
204+
</PropertyGroup>
240205
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
241206
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
242207
Other similar extension points exist, see Microsoft.Common.targets.

‎ADUWPSample/ADUWPSample_TemporaryKey.pfx‎

2.46 KB
Binary file not shown.

‎ADUWPSample/App.xaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Application
2+
x:Class="Native_UWP_V2.App"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:local="using:Native_UWP_V2"
6+
RequestedTheme="Light">
7+
8+
</Application>

GraphTutorial/App.xaml.cs renamed to ADUWPSample/App.xaml.cs

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,19 @@
1-
// Copyright (c) Microsoft Corporation.
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
3-
43
using System;
5-
using System.Collections.Generic;
6-
using System.IO;
7-
using System.Linq;
8-
using System.Runtime.InteropServices.WindowsRuntime;
94
using Windows.ApplicationModel;
105
using Windows.ApplicationModel.Activation;
11-
using Windows.Foundation;
12-
using Windows.Foundation.Collections;
136
using Windows.UI.Xaml;
147
using Windows.UI.Xaml.Controls;
15-
using Windows.UI.Xaml.Controls.Primitives;
16-
using Windows.UI.Xaml.Data;
17-
using Windows.UI.Xaml.Input;
18-
using Windows.UI.Xaml.Media;
198
using Windows.UI.Xaml.Navigation;
209

21-
namespace GraphTutorial
10+
namespace Native_UWP_V2
2211
{
2312
/// <summary>
2413
/// Provides application-specific behavior to supplement the default Application class.
2514
/// </summary>
2615
sealed partial class App : Application
2716
{
28-
public bool IsAuthenticated { get; set; }
29-
3017
/// <summary>
3118
/// Initializes the singleton application object. This is the first line of authored code
3219
/// executed, and as such is the logical equivalent of main() or WinMain().
@@ -83,7 +70,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
8370
/// </summary>
8471
/// <param name="sender">The Frame which failed navigation</param>
8572
/// <param name="e">Details about the navigation failure</param>
86-
void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
73+
private void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
8774
{
8875
throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
8976
}
@@ -102,4 +89,4 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
10289
deferral.Complete();
10390
}
10491
}
105-
}
92+
}

‎ADUWPSample/Assets/LargeTile.scale-100.png‎

8.64 KB

‎ADUWPSample/Assets/LargeTile.scale-125.png‎

11.8 KB

‎ADUWPSample/Assets/LargeTile.scale-150.png‎

15.4 KB

‎ADUWPSample/Assets/LargeTile.scale-200.png‎

24.2 KB

‎ADUWPSample/Assets/LargeTile.scale-400.png‎

68.9 KB

0 commit comments

Comments
 (0)