Permalink
Browse files

Update to Universal App & ADAL v3

  • Loading branch information...
1 parent 8cd99db commit 3e4ab598db292cdcfff0736acb92dfe53f878e7b @dstrockis dstrockis committed Mar 16, 2016
@@ -1,11 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoListService", "TodoListService\TodoListService.csproj", "{047CDEF7-D5BA-4B1E-9748-910B610CCA51}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoListClient", "TodoListClient\TodoListClient.csproj", "{98E12F24-F5CF-4103-8E32-ABA43004CB90}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoListClient", "TodoListClient\TodoListClient.csproj", "{2255ED21-1E37-48D6-88BB-B72A49AE28E8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,30 +29,26 @@ Global
{047CDEF7-D5BA-4B1E-9748-910B610CCA51}.Release|ARM.ActiveCfg = Release|Any CPU
{047CDEF7-D5BA-4B1E-9748-910B610CCA51}.Release|x64.ActiveCfg = Release|Any CPU
{047CDEF7-D5BA-4B1E-9748-910B610CCA51}.Release|x86.ActiveCfg = Release|Any CPU
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|ARM.ActiveCfg = Debug|ARM
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|ARM.Build.0 = Debug|ARM
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|ARM.Deploy.0 = Debug|ARM
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|x64.ActiveCfg = Debug|x64
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|x64.Build.0 = Debug|x64
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|x64.Deploy.0 = Debug|x64
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|x86.ActiveCfg = Debug|x86
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|x86.Build.0 = Debug|x86
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Debug|x86.Deploy.0 = Debug|x86
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|Any CPU.Build.0 = Release|Any CPU
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|Any CPU.Deploy.0 = Release|Any CPU
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|ARM.ActiveCfg = Release|ARM
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|ARM.Build.0 = Release|ARM
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|ARM.Deploy.0 = Release|ARM
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|x64.ActiveCfg = Release|x64
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|x64.Build.0 = Release|x64
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|x64.Deploy.0 = Release|x64
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|x86.ActiveCfg = Release|x86
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|x86.Build.0 = Release|x86
- {98E12F24-F5CF-4103-8E32-ABA43004CB90}.Release|x86.Deploy.0 = Release|x86
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Debug|ARM.ActiveCfg = Debug|ARM
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Debug|ARM.Build.0 = Debug|ARM
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Debug|ARM.Deploy.0 = Debug|ARM
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Debug|x64.ActiveCfg = Debug|x64
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Debug|x64.Build.0 = Debug|x64
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Debug|x64.Deploy.0 = Debug|x64
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Debug|x86.ActiveCfg = Debug|x86
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Debug|x86.Build.0 = Debug|x86
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Debug|x86.Deploy.0 = Debug|x86
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Release|Any CPU.ActiveCfg = Release|x86
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Release|ARM.ActiveCfg = Release|ARM
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Release|ARM.Build.0 = Release|ARM
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Release|ARM.Deploy.0 = Release|ARM
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Release|x64.ActiveCfg = Release|x64
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Release|x64.Build.0 = Release|x64
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Release|x64.Deploy.0 = Release|x64
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Release|x86.ActiveCfg = Release|x86
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Release|x86.Build.0 = Release|x86
+ {2255ED21-1E37-48D6-88BB-B72A49AE28E8}.Release|x86.Deploy.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
@@ -2,6 +2,7 @@
x:Class="TodoListClient.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:TodoListClient">
+ xmlns:local="using:TodoListClient"
+ RequestedTheme="Light">
</Application>
@@ -15,8 +15,6 @@
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
-// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227
-
namespace TodoListClient
{
/// <summary>
@@ -57,8 +55,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
{
// Create a Frame to act as the navigation context and navigate to the first page
rootFrame = new Frame();
- // Set the default language
- rootFrame.Language = Windows.Globalization.ApplicationLanguages.Languages[0];
rootFrame.NavigationFailed += OnNavigationFailed;
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -8,6 +8,7 @@
mc:Ignorable="d">
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="*"/>
@@ -19,9 +20,7 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
- <TextBlock Grid.Column="1" Grid.Row="1"
- TextWrapping="NoWrap" Margin="0,0,30,40" VerticalAlignment="Bottom" Style="{StaticResource HeaderTextBlockStyle
-}" Text="To Do List"/>
+ <TextBlock Grid.Column="1" Grid.Row="1" TextWrapping="NoWrap" Margin="0,0,30,40" VerticalAlignment="Bottom" Style="{StaticResource HeaderTextBlockStyle}" Text="To Do List"/>
<Grid Grid.Column="1" Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
@@ -41,5 +40,7 @@
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
+
+
</Grid>
</Page>
@@ -1,26 +1,16 @@
-//----------------------------------------------------------------------------------------------
-// Copyright 2014 Microsoft Corporation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//----------------------------------------------------------------------------------------------
-
-using System;
+using System;
using System.Collections.Generic;
+using System.Globalization;
using System.IO;
using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using Windows.Data.Json;
using Windows.Foundation;
using Windows.Foundation.Collections;
+using Windows.UI.Popups;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Primitives;
@@ -29,15 +19,7 @@
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
-// The following using statements were added for this sample.
-using System.Globalization;
-using System.Net.Http;
-using Microsoft.IdentityModel.Clients.ActiveDirectory;
-using Windows.UI.Popups;
-using System.Net.Http.Headers;
-using Windows.Data.Json;
-
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
namespace TodoListClient
{
@@ -69,6 +51,7 @@ public sealed partial class MainPage : Page
private AuthenticationContext authContext = null;
private Uri redirectURI = null;
+
public MainPage()
{
this.InitializeComponent();
@@ -102,7 +85,6 @@ public MainPage()
// Plus uncomment the following line of code:
//
// authContext.UseCorporateNetwork = true;
-
}
protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -153,10 +135,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
var todoArray = JsonArray.Parse(await response.Content.ReadAsStringAsync());
TodoList.ItemsSource = from todo in todoArray
- select new
- {
- Title = todo.GetObject()["Title"].GetString()
- };
+ select new
+ {
+ Title = todo.GetObject()["Title"].GetString()
+ };
}
else
{
@@ -1,25 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
- <Identity Name="4d96c809-7299-4731-b9f9-f4b69515ee01" Publisher="CN=skwan" Version="1.0.0.0" />
+
+<Package
+ xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+ xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+ xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+ IgnorableNamespaces="uap mp">
+
+ <Identity
+ Name="c5755763-7e7d-4b0f-b726-9fe3b9caede8"
+ Publisher="CN=dastrock"
+ Version="1.0.0.0" />
+
+ <mp:PhoneIdentity PhoneProductId="c5755763-7e7d-4b0f-b726-9fe3b9caede8" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
<Properties>
<DisplayName>TodoListClient</DisplayName>
- <PublisherDisplayName>skwan</PublisherDisplayName>
+ <PublisherDisplayName>dastrock</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
- <Prerequisites>
- <OSMinVersion>6.3.0</OSMinVersion>
- <OSMaxVersionTested>6.3.0</OSMaxVersionTested>
- </Prerequisites>
+
+ <Dependencies>
+ <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+ </Dependencies>
+
<Resources>
- <Resource Language="x-generate" />
+ <Resource Language="x-generate"/>
</Resources>
+
<Applications>
- <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="TodoListClient.App">
- <m2:VisualElements DisplayName="TodoListClient" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png" Description="TodoListClient" ForegroundText="light" BackgroundColor="#464646">
- <m2:SplashScreen Image="Assets\SplashScreen.png" />
- </m2:VisualElements>
+ <Application Id="App"
+ Executable="$targetnametoken$.exe"
+ EntryPoint="TodoListClient.App">
+ <uap:VisualElements
+ DisplayName="TodoListClient"
+ Square150x150Logo="Assets\Square150x150Logo.png"
+ Square44x44Logo="Assets\Square44x44Logo.png"
+ Description="TodoListClient"
+ BackgroundColor="transparent">
+ <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
+ <uap:SplashScreen Image="Assets\SplashScreen.png" />
+ </uap:VisualElements>
</Application>
</Applications>
+
<Capabilities>
<Capability Name="internetClient" />
</Capabilities>
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TodoListClient")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
+[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -0,0 +1,31 @@
+<!--
+ This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
+ developers. However, you can modify these parameters to modify the behavior of the .NET Native
+ optimizer.
+
+ Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
+
+ To fully enable reflection for App1.MyClass and all of its public/private members
+ <Type Name="App1.MyClass" Dynamic="Required All"/>
+
+ To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
+ <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
+
+ Using the Namespace directive to apply reflection policy to all the types in a particular namespace
+ <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+-->
+
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+ <Application>
+ <!--
+ An Assembly element with Name="*Application*" applies to all assemblies in
+ the application package. The asterisks are not wildcards.
+ -->
+ <Assembly Name="*Application*" Dynamic="Required All" />
+
+
+ <!-- Add your application specific runtime directives here. -->
+
+
+ </Application>
+</Directives>
Oops, something went wrong.

0 comments on commit 3e4ab59

Please sign in to comment.